mirror of
https://github.com/corvax-team/ss14-wl.git
synced 2026-02-15 03:31:38 +01:00
790070d410
# Resolved Conflicts: # .github/workflows/publish.yml # Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs # Content.Server/Administration/Systems/BwoinkSystem.cs # Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs # Content.Server/DetailExaminable/DetailExaminableystem.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Server/Ghost/GhostSystem.cs # Content.Server/Light/EntitySystems/PoweredLightSystem.cs # Content.Server/Station/Systems/StationSpawningSystem.cs # Content.Server/Store/Systems/StoreSystem.Listings.cs # Content.Server/Store/Systems/StoreSystem.Ui.cs # Content.Shared.Database/LogType.cs # Content.Shared/Damage/Systems/StaminaSystem.cs # Content.Shared/Eye/VisibilityFlags.cs # Content.Shared/Humanoid/Markings/MarkingCategories.cs # Content.Shared/Humanoid/NamingSystem.cs # Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs # Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs # Directory.Packages.props # Resources/Audio/Lobby/attributions.yml # Resources/Credits/GitHub.txt # Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl # Resources/Prototypes/Corvax/Reagents/Consumable/Drink/alcohol.yml # Resources/Prototypes/Corvax/lobbyscreens.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Entities/Mobs/Species/moth.yml # Resources/Prototypes/Entities/Objects/Tools/toolbox.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml # Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml # Resources/Prototypes/GameRules/events.yml # Resources/Prototypes/Reagents/medicine.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Prototypes/SoundCollections/lobby.yml # Resources/Prototypes/Species/arachnid.yml # Resources/Prototypes/Species/diona.yml # Resources/Prototypes/Species/moth.yml # Resources/Prototypes/Species/reptilian.yml # Resources/Prototypes/Species/vox.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Prototypes/game_presets.yml # Resources/Prototypes/secret_weights.yml # Resources/Textures/Corvax/LobbyScreens/attributions.yml # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json