Vigers Ray 3cf56cd5b3 Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Server/Access/Systems/AgentIDCardSystem.cs # Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs # Content.Server/GameTicking/Rules/ThiefRuleSystem.cs # Content.Server/Medical/SuitSensors/SuitSensorSystem.cs # Content.Server/Zombies/ZombieSystem.cs # Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs # Content.Shared/Standing/StandingStateComponent.cs # Content.Shared/Standing/StandingStateSystem.cs # Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs # Content.Shared/Stunnable/SharedStunSystem.cs # Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-changeling.ftl # Resources/Locale/en-US/_strings/ghost/observer-role.ftl # Resources/Locale/en-US/_strings/robotics/borg_modules.ftl # Resources/Prototypes/Entities/Clothing/Ears/specific.yml # Resources/Prototypes/Entities/Clothing/Eyes/specific.yml # Resources/Prototypes/Entities/Clothing/Hands/specific.yml # Resources/Prototypes/Entities/Clothing/Head/specific.yml # Resources/Prototypes/Entities/Clothing/Neck/specific.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml # Resources/Prototypes/Entities/Clothing/Shoes/specific.yml # Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/animals.yml # Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml # Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml # Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml # Resources/Prototypes/Entities/Objects/Materials/parts.yml # Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml		2025-08-13 14:13:30 +03:00
..
Audio	Merge remote-tracking branch 'space-wizards/master'	2025-08-10 01:49:23 +03:00
Changelog	Merge remote-tracking branch 'space-wizards/master'	2025-08-13 14:13:30 +03:00
ConfigPresets	Merge remote-tracking branch 'space-wizards/master'	2025-08-10 01:49:23 +03:00
Credits	Update Credits (#39512)	2025-08-10 02:45:37 +02:00
Fonts	Sentry turrets - Part 5: Reuseable UI components (#35149)	2025-05-03 12:19:08 -05:00
IgnoredPrototypes
Locale	Merge remote-tracking branch 'space-wizards/master'	2025-08-13 14:13:30 +03:00
Maps	Merge remote-tracking branch 'space-wizards/master'	2025-08-13 14:13:30 +03:00
Prototypes	Merge remote-tracking branch 'space-wizards/master'	2025-08-13 14:13:30 +03:00
ServerInfo	Merge remote-tracking branch 'space-wizards/master'	2025-08-10 01:49:23 +03:00
Textures	Merge remote-tracking branch 'space-wizards/master'	2025-08-13 14:13:30 +03:00
clientCommandPerms.yml	Add /showaccessreaders to +MAPPING and +DEBUG (#37759)	2025-06-25 23:23:05 +02:00
engineCommandPerms.yml	Merge remote-tracking branch 'space-wizards/master'	2025-08-10 01:49:23 +03:00
keybinds.yml	Merge remote-tracking branch 'space-wizards/master'	2025-08-10 01:49:23 +03:00
manifest.yml	returned default ss14 logos	2025-04-18 17:41:44 +03:00
map_attributions.txt	Amber Station - Small Improvements (#36335)	2025-04-14 11:58:21 -07:00
mapping_actions.yml	action refactor proper ecs edition (#27422)	2025-05-28 15:52:11 -04:00
migration.yml	Merge remote-tracking branch 'space-wizards/master'	2025-08-10 01:49:23 +03:00
sunrise_map_attributions.txt	Возвращение барратри (#1788)	2025-04-18 00:51:17 +03:00
toolshedEngineCommandPerms.yml