NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-14 21:01:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
CatStation/Content.Client/Humanoid
History
Morb0 13b3bfa217 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	.github/workflows/update-wiki.yml
#	Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Content.Shared/Humanoid/Markings/MarkingPrototype.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
#	Resources/ServerInfo/Guidebook/Engineering/AME.xml
#	Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
#	Resources/manifest.yml
2023-09-24 12:56:24 +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-09-24 12:56:24 +03:00
HumanoidMarkingModifierBoundUserInterface.cs Sex restriction for markings (#19894) 2023-09-19 16:56:10 -04:00
HumanoidMarkingModifierWindow.xaml Humanoid appearance refactor (#10882) 2022-09-22 17:19:00 -05:00
HumanoidMarkingModifierWindow.xaml.cs Sex restriction for markings (#19894) 2023-09-19 16:56:10 -04: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-09-24 12:56:24 +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