mirror of
https://github.com/corvax-team/ss14-wl.git
synced 2026-02-15 03:31:38 +01:00
6a7a7d44f6
# Resolved Conflicts: # Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs # Content.Shared/Execution/SharedExecutionSystem.cs # Resources/Locale/en-US/execution/execution.ftl # Resources/Locale/ru-RU/execution/execution.ftl # Resources/Maps/corvax_paper.yml # Resources/Prototypes/Corvax/Maps/Pools/default.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml # Resources/Textures/Clothing/Back/Satchels/captain.rsi/equipped-BACKPACK.png # Resources/Textures/Clothing/Back/Satchels/captain.rsi/icon.png # Resources/Textures/Clothing/Back/Satchels/captain.rsi/inhand-left.png # Resources/Textures/Clothing/Back/Satchels/captain.rsi/inhand-right.png # Resources/Textures/Clothing/Back/Satchels/captain.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/equipped-INNERCLOTHING-reptilian.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-right.png