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
..
Components	Merge remote-tracking branch 'space-wizards/master'	2025-04-15 04:03:44 +03:00
Systems	Merge remote-tracking branch 'space-wizards/master'	2025-04-04 12:42:34 +03:00
AccessGroupPrototype.cs	Cleanup: Remove redundant prototype name specifications (#35793)	2025-03-19 19:30:31 +01:00
AccessLevelPrototype.cs	Cleanup: Remove redundant prototype name specifications (#35793)	2025-03-19 19:30:31 +01:00
SharedAccessWire.cs	Fix ACC wire light not appearing (#30453)	2024-07-29 23:04:17 -04:00
SharedAgentIDCardSystem.cs	Add tooltips to the agent ID job icons and improve status icon prototypes (#28575)	2024-08-09 16:14:07 +10:00