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
..
Consumable	Merge remote-tracking branch 'space-wizards/master'	2025-06-04 13:39:57 +03:00
Materials	fix: allow ejecting diamonds from lathes/silos (#38132)	2025-06-07 13:36:58 -04:00
biological.yml	Merge remote-tracking branch 'space-wizards/master'	2025-05-27 03:41:41 +03:00
botany.yml	Fix that space (#32149)	2024-09-14 14:28:35 +03:00
chemicals.yml	Revert "Traumoxadone (#37126)"	2025-05-08 18:13:33 +02:00
cleaning.yml	Lube Evaporates Slowly (#37998)	2025-06-02 12:41:34 +02:00
elements.yml	Chem colors (#28367)	2024-05-31 12:44:22 -07:00
fun.yml	Add corgium (#37951)	2025-06-14 11:07:48 +02:00
gases.yml	Reduce Liquid Frezon Duration (#38100)	2025-06-06 18:41:21 -04:00
medicine.yml	Merge remote-tracking branch 'space-wizards/master'	2025-05-27 03:41:41 +03:00
narcotics.yml	Merge remote-tracking branch 'space-wizards/master'	2025-06-14 20:37:34 +03:00
pyrotechnic.yml	Vox now can eat trash other other inedible things (#35681)	2025-05-01 20:16:51 +02:00
toxins.yml	Ограничение дальности тазера и шанс на стан (#2245)	2025-06-09 03:48:31 +03:00