]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fixed unable to select None for character spawn priority (#24897)
authorKrunklehorn <42424291+Krunklehorn@users.noreply.github.com>
Sat, 3 Feb 2024 08:06:44 +0000 (03:06 -0500)
committerGitHub <noreply@github.com>
Sat, 3 Feb 2024 08:06:44 +0000 (19:06 +1100)
Allows None to be selected

Content.Shared/Preferences/HumanoidCharacterProfile.cs

index 9cf291cda70beddce53c7d4c6f27b8996b22202f..09fb0072258fe2ea6717a6402ac6d16572373ba2 100644 (file)
@@ -115,7 +115,7 @@ namespace Content.Shared.Preferences
             new HumanoidCharacterAppearance(),
             ClothingPreference.Jumpsuit,
             BackpackPreference.Backpack,
-            SpawnPriorityPreference.Arrivals,
+            SpawnPriorityPreference.None,
             new Dictionary<string, JobPriority>
             {
                 {SharedGameTicker.FallbackOverflowJob, JobPriority.High}
@@ -143,7 +143,7 @@ namespace Content.Shared.Preferences
                 HumanoidCharacterAppearance.DefaultWithSpecies(species),
                 ClothingPreference.Jumpsuit,
                 BackpackPreference.Backpack,
-                SpawnPriorityPreference.Arrivals,
+                SpawnPriorityPreference.None,
                 new Dictionary<string, JobPriority>
                 {
                     {SharedGameTicker.FallbackOverflowJob, JobPriority.High}
@@ -185,7 +185,7 @@ namespace Content.Shared.Preferences
 
             var name = GetName(species, gender);
 
-            return new HumanoidCharacterProfile(name, "", species, age, sex, gender, HumanoidCharacterAppearance.Random(species, sex), ClothingPreference.Jumpsuit, BackpackPreference.Backpack, SpawnPriorityPreference.Arrivals,
+            return new HumanoidCharacterProfile(name, "", species, age, sex, gender, HumanoidCharacterAppearance.Random(species, sex), ClothingPreference.Jumpsuit, BackpackPreference.Backpack, SpawnPriorityPreference.None,
                 new Dictionary<string, JobPriority>
                 {
                     {SharedGameTicker.FallbackOverflowJob, JobPriority.High},
@@ -470,9 +470,10 @@ namespace Content.Shared.Preferences
 
             var spawnPriority = SpawnPriority switch
             {
+                SpawnPriorityPreference.None => SpawnPriorityPreference.None,
                 SpawnPriorityPreference.Arrivals => SpawnPriorityPreference.Arrivals,
                 SpawnPriorityPreference.Cryosleep => SpawnPriorityPreference.Cryosleep,
-                _ => SpawnPriorityPreference.Arrivals // Invalid enum values.
+                _ => SpawnPriorityPreference.None // Invalid enum values.
             };
 
             var priorities = new Dictionary<string, JobPriority>(JobPriorities