Vigers Ray 5d2cdd3f44 Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Client/Humanoid/HumanoidAppearanceSystem.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.cs # Content.Server/Roles/Jobs/JobSystem.cs # Content.Shared/Humanoid/HumanoidAppearanceComponent.cs # Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml # Resources/Prototypes/Entities/Mobs/Species/vox.yml # Resources/Prototypes/Entities/Objects/Misc/paper.yml # Resources/Prototypes/Entities/Objects/Tools/lighters.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml # Resources/Prototypes/Recipes/Lathes/categories.yml # Resources/Prototypes/Recipes/Lathes/machine_boards.yml # Resources/Prototypes/Species/vox.yml		2025-04-21 08:56:50 +03:00
..
base_objectives.yml	THE WIZARD (#35406)	2025-02-25 22:34:07 -07:00
dragon.yml	remove mind roles from EntityWhitelist (#36089)	2025-04-10 20:45:12 +10:00
ninja.yml	remove mind roles from EntityWhitelist (#36089)	2025-04-10 20:45:12 +10:00
objectiveGroups.yml	Удаление хайджека. (#1861)	2025-04-19 04:56:52 +03:00
paradoxClone.yml	Require traitors to maroon their objective no matter what (#35825)	2025-04-20 17:34:19 -04:00
stealTargetGroups.yml	Merge remote-tracking branch 'space-wizards/master'	2025-03-25 11:30:01 +03:00
thief.yml	remove mind roles from EntityWhitelist (#36089)	2025-04-10 20:45:12 +10:00
traitor.yml	Merge remote-tracking branch 'space-wizards/master'	2025-04-21 08:56:50 +03:00
wizard.yml	remove mind roles from EntityWhitelist (#36089)	2025-04-10 20:45:12 +10:00