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
..
ControlExtensions	Link to reagent ingredients on the same Guidebook page (#36700)	2025-05-09 10:06:26 +10:00
Controls	Borg hands & hand whitelisting (#38668)	2025-08-12 15:21:42 -07:00
Fragments
RichText	Replace ValidatePrototypeId uses with ProtoId or EntProtoId (#38814)	2025-07-07 21:57:05 +02:00
Screens	Нерф и фикс баннихопа	2025-01-06 23:48:07 +03:00
Systems	Merge remote-tracking branch 'space-wizards/master'	2025-08-13 14:13:30 +03:00
XamlExtensions	Revert "Update submodule to 175.0.0 (#21318)" (#21319)	2023-10-29 15:29:30 +11:00
BoundKeyHelpers.cs	Use different chatbox placeholder when dependent keys unbound (#22747)	2023-12-22 11:39:29 -08:00
BuiPredictionState.cs	Battery (SMES/substation) interface (#36386)	2025-04-27 21:08:34 +10:00
BuiPreTickUpdateSystem.cs	Battery (SMES/substation) interface (#36386)	2025-04-27 21:08:34 +10:00
ButtonHelpers.cs
IEntityControl.cs
InputCoalescer.cs	Battery (SMES/substation) interface (#36386)	2025-04-27 21:08:34 +10:00
StatsWindow.xaml	Fix showvalue Ui for melee weapons (#38703)	2025-08-06 15:01:49 -07:00
StatsWindow.xaml.cs
StatValuesEui.cs