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
..
SharedMechSystem.cs	Merge remote-tracking branch 'space-wizards/master'	2025-06-14 20:37:34 +03:00
SharedMechSystem.Relay.cs	Fix for holoparasite's ability to attack the host through mech (#36659)	2025-06-14 20:22:45 +03:00