NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-10 19:01:13 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Client/Humanoid
History
Morb0 e21ee44f9e Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Resources/Prototypes/Datasets/verbs.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/aspid.yml
#	Resources/Prototypes/Maps/barratry.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/kettle.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-09-13 16:51:52 +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-13 16:51:52 +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