Vigers Ray 77d4af8975 Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Server/Atmos/EntitySystems/FlammableSystem.cs # Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs # Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactGasTriggerComponent.cs # Content.Shared/Damage/Systems/StaminaSystem.cs # Content.Shared/Inventory/InventorySystem.Relay.cs # Resources/Locale/en-US/_strings/chat/ui/chat-window.ftl # Resources/Locale/en-US/_strings/damage/damage-popup-component.ftl # Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml # Resources/Prototypes/XenoArch/Effects/normal_effects.yml # Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo.png # Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json # Resources/migration.yml		2025-04-15 04:03:44 +03:00
..
Commands	Predict Labels (#36406)	2025-04-10 22:19:48 -07:00
Components	Merge remote-tracking branch 'space-wizards/master'	2025-03-25 11:30:01 +03:00
Events	Replace Matrix3 with System.Numerics.Matrix3x2 (#27443)	2024-06-02 14:07:41 +10:00
Systems	Merge remote-tracking branch 'space-wizards/master'	2025-04-15 04:03:44 +03:00
DockingConfig.cs	Fix shuttle arrival visualizer (#35772)	2025-04-15 00:34:18 +10:00
DroneConsoleComponent.cs	Фикс половины тестов	2025-01-06 00:09:27 +03:00