NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-14 12:51:10 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Client/Humanoid
History
Morbo c58729755f Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
#	Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png
#	Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon-on.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
2023-03-24 05:48:43 +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 master-syndie 2023-03-14 05:18:41 +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 Humanoid appearance refactor (#10882) 2022-09-22 17:19:00 -05:00
MarkingPicker.xaml.cs Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-03-24 05:48:43 +03:00
SingleMarkingPicker.xaml Humanoid appearance refactor (#10882) 2022-09-22 17:19:00 -05:00
SingleMarkingPicker.xaml.cs Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-03-24 05:48:43 +03:00