]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fixed bug where ID card computer defaulted to the atmos as the job icon. (#28462)
authorbeck-thompson <107373427+beck-thompson@users.noreply.github.com>
Sat, 1 Jun 2024 17:29:46 +0000 (10:29 -0700)
committerGitHub <noreply@github.com>
Sat, 1 Jun 2024 17:29:46 +0000 (13:29 -0400)
Fixed ID atmos bug!

Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs

index 298912e7d536e5cbcb1cee040ed01da4082ec2c6..82f6ebd8b59cb0d4c31ee12a3a130ac9829aaf69 100644 (file)
@@ -27,6 +27,9 @@ namespace Content.Client.Access.UI
         private string? _lastJobTitle;
         private string? _lastJobProto;
 
+        // The job that will be picked if the ID doesn't have a job on the station.
+        private static ProtoId<JobPrototype> _defaultJob = "Passenger";
+
         public IdCardConsoleWindow(IdCardConsoleBoundUserInterface owner, IPrototypeManager prototypeManager,
             List<ProtoId<AccessLevelPrototype>> accessLevels)
         {
@@ -65,7 +68,6 @@ namespace Content.Client.Access.UI
             }
 
             JobPresetOptionButton.OnItemSelected += SelectJobPreset;
-
             _accessButtons.Populate(accessLevels, prototypeManager);
             AccessLevelControlContainer.AddChild(_accessButtons);
 
@@ -172,11 +174,15 @@ namespace Content.Client.Access.UI
                                        new List<ProtoId<AccessLevelPrototype>>());
 
             var jobIndex = _jobPrototypeIds.IndexOf(state.TargetIdJobPrototype);
-            if (jobIndex >= 0)
+            // If the job index is < 0 that means they don't have a job registered in the station records.
+            // For example, a new ID from a box would have no job index.
+            if (jobIndex < 0)
             {
-                JobPresetOptionButton.SelectId(jobIndex);
+                jobIndex = _jobPrototypeIds.IndexOf(_defaultJob);
             }
 
+            JobPresetOptionButton.SelectId(jobIndex);
+
             _lastFullName = state.TargetIdFullName;
             _lastJobTitle = state.TargetIdJobTitle;
             _lastJobProto = state.TargetIdJobPrototype;