diff --git a/code/controllers/subsystems/persist_vr.dm b/code/controllers/subsystems/persist_vr.dm index 88bbabe72d3..03ed2cf9b2d 100644 --- a/code/controllers/subsystems/persist_vr.dm +++ b/code/controllers/subsystems/persist_vr.dm @@ -36,15 +36,15 @@ SUBSYSTEM_DEF(persist) // Try and detect job and department of mob var/datum/job/J = detect_job(M) - if(!istype(J) || !J.department || !J.timeoff_factor) + if(!istype(J) || !J.departments[1] || !J.timeoff_factor) if (MC_TICK_CHECK) return continue // Do not collect useless PTO - var/department_earning = J.department - if(J.department == "Command") - department_earning = "Civilian" + var/department_earning = J.departments[1] + if(J.departments[1] == DEPARTMENT_COMMAND) + department_earning = DEPARTMENT_CIVILIAN clear_unused_pto(M) // Update client whatever @@ -90,6 +90,6 @@ SUBSYSTEM_DEF(persist) /datum/controller/subsystem/persist/proc/clear_unused_pto(var/mob/M) var/client/C = M.client LAZYINITLIST(C.department_hours) - if(C.department_hours["Command"]) - C.department_hours["Command"] = null - C.department_hours.Remove("Command") \ No newline at end of file + if(C.department_hours[DEPARTMENT_COMMAND]) + C.department_hours[DEPARTMENT_COMMAND] = null + C.department_hours.Remove(DEPARTMENT_COMMAND) \ No newline at end of file diff --git a/code/game/jobs/job/job_vr.dm b/code/game/jobs/job/job_vr.dm index 060aee6fefd..a7a4d757dfd 100644 --- a/code/game/jobs/job/job_vr.dm +++ b/code/game/jobs/job/job_vr.dm @@ -13,4 +13,4 @@ // Check client-specific availability rules. /datum/job/proc/player_has_enough_pto(client/C) - return timeoff_factor >= 0 || (C && LAZYACCESS(C.department_hours, department) > 0) + return timeoff_factor >= 0 || (C && LAZYACCESS(C.department_hours, departments[1]) > 0) diff --git a/code/game/machinery/computer/timeclock_vr.dm b/code/game/machinery/computer/timeclock_vr.dm index 4969e89334b..4d648bc2aff 100644 --- a/code/game/machinery/computer/timeclock_vr.dm +++ b/code/game/machinery/computer/timeclock_vr.dm @@ -84,7 +84,7 @@ if (job) data["job_datum"] = list( "title" = job.title, - "department" = job.department, + "department" = job.departments[1], "selection_color" = job.selection_color, "economic_modifier" = job.economic_modifier, "timeoff_factor" = job.timeoff_factor @@ -92,7 +92,7 @@ if(config.time_off && config.pto_job_change) data["allow_change_job"] = TRUE if(job && job.timeoff_factor < 0) // Currently are Off Duty, so gotta lookup what on-duty jobs are open - data["job_choices"] = getOpenOnDutyJobs(user, job.department) + data["job_choices"] = getOpenOnDutyJobs(user, job.departments[1]) ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) @@ -141,7 +141,7 @@ var/list/available_jobs = list() for(var/datum/job/job in job_master.occupations) if(job && job.is_position_available() && !job.whitelist_only && !jobban_isbanned(user,job.title) && job.player_old_enough(user.client)) - if(job.department == department && !job.disallow_jobhop && job.timeoff_factor > 0) + if(job.departments[1] == department && !job.disallow_jobhop && job.timeoff_factor > 0) available_jobs += job.title if(job.alt_titles) for(var/alt_job in job.alt_titles) @@ -182,12 +182,12 @@ break if(!foundjob) return - var/real_dept = foundjob.department + var/real_dept = foundjob.departments[1] if(real_dept && real_dept == "Command") real_dept = "Civilian" var/datum/job/ptojob = null for(var/datum/job/job in job_master.occupations) - if(job.department == real_dept && job.timeoff_factor < 0) + if(job.departments[1] == real_dept && job.timeoff_factor < 0) ptojob = job break if(ptojob && card) diff --git a/maps/southern_cross/southern_cross_jobs_vr.dm b/maps/southern_cross/southern_cross_jobs_vr.dm index eb77cce3f5d..fad9af4453c 100644 --- a/maps/southern_cross/southern_cross_jobs_vr.dm +++ b/maps/southern_cross/southern_cross_jobs_vr.dm @@ -26,7 +26,7 @@ var/const/SAR =(1<<14) /datum/department/planetside name = DEPARTMENT_PLANET - color = "#555555" + color = "#bab421" sorting_order = 2 // Same as cargo in importance. /datum/job/pathfinder @@ -34,6 +34,7 @@ var/const/SAR =(1<<14) flag = PATHFINDER departments = list(DEPARTMENT_PLANET) head_position = 1 + sorting_order = 1 // above the other explorers department_flag = MEDSCI faction = "Station" total_positions = 1