NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-14 04:41:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Client/Humanoid
History
Morbo 1b79af1fc2 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Changelog/ChangelogManager.cs
#	Content.Client/Doors/AirlockVisualizer.cs
#	Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
#	Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
2023-04-23 16:02:09 +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-04-23 16:02:09 +03:00
HumanoidMarkingModifierBoundUserInterface.cs Makes humanoid appearance component networked. (#13009) 2023-01-24 11:38:19 +11: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