Morb0 9a4db6ca8d Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml # Content.Server/Doors/Systems/AirlockSystem.cs # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Entities/Mobs/Species/diona.yml # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png # Resources/Textures/Tiles/attributions.yml		2023-08-11 03:09:35 +03:00
..
EyeColorPicker.cs	Humanoid appearance refactor (#10882)	2022-09-22 17:19:00 -05:00
HumanoidAppearanceSystem.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-11 03:09:35 +03:00
HumanoidMarkingModifierBoundUserInterface.cs	Cleaner BoundUserInterfaces (#17736)	2023-07-09 02:02:17 +10:00
HumanoidMarkingModifierWindow.xaml	Humanoid appearance refactor (#10882)	2022-09-22 17:19:00 -05:00
HumanoidMarkingModifierWindow.xaml.cs	Marking default coloring (#13039)	2023-03-04 18:59:07 -08:00
MarkingPicker.xaml	add search to marking editors (#15526)	2023-04-18 22:44:37 -07:00
MarkingPicker.xaml.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-04-23 16:02:09 +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 'upstream/master' into upstream-sync	2023-04-23 16:02:09 +03:00