38889342ad
# Conflicts: # Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs # Content.Server/Chemistry/EntitySystems/InjectorSystem.cs # Content.Shared/Weapons/Ranged/Components/GunComponent.cs # Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs # Resources/Audio/Machines/attributions.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml # Resources/Prototypes/Recipes/Lathes/medical.yml # Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml # Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml # Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml # Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml # Resources/ServerInfo/Guidebook/Antagonist/Thieves.xml # Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json # Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png # Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png # Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json # Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png # Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png # Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json |
||
|---|---|---|
| .. | ||
| window-component.ftl | ||