0cbccf6f0e
# Conflicts: # Content.Shared/Access/Components/AccessReaderComponent.cs # Resources/Locale/en-US/_strings/commands/melee-spread-command.ftl # Resources/Locale/en-US/_strings/commands/persistence-save-command.ftl # Resources/Locale/en-US/_strings/commands/show-access-readers-command.ftl # Resources/Locale/en-US/_strings/commands/show-emergency-shuttle-command.ftl # Resources/Locale/en-US/_strings/persistence/command.ftl # Resources/Prototypes/Catalog/Fills/Crates/armory.yml # Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml # Resources/Prototypes/Entities/Clothing/Belt/belts.yml # Resources/Prototypes/Entities/Clothing/Head/scraphelmet.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/scraparmor.yml # Resources/Prototypes/Entities/Objects/Fun/pai.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml # Resources/Prototypes/Recipes/Crafting/improvised.yml |
||
|---|---|---|
| .. | ||
| Pacification | ||
| CombatModeComponent.cs | ||
| DisarmedEvent.cs | ||
| DisarmMalusComponent.cs | ||
| SharedCombatModeSystem.cs | ||