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
Morb0 e853272357 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Power/PowerMonitoringWindow.xaml.cs
#	Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
2024-07-21 12:48:56 +03:00
..
EyeColorPicker.cs Humanoid appearance refactor (#10882) 2022-09-22 17:19:00 -05:00
HumanoidAppearanceSystem.cs Mega Antag Refactor (#25786) 2024-04-25 11:31:45 +10:00
HumanoidMarkingModifierBoundUserInterface.cs Reapply "Remove some BUI boilerplate" (#30214) (#30219) 2024-07-21 14:48:13 +10:00
HumanoidMarkingModifierWindow.xaml Shuttle console + FTL rework (#24430) 2024-03-03 18:39:19 +11:00
HumanoidMarkingModifierWindow.xaml.cs Update trivial components to use auto comp states (#20539) 2023-09-28 16:20:29 -07:00
MarkingPicker.xaml add search to marking editors (#15526) 2023-04-18 22:44:37 -07:00
MarkingPicker.xaml.cs Use shared sponsors manager 2024-05-13 17:45:23 +03:00
SingleMarkingPicker.xaml add search to marking editors (#15526) 2023-04-18 22:44:37 -07:00
SingleMarkingPicker.xaml.cs Use shared sponsors manager 2024-05-13 17:45:23 +03:00