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
..
EmpOnTriggerComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
EmpSystem.cs	Merge remote-tracking branch 'space-wizards/master'	2025-04-15 04:03:44 +03:00