MP resprite and overhaul redux [IDB IGNORE]

ColonialMarinesALPHA.dme

@@ -623,10 +623,8 @@
 #include "code\game\jobs\job\command\cic\captain.dm"
 #include "code\game\jobs\job\command\cic\executive.dm"
 #include "code\game\jobs\job\command\cic\staffofficer.dm"
-#include "code\game\jobs\job\command\police\cadet_police.dm"
 #include "code\game\jobs\job\command\police\chief_police.dm"
 #include "code\game\jobs\job\command\police\police.dm"
-#include "code\game\jobs\job\command\police\warden.dm"
 #include "code\game\jobs\job\logistics\logistics.dm"
 #include "code\game\jobs\job\logistics\cargo\cargo_tech.dm"
 #include "code\game\jobs\job\logistics\cargo\chief_req.dm"

code/__DEFINES/job.dm

@@ -54,12 +54,10 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 #define JOB_CREWMAN						"Vehicle Crewman"
 #define JOB_INTEL						"Intelligence Officer"
 
-#define JOB_POLICE_CADET				"MP Cadet"
 #define JOB_POLICE						"Military Police"
-#define JOB_WARDEN						"Military Warden"
 #define JOB_CHIEF_POLICE				"Chief MP"
-#define JOB_POLICE_ROLES                /datum/timelock/mp
-#define JOB_POLICE_ROLES_LIST           list(JOB_POLICE_CADET, JOB_POLICE, JOB_WARDEN, JOB_CHIEF_POLICE)
+#define JOB_POLICE_ROLES			/datum/timelock/mp
+#define JOB_POLICE_ROLES_LIST		list(JOB_POLICE, JOB_CHIEF_POLICE)
 
 #define JOB_SEA							"Senior Enlisted Advisor"
 

code/__DEFINES/mode.dm

@@ -124,13 +124,13 @@ var/list/be_special_flags = list(
 //=================================================
 
 //Role defines, specifically lists of roles for job bans, crew manifests and the like.
-var/global/list/ROLES_COMMAND 		= list(JOB_CO, JOB_XO, JOB_SO, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_POLICE, JOB_POLICE_CADET, JOB_CORPORATE_LIAISON, JOB_CHIEF_REQUISITION, JOB_CHIEF_ENGINEER, JOB_CMO, JOB_CHIEF_POLICE, JOB_SEA, JOB_SYNTH, JOB_WARDEN)
+var/global/list/ROLES_COMMAND 		= list(JOB_CO, JOB_XO, JOB_SO, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_POLICE, JOB_CORPORATE_LIAISON, JOB_CHIEF_REQUISITION, JOB_CHIEF_ENGINEER, JOB_CMO, JOB_CHIEF_POLICE, JOB_SEA, JOB_SYNTH)
 
-#define ROLES_OFFICERS				list(JOB_CO, JOB_XO, JOB_SO, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE, JOB_POLICE_CADET)
+#define ROLES_OFFICERS				list(JOB_CO, JOB_XO, JOB_SO, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_POLICE)
 var/global/list/ROLES_CIC			= list(JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO)
 var/global/list/ROLES_AUXIL_SUPPORT	= list(JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT)
 var/global/list/ROLES_MISC			= list(JOB_SYNTH, JOB_WORKING_JOE, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_MESS_SERGEANT, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH)
-var/global/list/ROLES_POLICE		= list(JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE, JOB_POLICE_CADET)
+var/global/list/ROLES_POLICE		= list(JOB_CHIEF_POLICE, JOB_POLICE)
 var/global/list/ROLES_ENGINEERING 	= list(JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH, JOB_MAINT_TECH, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH)
 var/global/list/ROLES_REQUISITION 	= list(JOB_CHIEF_REQUISITION, JOB_CARGO_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION)
 var/global/list/ROLES_MEDICAL 	  	= list(JOB_CMO, JOB_RESEARCHER, JOB_DOCTOR, JOB_NURSE, JOB_WO_CMO, JOB_WO_RESEARCHER, JOB_WO_DOCTOR)
@@ -150,7 +150,7 @@ var/global/list/ROLES_WO			= list(JOB_WO_CO, JOB_WO_XO, JOB_WO_CORPORATE_LIAISON
 #define BLURB_USCM_COMBAT JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO, JOB_CREWMAN, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_SEA,\
 						JOB_SQUAD_LEADER, JOB_SQUAD_RTO, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE
 #define BLURB_USCM_FLIGHT JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF
-#define BLURB_USCM_MP JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE
+#define BLURB_USCM_POLICE JOB_CHIEF_POLICE, JOB_POLICE
 #define BLURB_USCM_ENGI JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH, JOB_MAINT_TECH, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH, JOB_WO_PILOT
 #define BLURB_USCM_MEDICAL JOB_CMO, JOB_RESEARCHER, JOB_DOCTOR, JOB_NURSE, JOB_WO_CMO, JOB_WO_RESEARCHER, JOB_WO_DOCTOR
 #define BLURB_USCM_REQ JOB_CHIEF_REQUISITION, JOB_CARGO_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION

code/__HELPERS/job.dm

@@ -80,11 +80,9 @@
 			JOB_RESEARCHER,
 			JOB_DOCTOR,
 			JOB_NURSE,
-			JOB_POLICE_CADET,
 			JOB_POLICE,
-			JOB_WARDEN,
 			JOB_CHIEF_POLICE,
-			JOB_WARDEN,
 			JOB_SEA,
+
 			JOB_MARINE
 			)

code/datums/emergency_calls/inspection.dm

@@ -19,7 +19,7 @@
 	var/mob/living/carbon/human/H = new(T)
 	M.transfer_to(H, TRUE)
 
-	if(!leader && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(H.client, list(JOB_WARDEN, JOB_CHIEF_POLICE), time_required_for_job))
+	if(!leader && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(H.client, JOB_CHIEF_POLICE, time_required_for_job))
 		leader = H
 		arm_equipment(H, /datum/equipment_preset/uscm_event/provost/inspector, TRUE, TRUE)
 		to_chat(H, SPAN_ROLE_HEADER("You are an Inspector of the USCM Provost Office!"))
@@ -98,7 +98,7 @@
 	var/mob/living/carbon/human/H = new(T)
 	M.transfer_to(H, TRUE)
 
-	if(!leader && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(H.client, list(JOB_INTEL,JOB_WARDEN), time_required_for_job))
+	if(!leader && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(H.client, JOB_INTEL, time_required_for_job))
 		leader = H
 		arm_equipment(H, /datum/equipment_preset/uscm_event/uaac/tis/io, TRUE, TRUE)
 		to_chat(H, SPAN_ROLE_HEADER("You are an Intelligence Officer working for the UAAC-TIS!"))

code/datums/emergency_calls/provost.dm

@@ -17,7 +17,7 @@
 	var/mob/living/carbon/human/H = new(T)
 	M.transfer_to(H, TRUE)
 
-	if(!leader && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(H.client, list(JOB_WARDEN, JOB_CHIEF_POLICE), time_required_for_job))       //First one spawned is always the leader.
+	if(!leader && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(H.client, list(JOB_POLICE, JOB_CHIEF_POLICE), time_required_for_job))       //First one spawned is always the leader.
 		leader = H
 		arm_equipment(H, /datum/equipment_preset/uscm_event/provost/tml, TRUE, TRUE)
 		to_chat(H, SPAN_ROLE_HEADER("You are the leader of a Provost Enforcer Team!"))

code/datums/emergency_calls/riot.dm

@@ -17,14 +17,14 @@
 	var/mob/living/carbon/human/H = new(T)
 	M.transfer_to(H, TRUE)
 
-	if(!leader && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(H.client, list(JOB_WARDEN, JOB_CHIEF_POLICE), time_required_for_job))
+	if(!leader && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(H.client, list(JOB_POLICE, JOB_CHIEF_POLICE), time_required_for_job))
 		leader = H
-		arm_equipment(H, /datum/equipment_preset/uscm_ship/uscm_police/riot_mp/riot_cmp, TRUE, TRUE)
+		arm_equipment(H, /datum/equipment_preset/uscm_ship/mp/riot_mp/riot_cmp, TRUE, TRUE)
 		to_chat(H, SPAN_ROLE_HEADER("You are the leader of the High Command Riot Control!"))
 		to_chat(H, SPAN_ROLE_BODY("Follow any orders directly from High Command!"))
 		to_chat(H, SPAN_ROLE_BODY("You only answer to the Marine Law and the High Command!"))
 	else
-		arm_equipment(H, /datum/equipment_preset/uscm_ship/uscm_police/riot_mp, TRUE, TRUE)
+		arm_equipment(H, /datum/equipment_preset/uscm_ship/mp/riot_mp, TRUE, TRUE)
 		to_chat(H, SPAN_ROLE_HEADER("You are a member of the High Command Riot Control!"))
 		to_chat(H, SPAN_ROLE_BODY("Follow any orders directly from High Command or your superior!"))
 		to_chat(H, SPAN_ROLE_BODY("You only answer to your superior, the Marine Law and the High Command!"))

code/datums/factions/uscm.dm

@@ -59,7 +59,6 @@
 				holder.overlays += IMG3
 	else
 		var/marine_rk
-		var/border_rk
 		var/obj/item/card/id/ID = H.get_idcard()
 		var/_role
 		if(H.mind)
@@ -69,16 +68,12 @@
 		switch(GET_DEFAULT_ROLE(_role))
 			if(JOB_XO)
 				marine_rk = "xo"
-				border_rk = "command"
 			if(JOB_CO)
 				marine_rk = "co"
-				border_rk = "command"
 			if(JOB_SO)
 				marine_rk = "so"
-				border_rk = "command"
 			if(JOB_GENERAL, JOB_COLONEL)
 				marine_rk = "general"
-				border_rk = "command"
 			if(JOB_INTEL)
 				marine_rk = "io"
 			if(JOB_PILOT)
@@ -89,39 +84,28 @@
 				marine_rk = "tc"
 			if(JOB_CHIEF_POLICE)
 				marine_rk = "cmp"
-				border_rk = "command"
 			if(JOB_POLICE)
 				marine_rk = "mp"
-			if(JOB_POLICE_CADET)
-				marine_rk = "mpcadet"
-			if(JOB_WARDEN)
-				marine_rk = "warden"
-				border_rk = "command"
 			if(JOB_CHIEF_REQUISITION)
 				marine_rk = "ro"
 			if(JOB_CARGO_TECH)
 				marine_rk = "ct"
 			if(JOB_CHIEF_ENGINEER)
 				marine_rk = "ce"
-				border_rk = "command"
 			if(JOB_MAINT_TECH)
 				marine_rk = "mt"
 			if(JOB_ORDNANCE_TECH)
 				marine_rk = "ot"
 			if(JOB_CMO)
 				marine_rk = "cmo"
-				border_rk = "command"
 			if(JOB_DOCTOR)
 				marine_rk = "doctor"
-				border_rk = "command"
 			if(JOB_RESEARCHER)
 				marine_rk = "researcher"
-				border_rk = "command"
 			if(JOB_NURSE)
 				marine_rk = "nurse"
 			if(JOB_SEA)
 				marine_rk = "sea"
-				border_rk = "command"
 			if(JOB_SYNTH)
 				marine_rk = "syn"
 			if(JOB_MESS_SERGEANT)
@@ -132,13 +116,10 @@
 				marine_rk = "pvtml"
 			if(JOB_PROVOST_INSPECTOR)
 				marine_rk = "pvi"
-				border_rk = "command"
 			if(JOB_PROVOST_ADVISOR)
 				marine_rk = "pva"
-				border_rk = "command"
 			if(JOB_PROVOST_MARSHAL, JOB_PROVOST_CMARSHAL, JOB_PROVOST_SMARSHAL)
 				marine_rk = "pvm"
-				border_rk = "command"
 			if(JOB_TIS_IO)
 				marine_rk = "tisio"
 			if(JOB_TIS_SA)
@@ -148,5 +129,3 @@
 			I.color = "#5A934A"
 			holder.overlays += I
 			holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "hudsquad_[marine_rk]")
-			if(border_rk)
-				holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "hudmarineborder[border_rk]")

code/game/gamemodes/cm_self_destruct.dm

@@ -404,7 +404,7 @@ var/global/datum/authority/branch/evacuation/EvacuationAuthority //This is initi
 			if("dest_trigger")
 				if(EvacuationAuthority.initiate_self_destruct()) nanomanager.close_user_uis(usr, src, "main")
 			if("dest_cancel")
-				var/list/allowed_officers = list("Commanding Officer", "Executive Officer", "Staff Officer", "Chief MP","Chief Medical Officer","Chief Engineer")
+				var/list/allowed_officers = list(JOB_CO, JOB_XO, JOB_SO, JOB_CHIEF_POLICE, JOB_CMO, JOB_CHIEF_ENGINEER)
 				if(!allowed_officers.Find(usr.job))
 					to_chat(usr, SPAN_NOTICE("You don't have the necessary clearance to cancel the emergency destruct system."))
 					return

code/game/gamemodes/colonialmarines/huntergames.dm

@@ -253,7 +253,7 @@ var/waiting_for_drop_votes = 0
 		if(0) //colonial marine
 			H.equip_to_slot_or_del(new /obj/item/clothing/under/marine(H), WEAR_BODY)
 			H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(H), WEAR_FEET)
-		if(1) //MP
+		if(1) // MP
 			H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp(H), WEAR_BODY)
 			H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(H), WEAR_FEET)
 		if(2) //Commander!

code/game/gamemodes/colonialmarines/whiskey_outpost/equipping.dm

@@ -52,10 +52,8 @@ Make the USCM proud!"}
 
 
 //*************************************
-//----------------CMP-------------
+//---------------- Chief MP -------------
 //*************************************/
-
-//Chief MP
 /datum/job/command/warrant/whiskey
 	title = JOB_WO_CHIEF_POLICE
 	selection_class = "job_honor_guard_sl"

code/game/gamemodes/colonialmarines/whiskey_outpost/skills.dm

@@ -1,7 +1,7 @@
 //Skills
 
 /datum/skills/honor_guard
-	name = "Honor Guard" //MP
+	name = "Honor Guard" // MP
 	skills = list(
 		SKILL_VEHICLE = SKILL_VEHICLE_CREWMAN,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
@@ -51,4 +51,4 @@
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_JTAC = SKILL_JTAC_BEGINNER,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER
-	)
+	)

code/game/jobs/job/command/auxiliary/senior.dm

@@ -14,7 +14,6 @@ AddTimelock(/datum/job/command/senior, list(
 	JOB_SQUAD_ROLES = 15 HOURS,
 
 	JOB_ENGINEER_ROLES = 10 HOURS,
-	JOB_POLICE_ROLES = 10 HOURS,
 	JOB_MEDIC_ROLES = 10 HOURS,
 
 	JOB_COMMAND_ROLES = 5 HOURS,

code/game/jobs/job/command/cic/executive.dm

@@ -18,8 +18,7 @@
 	GLOB.marine_leaders -= JOB_XO
 
 AddTimelock(/datum/job/command/executive, list(
-	JOB_COMMAND_ROLES = 5 HOURS,
-	JOB_POLICE_ROLES = 3 HOURS
+	JOB_COMMAND_ROLES = 5 HOURS
 ))
 
 /obj/effect/landmark/start/executive

code/game/jobs/job/command/command.dm

@@ -12,7 +12,7 @@
 	src.roles = JOB_COMMAND_ROLES_LIST
 
 /datum/timelock/mp
-	name = "MP Roles"
+	name = "Military Police Roles"
 
 /datum/timelock/mp/New(name, time_required, list/roles)
 	. = ..()
@@ -23,7 +23,6 @@
 
 /datum/timelock/human/can_play(client/C)
 	return C.get_total_human_playtime() >= time_required
-	
+
 /datum/timelock/human/get_role_requirement(client/C)
 	return time_required - C.get_total_human_playtime()
-

code/game/jobs/job/command/police/chief_police.dm

@@ -1,16 +1,15 @@
-//Chief MP
-/datum/job/command/warrant
+/datum/job/command/cmp
 	title = JOB_CHIEF_POLICE
 	selection_class = "job_cmp"
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
-	gear_preset = /datum/equipment_preset/uscm_ship/uscm_police/cmp
-	entry_message_body = "<a href='"+URL_WIKI_CMP_GUIDE+"'>You</a> are held by a higher standard and are required to obey not only the server rules but the <a href='"+URL_WIKI_LAW+"'>Marine Law</a>. Failure to do so may result in a job ban or server ban. You lead the Military Police, ensure your officers maintain peace and stability aboard the ship. Marines can get rowdy after a few weeks of cryosleep! In addition, you are tasked with the security of high-ranking personnel, including the command staff. Keep them safe!"
+	gear_preset = /datum/equipment_preset/uscm_ship/mp/cmp
+	entry_message_body = "<a href='"+URL_WIKI_CMP_GUIDE+"'>You</a> are held by a higher standard and are required to obey not only the server rules but the <a href='"+URL_WIKI_LAW+"'>Marine Law</a>. Failure to do so may result in a job ban or server ban. You lead the Military Police, ensure they keep the peace and stability aboard the ship. Marines can get rowdy after a few weeks of cryosleep! In addition, you are tasked with the security of high-ranking personnel, including the command staff. Keep them safe!"
 
-AddTimelock(/datum/job/command/warrant, list(
+AddTimelock(/datum/job/command/cmp, list(
 	JOB_POLICE_ROLES = 15 HOURS,
 	JOB_COMMAND_ROLES = 5 HOURS
 ))
 
 /obj/effect/landmark/start/warrant
 	name = JOB_CHIEF_POLICE
-	job = /datum/job/command/warrant
+	job = /datum/job/command/cmp

code/game/jobs/job/command/police/police.dm

@@ -1,19 +1,18 @@
-//Military Police
-/datum/job/command/police
+/datum/job/command/mp
 	title = JOB_POLICE
 	total_positions = 5
 	spawn_positions = 5
-	allow_additional = 1
-	scaled = 1
+	allow_additional = TRUE
+	scaled = TRUE
 	selection_class = "job_mp"
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
-	gear_preset = /datum/equipment_preset/uscm_ship/uscm_police/mp
-	entry_message_body = "<a href='"+URL_WIKI_MP_GUIDE+"'>You</a> are held by a higher standard and are required to obey not only the server rules but the <a href='"+URL_WIKI_LAW+"'>Marine Law</a>. Failure to do so may result in a job ban or server ban. Your primary job is to maintain peace and stability aboard the ship. Marines can get rowdy after a few weeks of cryosleep! In addition, you are tasked with the security of high-ranking personnel, including the command staff. Keep them safe!"
+	gear_preset = /datum/equipment_preset/uscm_ship/mp/standard
+	entry_message_body = "<a href='"+URL_WIKI_MP_GUIDE+"'>You</a> are held by a higher standard and are required to obey not only the server rules but the <a href='"+URL_WIKI_LAW+"'>Marine Law</a>. Failure to do so may result in a job ban or server ban. You are a member of the military police, just another set of hands for the corps. Your duty is to protect and maintain the security of your assigned vessel, keep order via marine law, repel boarders, put down mutinies, and defend the landing zone during operations. Ooh-rah-to-ashes marine."
 
-/datum/job/command/police/set_spawn_positions(var/count)
+/datum/job/command/mp/set_spawn_positions(var/count)
 	spawn_positions = mp_slot_formula(count)
 
-/datum/job/command/police/get_total_positions(var/latejoin = 0)
+/datum/job/command/mp/get_total_positions(var/latejoin = 0)
 	var/positions = spawn_positions
 	if(latejoin)
 		positions = mp_slot_formula(get_total_marines())
@@ -25,10 +24,10 @@
 		total_positions_so_far = positions
 	return positions
 
-AddTimelock(/datum/job/command/police, list(
-	JOB_POLICE_ROLES = 3 HOURS
+AddTimelock(/datum/job/command/mp, list(
+	JOB_SQUAD_ROLES = 10 HOURS
 ))
 
 /obj/effect/landmark/start/police
 	name = JOB_POLICE
-	job = /datum/job/command/police
+	job = /datum/job/command/mp

code/game/jobs/job/logistics/cargo/chief_req.dm

@@ -7,8 +7,7 @@
 	entry_message_body = "<a href='"+URL_WIKI_RO_GUIDE+"'>Your job</a> is to dispense supplies to the marines, including weapon attachments. Your cargo techs can help you out, but you have final say in your department. Make sure they're not goofing off. While you may request paperwork for supplies, do not go out of your way to screw with marines, unless you want to get deposed. A happy ship is a well-functioning ship."
 
 AddTimelock(/datum/job/logistics/requisition, list(
-	JOB_REQUISITION_ROLES = 10 HOURS,
-	JOB_POLICE_ROLES = 1 HOURS
+	JOB_REQUISITION_ROLES = 10 HOURS
 ))
 
 /obj/effect/landmark/start/requisition

code/game/jobs/job/logistics/engi/chief_engineer.dm

@@ -6,8 +6,7 @@
 	entry_message_body = "<a href='"+URL_WIKI_CE_GUIDE+"'>Your job</a> is to maintain your department and keep your technicians in check. You are responsible for engineering, power, ordnance, and the orbital cannon. Should the commanding and executive officer be unavailable, you are next in the chain of command."
 
 AddTimelock(/datum/job/logistics/engineering, list(
-	JOB_ENGINEER_ROLES = 10 HOURS,
-	JOB_POLICE_ROLES = 1 HOURS
+	JOB_ENGINEER_ROLES = 10 HOURS
 ))
 
 /obj/effect/landmark/start/engineering