From 778a704b5820811d9267a23a8c080a83bc606ae4 Mon Sep 17 00:00:00 2001 From: Krunklehorn <42424291+Krunklehorn@users.noreply.github.com> Date: Sat, 3 Feb 2024 03:06:44 -0500 Subject: [PATCH] Fixed unable to select None for character spawn priority (#24897) Allows None to be selected --- Content.Shared/Preferences/HumanoidCharacterProfile.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs index 9cf291cda7..09fb007225 100644 --- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs +++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs @@ -115,7 +115,7 @@ namespace Content.Shared.Preferences new HumanoidCharacterAppearance(), ClothingPreference.Jumpsuit, BackpackPreference.Backpack, - SpawnPriorityPreference.Arrivals, + SpawnPriorityPreference.None, new Dictionary { {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 { {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 { {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(JobPriorities -- 2.51.2