cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7664 from Kyep/flagged_job_fixes_2

Browse Source 
Fixes #7657 - really persistent priority jobs
This commit is contained in:
Fox McCloud
2017-07-08 20:32:06 -04:00
committed by GitHub
parent 0b15e47623 b74499f7e4
commit de183c591c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/card.dm
+3 -1
View File
@@ -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