From 1d630cba18e02e654564aa3c7b84f4f8eb9612f4 Mon Sep 17 00:00:00 2001
From: TheFurryFeline <joshuaponzo@gmail.com>
Date: Sun, 19 May 2019 15:06:26 -0400
Subject: [PATCH] Off-Duty Jobs Frenzy

Add special IDs that have assistant access.
Force requirement for HOP to switch back on to command jobs.
Minor capitalisation fix.
---
 code/datums/outfits/jobs/civilian.dm | 20 ++++++++++++++++++++
 code/game/jobs/job/job_vr.dm         |  2 ++
 code/game/jobs/job/offduty_vr.dm     |  4 ++--
 code/game/jobs/job/z_all_jobs_vr.dm  | 22 ++++++++++++++++++++++
 4 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/code/datums/outfits/jobs/civilian.dm b/code/datums/outfits/jobs/civilian.dm
index f3237249b1..8f1f00d7f6 100644
--- a/code/datums/outfits/jobs/civilian.dm
+++ b/code/datums/outfits/jobs/civilian.dm
@@ -1,7 +1,27 @@
+//TFF 19/5/19 - Port VOREStation's completed Timeclock code - add off-duty jobs and their vars from a _vr file upstream.
 /decl/hierarchy/outfit/job/assistant
 	name = OUTFIT_JOB_NAME(USELESS_JOB) //VOREStation Edit - Visitor not Assistant
 	id_type = /obj/item/weapon/card/id/assistant
 
+/decl/hierarchy/outfit/job/assistant/worker
+	id_type = /obj/item/weapon/card/id/civilian
+
+/decl/hierarchy/outfit/job/assistant/cargo
+	id_type = /obj/item/weapon/card/id/cargo
+
+/decl/hierarchy/outfit/job/assistant/engineer
+	id_type = /obj/item/weapon/card/id/engineering
+	flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL
+
+/decl/hierarchy/outfit/job/assistant/medic
+	id_type = /obj/item/weapon/card/id/medical
+
+/decl/hierarchy/outfit/job/assistant/scientist
+	id_type = /obj/item/weapon/card/id/science
+
+/decl/hierarchy/outfit/job/assistant/officer
+	id_type = /obj/item/weapon/card/id/security
+
 /decl/hierarchy/outfit/job/assistant/visitor
 	name = OUTFIT_JOB_NAME("Visitor")
 	id_pda_assignment = "Visitor"
diff --git a/code/game/jobs/job/job_vr.dm b/code/game/jobs/job/job_vr.dm
index 71cb74a950..a3200bdee3 100644
--- a/code/game/jobs/job/job_vr.dm
+++ b/code/game/jobs/job/job_vr.dm
@@ -7,6 +7,8 @@
 
 	//Every hour playing this role gains this much time off. (Can be negative for off duty jobs!)
 	var/timeoff_factor = 3
+//TFF 19/5/19 - Port VOREStation's completed Timeclock code - Add check to prevent switching mid-round without HOP for command jobs
+	var/disallow_jobhop = FALSE
 
 // Check client-specific availability rules.
 /datum/job/proc/player_has_enough_pto(client/C)
diff --git a/code/game/jobs/job/offduty_vr.dm b/code/game/jobs/job/offduty_vr.dm
index 420943c562..0fbeaffa82 100644
--- a/code/game/jobs/job/offduty_vr.dm
+++ b/code/game/jobs/job/offduty_vr.dm
@@ -1,9 +1,9 @@
 //
 // "Off-duty" jobs are for people who want to do nothing and have earned it.
 //
-
+//TFF 19/5/19 - Capitalisation fix
 /datum/job/offduty_civilian
-	title = "Off-Duty Worker"
+	title = "Off-duty Worker"
 	latejoin_only = TRUE
 	timeoff_factor = -1
 	total_positions = -1
diff --git a/code/game/jobs/job/z_all_jobs_vr.dm b/code/game/jobs/job/z_all_jobs_vr.dm
index 7cdb8f6301..faa75f6ec6 100644
--- a/code/game/jobs/job/z_all_jobs_vr.dm
+++ b/code/game/jobs/job/z_all_jobs_vr.dm
@@ -1,8 +1,30 @@
 //Contains all modified jobs for easy access and editing.
+//TFF 19/5/19 - Port VOREStation's completed Timeclock code - refactor and add jobs that requires an HOP to switch to once going off duty mid-round.
+/datum/job/captain
+	disallow_jobhop = TRUE
 
 /datum/job/hop
+	disallow_jobhop = TRUE
 	alt_titles = list("Deputy Director", "Crew Resources Officer")
 
+/datum/job/hos
+	disallow_jobhop = TRUE
+
+/datum/job/chief_engineer
+	disallow_jobhop = TRUE
+
+/datum/job/cmo
+	disallow_jobhop = TRUE
+
+/datum/job/rd
+	disallow_jobhop = TRUE
+
+/datum/job/secretary
+	disallow_jobhop = TRUE
+
+/datum/job/lawyer
+	disallow_jobhop = TRUE
+
 /datum/job/doctor
 	total_positions = 5
 	spawn_positions = 5