From b74499f7e446a1c055b3b8a84ae36f8a5c80c716 Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 28 Jun 2017 23:20:29 -0700 Subject: [PATCH] Fixes #7457 - really persistent priority jobs --- code/game/machinery/computer/card.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index e7ef931ff53..d260df8c9b9 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -165,7 +165,7 @@ var/time_last_changed_position = 0 /obj/machinery/computer/card/proc/can_close_job(datum/job/job) if(job) if(!job_blacklisted_full(job) && !job_blacklisted_partial(job) && job_in_department(job, FALSE)) - if(job.total_positions > job.current_positions) + if(job.total_positions > job.current_positions && !(job in job_master.prioritized_jobs)) var/delta = (world.time / 10) - time_last_changed_position if((change_position_cooldown < delta) || (opened_positions[job.title] > 0)) return 1 @@ -181,6 +181,8 @@ var/time_last_changed_position = 0 else if(job_master.prioritized_jobs.len >= 3) return 0 + if(job.total_positions <= job.current_positions) + return 0 return 1 return -1