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
..
EyeColorPicker.cs	Humanoid appearance refactor (#10882)	2022-09-22 17:19:00 -05:00
HumanoidAppearanceSystem.cs	Merge remote-tracking branch 'space-wizards/master'	2025-04-21 08:56:50 +03:00
HumanoidMarkingModifierBoundUserInterface.cs	Fix window positions not saving (#35055)	2025-02-23 23:57:57 +11:00
HumanoidMarkingModifierWindow.xaml	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
HumanoidMarkingModifierWindow.xaml.cs	Update trivial components to use auto comp states (#20539)	2023-09-28 16:20:29 -07:00
MarkingPicker.xaml	add search to marking editors (#15526)	2023-04-18 22:44:37 -07:00
MarkingPicker.xaml.cs	Merge remote-tracking branch 'space-wizards/master'	2025-04-10 16:34:22 +03:00
SingleMarkingPicker.xaml	add search to marking editors (#15526)	2023-04-18 22:44:37 -07:00
SingleMarkingPicker.xaml.cs	Merge remote-tracking branch 'space-wizards/master'	2025-04-10 16:34:22 +03:00