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
..
containers.yml	Борги получают структурный и кислотный урон	2025-01-18 01:57:05 +03:00
examine_messages.yml	Move WindowComponent to ECS (#6267)	2022-01-29 16:21:38 +11:00
groups.yml	Add Holy damage (#32755)	2024-12-16 16:33:32 +01:00
modifier_sets.yml	Merge remote-tracking branch 'space-wizards/master'	2025-06-14 20:37:34 +03:00
types.yml	Add Holy damage (#32755)	2024-12-16 16:33:32 +01:00