diff --git a/Content.Client/Humanoid/MarkingPicker.xaml.cs b/Content.Client/Humanoid/MarkingPicker.xaml.cs index 0f314783e2..74f02128e5 100644 --- a/Content.Client/Humanoid/MarkingPicker.xaml.cs +++ b/Content.Client/Humanoid/MarkingPicker.xaml.cs @@ -183,7 +183,8 @@ public sealed partial class MarkingPicker : Control ? _markingManager.MarkingsByCategory(_selectedMarkingCategory) : _markingManager.MarkingsByCategoryAndSpecies(_selectedMarkingCategory, _currentSpecies); - foreach (var marking in markings.Values) + var sortedMarkings = markings.OrderBy(p => Loc.GetString(GetMarkingName(p.Value))); + foreach (var (_, marking) in sortedMarkings) { if (_currentMarkings.TryGetMarking(_selectedMarkingCategory, marking.ID, out _)) { @@ -207,7 +208,7 @@ public sealed partial class MarkingPicker : Control if (!IgnoreSpecies) { - _currentMarkings.EnsureSpecies(_currentSpecies, null, _markingManager); + _currentMarkings.EnsureSpecies(_currentSpecies, null, _markingManager); } // walk backwards through the list for visual purposes @@ -426,7 +427,7 @@ public sealed partial class MarkingPicker : Control { markingSet.AddBack(MarkingCategories.Hair, HairMarking); } - if (FacialHairMarking != null) + if (FacialHairMarking != null) { markingSet.AddBack(MarkingCategories.FacialHair, FacialHairMarking); } diff --git a/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs b/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs index 2e7c09f79e..d5603a9b70 100644 --- a/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs +++ b/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs @@ -176,7 +176,8 @@ public sealed partial class SingleMarkingPicker : BoxContainer MarkingList.Clear(); - foreach (var (id, marking) in _markingPrototypeCache) + var sortedMarkings = _markingPrototypeCache.OrderBy(p => Loc.GetString($"marking-{p.Key}")); + foreach (var (id, marking) in sortedMarkings) { var item = MarkingList.AddItem(Loc.GetString($"marking-{id}"), marking.Sprites[0].Frame0()); item.Metadata = marking.ID;