From 747567f35dff6dd53ee9706c45e54df2001d7404 Mon Sep 17 00:00:00 2001
From: Theomund <34360334+Theomund@users.noreply.github.com>
Date: Sun, 1 Jan 2023 00:49:30 -0500
Subject: [PATCH] Sort crew manifest by name and job title (#13212)

resolves https://github.com/space-wizards/space-station-14/issues/12106
---
 Content.Server/CrewManifest/CrewManifestSystem.cs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Content.Server/CrewManifest/CrewManifestSystem.cs b/Content.Server/CrewManifest/CrewManifestSystem.cs
index 2181625989..1bd61d872b 100644
--- a/Content.Server/CrewManifest/CrewManifestSystem.cs
+++ b/Content.Server/CrewManifest/CrewManifestSystem.cs
@@ -88,13 +88,13 @@ public sealed class CrewManifestSystem : EntitySystem
 
     private void OnBoundUiClose(EntityUid uid, CrewManifestViewerComponent component, BoundUIClosedEvent ev)
     {
-         var owningStation = _stationSystem.GetOwningStation(uid);
-         if (owningStation == null || ev.Session is not IPlayerSession sessionCast)
-         {
-             return;
-         }
+        var owningStation = _stationSystem.GetOwningStation(uid);
+        if (owningStation == null || ev.Session is not IPlayerSession sessionCast)
+        {
+            return;
+        }
 
-         CloseEui(owningStation.Value, sessionCast, uid);
+        CloseEui(owningStation.Value, sessionCast, uid);
     }
 
     /// <summary>
@@ -215,6 +215,8 @@ public sealed class CrewManifestSystem : EntitySystem
             entries.Entries.Add(entry);
         }
 
+        entries.Entries = entries.Entries.OrderBy(e => e.JobTitle).ThenBy(e => e.Name).ToList();
+
         if (_cachedEntries.ContainsKey(station))
         {
             _cachedEntries[station] = entries;