From dba71eefb875e25fb7c0885e73390f68dc15576b Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 25 Mar 2022 15:29:11 +0100 Subject: [PATCH] [MIRROR] Fixes assistants going to medium priority when other job is selected [MDB IGNORE] (#12270) * Fixes assistants going to medium priority when other job is selected (#65645) * Fixes assistants going to medium priority when other job is selected Co-authored-by: Tastyfish --- code/modules/client/preferences.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 3319d335a65..687b5b7c8ea 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -507,9 +507,16 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/character_preview_view) return FALSE if (level == JP_HIGH) + var/datum/job/overflow_role = SSjob.overflow_role + var/overflow_role_title = initial(overflow_role.title) + for(var/other_job in job_preferences) if(job_preferences[other_job] == JP_HIGH) - job_preferences[other_job] = JP_MEDIUM + // Overflow role needs to go to NEVER, not medium! + if(other_job == overflow_role_title) + job_preferences[other_job] = null + else + job_preferences[other_job] = JP_MEDIUM job_preferences[job.title] = level