Vigers Ray adc3bd06a9 Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Server/Zombies/ZombieSystem.cs # Content.Shared/Damage/DamageSpecifier.cs # Resources/Locale/en-US/markings/undergarment.ftl # Resources/Maps/_Sunrise/Shuttles/DSO/Other/alt_representative_shuttle.yml # Resources/Maps/_Sunrise/Station/xeno.yml # Resources/Prototypes/Entities/Clothing/Back/backpacks.yml # Resources/Prototypes/Polymorphs/polymorph.yml		2025-06-14 20:37:34 +03:00
..
Components	Add Diona rooting (#32782)	2025-06-04 12:52:59 +02:00
Events	The long overdue downfall of stun meta - Stamina resists on Nukie & ERT Suits. (#35580)	2025-04-14 17:27:26 +02:00
ForceSay	Added Pain Numbness Trait (#34538)	2025-01-27 11:34:20 +01:00
Prototypes	Cleanup: Remove redundant prototype name specifications (#35793)	2025-03-19 19:30:31 +01:00
Systems	Merge remote-tracking branch 'space-wizards/master'	2025-05-27 03:41:41 +03:00
DamageModifierSet.cs	fix cauterization (#23264)	2024-01-01 00:08:25 -08:00
DamageSpecifier.cs	Merge remote-tracking branch 'space-wizards/master'	2025-06-14 20:37:34 +03:00
DamageSpecifierDictionarySerializer.cs	Add SaveLoadSavePrototype test (#18859)	2023-08-08 17:27:16 +10:00
DamageVisualizerKeys.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00