mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-20 03:37:47 +01:00
[MIRROR] More globals (#12341)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
co-authored by
Kashargul
parent
38e634dce7
commit
d031fa3c4e
@@ -30,7 +30,7 @@
|
||||
data["card"] = "[pda.id]"
|
||||
data["assignment"] = pda.id.assignment
|
||||
data["card_cooldown"] = getCooldown()
|
||||
var/datum/job/job = job_master.GetJob(pda.id.rank)
|
||||
var/datum/job/job = GLOB.job_master.GetJob(pda.id.rank)
|
||||
if(job)
|
||||
data["job_datum"] = list(
|
||||
"title" = job.title,
|
||||
@@ -63,7 +63,7 @@
|
||||
|
||||
/datum/data/pda/app/timeclock/proc/getOpenOnDutyJobs(var/mob/user, var/department)
|
||||
var/list/available_jobs = list()
|
||||
for(var/datum/job/job in job_master.occupations)
|
||||
for(var/datum/job/job in GLOB.job_master.occupations)
|
||||
if(isOpenOnDutyJob(user, department, job))
|
||||
available_jobs[job.title] = list(job.title)
|
||||
if(job.alt_titles)
|
||||
@@ -84,8 +84,8 @@
|
||||
&& job.timeoff_factor > 0
|
||||
|
||||
/datum/data/pda/app/timeclock/proc/makeOnDuty(mob/user, var/newrank, var/newassignment)
|
||||
var/datum/job/oldjob = job_master.GetJob(pda.id.rank)
|
||||
var/datum/job/newjob = job_master.GetJob(newrank)
|
||||
var/datum/job/oldjob = GLOB.job_master.GetJob(pda.id.rank)
|
||||
var/datum/job/newjob = GLOB.job_master.GetJob(newrank)
|
||||
if(!oldjob || !isOpenOnDutyJob(user, oldjob.pto_type, newjob))
|
||||
return
|
||||
if(newassignment != newjob.title && !(newassignment in newjob.alt_titles))
|
||||
@@ -112,7 +112,7 @@
|
||||
return
|
||||
|
||||
/datum/data/pda/app/timeclock/proc/makeOffDuty(mob/user)
|
||||
var/datum/job/foundjob = job_master.GetJob(pda.id.rank)
|
||||
var/datum/job/foundjob = GLOB.job_master.GetJob(pda.id.rank)
|
||||
if(!foundjob)
|
||||
return
|
||||
//If we're not in an area that allows clockout and not in a belly, shouldn't be able to clock out.
|
||||
@@ -121,7 +121,7 @@
|
||||
return
|
||||
var/new_dept = foundjob.pto_type || PTO_CIVILIAN
|
||||
var/datum/job/ptojob = null
|
||||
for(var/datum/job/job in job_master.occupations)
|
||||
for(var/datum/job/job in GLOB.job_master.occupations)
|
||||
if(job.pto_type == new_dept && job.timeoff_factor < 0)
|
||||
ptojob = job
|
||||
break
|
||||
|
||||
Reference in New Issue
Block a user