Vigers Ray 5e89b697f6 Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs # Content.Server/Explosion/EntitySystems/ExplosionSystem.cs # Resources/Maps/_Sunrise/Station/marathon.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/GameRules/events.yml # Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json		2025-08-25 03:48:48 +03:00
..
Artifact	Moving FlammableComponent to Shared (#39870)	2025-08-24 13:46:23 -07:00
Equipment	predict morgue and crematorium (#39293)	2025-08-21 16:49:50 -07:00
XenoArtifacts/Effects/Components	Merge remote-tracking branch 'space-wizards/master'	2025-04-15 04:03:44 +03:00