Ed 5420469d62 Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync ...

# Conflicts:
#	Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs

2025-04-15 00:44:29 +03:00

..

EyeColorPicker.cs

Humanoid appearance refactor (#10882)

2022-09-22 17:19:00 -05:00

HumanoidAppearanceSystem.cs

Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2

2025-03-31 12:41:37 +03:00

HumanoidMarkingModifierBoundUserInterface.cs

Fix window positions not saving (#35055)

2025-02-23 23:57:57 +11: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

Various UI warnings cleanup (#36169)

2025-04-10 20:47:05 +10:00

SingleMarkingPicker.xaml

add search to marking editors (#15526)

2023-04-18 22:44:37 -07:00

SingleMarkingPicker.xaml.cs

Various UI warnings cleanup (#36169)

2025-04-10 20:47:05 +10:00