NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-16 22:01:12 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
CatStation/Content.Client/Humanoid
History
Morb0 4b873cf1cd Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/Textures/Tiles/plating.png
2023-08-06 06:33:32 +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-06 06:33:32 +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