tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sort markings alphabetically by name (#14778)

Browse Source
This commit is contained in:
Nemanja
2023-03-23 01:03:20 -04:00
committed by GitHub
parent 80efcdc231
commit e4fc696e62
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Client/Humanoid/MarkingPicker.xaml.cs
View File

@@ -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);
}