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
..
Borgs	Convert NameIdentifier to use NameModifierSystem (#36736)	2025-04-20 14:16:59 +10:00
Laws	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-05 15:50:34 +03:00
StationAi	refactor: simple radial menu for easier creation (#34639)	2025-03-31 12:57:47 +03:00