Update jobs.dm (#63)

* Update jobs.dm

* Update jobs.dm

* delete CE

_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm

@@ -33,7 +33,6 @@
 /area/mainship/hallways/hangar)
 "acv" = (
 /obj/structure/bed/chair/wood/wings,
-/obj/effect/landmark/start/job/chiefshipengineer,
 /turf/open/floor/wood,
 /area/mainship/living/grunt_rnr)
 "acR" = (
@@ -15239,7 +15238,6 @@
 /area/mainship/hallways/hangar)
 "tnR" = (
 /obj/structure/bed/chair/office/dark,
-/obj/effect/landmark/start/job/chiefshipengineer,
 /obj/machinery/keycard_auth{
 	pixel_y = 25
 	},

_maps/map_files/Sulaco/TGS_Sulaco.dmm

@@ -16829,7 +16829,6 @@
 /area/shuttle/distress/arrive_2)
 "kLb" = (
 /obj/structure/bed/chair/office/light,
-/obj/effect/landmark/start/job/chiefshipengineer,
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/simple/yellow/hidden{
 	dir = 6

_maps/map_files/Talos/TGS_Talos.dmm

@@ -20603,7 +20603,6 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/woodsiding,
-/obj/effect/landmark/start/job/chiefshipengineer,
 /turf/open/floor/carpet,
 /area/mainship/engineering/ce_room)
 "mpG" = (

_maps/map_files/Theseus/TGS_Theseus.dmm

@@ -16063,7 +16063,6 @@
 /turf/open/floor/mainship/red/full,
 /area/mainship/command/cic)
 "qmd" = (
-/obj/effect/landmark/start/job/chiefshipengineer,
 /turf/open/floor/mainship/floor,
 /area/mainship/engineering/ce_room)
 "qml" = (

_maps/map_files/debugdalus/tgs_debugdalus.dmm

@@ -551,7 +551,6 @@
 /obj/structure/bed/chair/office/light{
 	dir = 4
 	},
-/obj/effect/landmark/start/job/chiefshipengineer,
 /turf/open/floor/mainship,
 /area/mainship/engineering/engineering_workshop)
 "acz" = (

code/__DEFINES/jobs.dm

@@ -2,30 +2,29 @@
 
 #define JOB_DISPLAY_ORDER_DEFAULT 0
 
-#define JOB_DISPLAY_ORDER_XENO_QUEEN 1
-#define JOB_DISPLAY_ORDER_XENOMORPH 2
-#define JOB_DISPLAY_ORDER_CAPTAIN 3
-#define JOB_DISPLAY_ORDER_EXECUTIVE_OFFICER 4
-#define JOB_DISPLAY_ORDER_STAFF_OFFICER 5
-#define JOB_DISPLAY_ORDER_PILOT_OFFICER 6
-#define JOB_DISPLAY_ORDER_MECH_PILOT 7
-#define JOB_DISPLAY_ORDER_CORPORATE_LIAISON 8
-#define JOB_DISPLAY_ORDER_AI 9
-#define JOB_DISPLAY_ORDER_SYNTHETIC 10
-#define JOB_DISPLAY_ORDER_TRANSPORT_OFFICER 11
-#define JOB_DISPLAY_ORDER_CHIEF_ENGINEER 13
-#define JOB_DISPLAY_ORDER_SHIP_TECH 14
-#define JOB_DISPLAY_ORDER_REQUISITIONS_OFFICER 15
+#define JOB_DISPLAY_ORDER_CAPTAIN 1
+#define JOB_DISPLAY_ORDER_EXECUTIVE_OFFICER 2
+#define JOB_DISPLAY_ORDER_STAFF_OFFICER 3
+#define JOB_DISPLAY_ORDER_PILOT_OFFICER 4
+#define JOB_DISPLAY_ORDER_TRANSPORT_OFFICER 5
+#define JOB_DISPLAY_ORDER_MECH_PILOT 6
+#define JOB_DISPLAY_ORDER_SQUAD_LEADER 7
+#define JOB_DISPLAY_ORDER_SQUAD_SMARTGUNNER 8
+#define JOB_DISPLAY_ORDER_SQUAD_CORPSMAN 9
+#define JOB_DISPLAY_ORDER_SUQAD_ENGINEER 10
+#define JOB_DISPLAY_ORDER_SQUAD_MARINE 11
+#define JOB_DISPLAY_ORDER_XENO_QUEEN 12
+#define JOB_DISPLAY_ORDER_XENOMORPH 13
+#define JOB_DISPLAY_ORDER_REQUISITIONS_OFFICER 14
+#define JOB_DISPLAY_ORDER_SHIP_TECH 15
 #define JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER 16
 #define JOB_DISPLAY_ORDER_DOCTOR 17
 #define JOB_DISPLAY_ORDER_MEDICAL_RESEARCHER 18
-#define JOB_DISPLAY_ORDER_SQUAD_LEADER 19
-#define JOB_DISPLAY_ORDER_SQUAD_SMARTGUNNER 20
-#define JOB_DISPLAY_ORDER_SQUAD_CORPSMAN 21
-#define JOB_DISPLAY_ORDER_SUQAD_ENGINEER 22
-#define JOB_DISPLAY_ORDER_SQUAD_MARINE 23
-#define JOB_DISPLAY_ORDER_SURVIVOR 24
-#define JOB_DISPLAY_ORDER_SQUAD_ROBO 25
+#define JOB_DISPLAY_ORDER_AI 19
+#define JOB_DISPLAY_ORDER_SYNTHETIC 20
+#define JOB_DISPLAY_ORDER_SQUAD_ROBO 21
+#define JOB_DISPLAY_ORDER_SURVIVOR 22
+#define JOB_DISPLAY_ORDER_CORPORATE_LIAISON 23
 
 #define JOB_FLAG_SPECIALNAME (1<<0)
 #define JOB_FLAG_LATEJOINABLE (1<<1) //Can this job be selected for prefs to join as?
@@ -55,7 +54,6 @@
 #define ASSAULT_CREWMAN "Assault Crewman"
 #define TRANSPORT_CREWMAN "Transport Crewman"
 #define REQUISITIONS_OFFICER "Requisitions Officer"
-#define CHIEF_SHIP_ENGINEER "Chief Ship Engineer"
 #define CHIEF_MEDICAL_OFFICER "Chief Medical Officer"
 #define CORPORATE_LIAISON "Corporate Liaison"
 #define SYNTHETIC "Synthetic"
@@ -111,14 +109,14 @@
 #define ROLE_FALLEN(role) ("Fallen " + ##role)
 
 GLOBAL_LIST_EMPTY(jobs_command)
-GLOBAL_LIST_INIT(jobs_officers, list(CAPTAIN, FIELD_COMMANDER, STAFF_OFFICER, PILOT_OFFICER, TRANSPORT_OFFICER, MECH_PILOT, ASSAULT_CREWMAN, TRANSPORT_CREWMAN, CORPORATE_LIAISON, SYNTHETIC, SILICON_AI))
-GLOBAL_LIST_INIT(jobs_support, list(PILOT_OFFICER, MECH_PILOT, REQUISITIONS_OFFICER, SYNTHETIC, SILICON_AI))
-GLOBAL_LIST_INIT(jobs_engineering, list(CHIEF_SHIP_ENGINEER, SHIP_TECH, SQUAD_ENGINEER))
-GLOBAL_LIST_INIT(jobs_requisitions, list(REQUISITIONS_OFFICER))
+GLOBAL_LIST_INIT(jobs_officers, list(CAPTAIN, FIELD_COMMANDER, STAFF_OFFICER, CORPORATE_LIAISON, PILOT_OFFICER, TRANSPORT_OFFICER, SYNTHETIC, SILICON_AI))
+GLOBAL_LIST_INIT(jobs_support, list(PILOT_OFFICER, TRANSPORT_OFFICER, MECH_PILOT, ASSAULT_CREWMAN, TRANSPORT_CREWMAN, REQUISITIONS_OFFICER, SYNTHETIC, SILICON_AI))
+GLOBAL_LIST_INIT(jobs_engineering, list(SQUAD_ENGINEER, SHIP_TECH))
+GLOBAL_LIST_INIT(jobs_requisitions, list(REQUISITIONS_OFFICER, SHIP_TECH))
 GLOBAL_LIST_INIT(jobs_medical, list(CHIEF_MEDICAL_OFFICER, MEDICAL_DOCTOR, MEDICAL_RESEARCHER, SQUAD_CORPSMAN))
 GLOBAL_LIST_INIT(jobs_marines, list(SQUAD_LEADER, SQUAD_SMARTGUNNER, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_MARINE))
 GLOBAL_LIST_INIT(jobs_som, list(SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_CORPSMAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER, SOM_STAFF_OFFICER, SOM_COMMANDER))
-GLOBAL_LIST_INIT(jobs_regular_all, list(CAPTAIN, FIELD_COMMANDER, STAFF_OFFICER, PILOT_OFFICER, TRANSPORT_OFFICER, MECH_PILOT, REQUISITIONS_OFFICER, CHIEF_SHIP_ENGINEER, \
+GLOBAL_LIST_INIT(jobs_regular_all, list(CAPTAIN, FIELD_COMMANDER, STAFF_OFFICER, PILOT_OFFICER, TRANSPORT_OFFICER, MECH_PILOT, REQUISITIONS_OFFICER, \
 CHIEF_MEDICAL_OFFICER, SYNTHETIC, SILICON_AI, CORPORATE_LIAISON, SHIP_TECH, \
 MEDICAL_DOCTOR, MEDICAL_RESEARCHER, SQUAD_LEADER, SQUAD_SMARTGUNNER, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_MARINE, \
 SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_CORPSMAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER, SOM_STAFF_OFFICER, SOM_COMMANDER))

code/datums/gamemodes/distress.dm

@@ -11,8 +11,7 @@
 		/datum/job/terragov/command/staffofficer = 4,
 		/datum/job/terragov/command/pilot = 1,
 		/datum/job/terragov/command/transportofficer = 1,
-		/datum/job/terragov/engineering/chief = 1,
-		/datum/job/terragov/engineering/tech = 2,
+		/datum/job/terragov/requisitions/tech = 2,
 		/datum/job/terragov/requisitions/officer = 1,
 		/datum/job/terragov/medical/professor = 1,
 		/datum/job/terragov/medical/medicalofficer = 6,

code/datums/gamemodes/extended.dm

@@ -11,8 +11,7 @@
 		/datum/job/terragov/command/mech_pilot = 0,
 		/datum/job/terragov/command/assault_crewman = 2,
 		/datum/job/terragov/command/transport_crewman = 1,
-		/datum/job/terragov/engineering/chief = 1,
-		/datum/job/terragov/engineering/tech = 1,
+		/datum/job/terragov/requisitions/tech = 1,
 		/datum/job/terragov/requisitions/officer = 1,
 		/datum/job/terragov/medical/professor = 1,
 		/datum/job/terragov/medical/medicalofficer = 6,

code/datums/gamemodes/nuclear_war.dm

@@ -11,8 +11,7 @@
 		/datum/job/terragov/command/staffofficer = 4,
 		/datum/job/terragov/command/pilot = 1,
 		/datum/job/terragov/command/transportofficer = 1,
-		/datum/job/terragov/engineering/chief = 1,
-		/datum/job/terragov/engineering/tech = 2,
+		/datum/job/terragov/requisitions/tech = 2,
 		/datum/job/terragov/requisitions/officer = 1,
 		/datum/job/terragov/medical/professor = 1,
 		/datum/job/terragov/medical/medicalofficer = 4,
@@ -28,6 +27,7 @@
 		/datum/job/terragov/squad/smartgunner = 1,
 		/datum/job/terragov/squad/leader = 1,
 		/datum/job/terragov/squad/standard = -1,
+		/datum/job/terragov/squad/combat_robot = -1,
 		/datum/job/xenomorph = FREE_XENO_AT_START,
 		/datum/job/xenomorph/queen = 1
 	)

code/datums/jobs/job/shipside.dm

@@ -851,96 +851,18 @@ You can serve your Division in a variety of roles, so choose carefully."})
 	supervisors = "the acting captain"
 	exp_type_department = EXP_TYPE_ENGINEERING
 
-
-//Chief Ship Engineer
-/datum/job/terragov/engineering/chief
-	title = CHIEF_SHIP_ENGINEER
-	paygrade = "O2"
-	comm_title = "CSE"
-	selection_color = "#ffeeaa"
-	total_positions = 1
-	access = list(ACCESS_MARINE_CE, ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_BRIDGE, ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_CARGO, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_PREP)
-	minimal_access = list(ACCESS_MARINE_CE, ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_BRIDGE, ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_CARGO, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_LOGISTICS, ACCESS_MARINE_PREP, ACCESS_MARINE_RO, ACCESS_MARINE_MEDBAY)
-	skills_type = /datum/skills/ce
-	display_order = JOB_DISPLAY_ORDER_CHIEF_ENGINEER
-	outfit = /datum/outfit/job/engineering/chief
-	exp_type = EXP_TYPE_ENGINEERING
-	exp_requirements = XP_REQ_INTERMEDIATE
-	job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_ALLOWS_PREFS_GEAR|JOB_FLAG_PROVIDES_BANK_ACCOUNT|JOB_FLAG_ADDTOMANIFEST|JOB_FLAG_ISCOMMAND|JOB_FLAG_BOLD_NAME_ON_SELECTION|JOB_FLAG_PROVIDES_SQUAD_HUD
-	jobworth = list(
-		/datum/job/xenomorph = LARVA_POINTS_SHIPSIDE,
-		/datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_REGULAR,
-		/datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR,
-		/datum/job/terragov/command/mech_pilot = MECH_POINTS_REGULAR,
-		/datum/job/terragov/command/assault_crewman = ARMORED_VEHICLE_POINTS_REGULAR,
-	)
-	html_description = {"
-		<b>Difficulty</b>: Hard<br /><br />
-		<b>You answer to the</b> acting Command Staff<br /><br />
-		<b>Unlock Requirement</b>: Starting Role<br /><br />
-		<b>Gamemode Availability</b>: Nuclear War<br /><br /><br />
-		<b>Duty</b>: Supervise the engineers and technicians on duty. Overview the ship’s engine. Teach what’s right and what’s wrong about engineering, cut corners and find places in any FOB that can easily be destroyed.
-	"}
-	minimap_icon = "cse"
-
-/datum/job/terragov/engineering/chief/after_spawn(mob/living/carbon/new_mob, mob/user, latejoin = FALSE)
-	. = ..()
-	if(!ishuman(new_mob))
-		return
-	var/mob/living/carbon/human/new_human = new_mob
-	var/playtime_mins = user?.client?.get_exp(title)
-	if(!playtime_mins || playtime_mins < 1 )
-		return
-	switch(playtime_mins)
-		if(0 to 1500) // starting
-			new_human.wear_id.paygrade = "O2"
-		if(1501 to 6000) // 25 hrs
-			new_human.wear_id.paygrade = "O3"
-		if(6001 to INFINITY) // 100 hrs
-			new_human.wear_id.paygrade = "O4"
-
-/datum/job/terragov/engineering/chief/radio_help_message(mob/M)
-	. = ..()
-	to_chat(M, {"Your job is to maintain the ship's engine and keep everything running.
-If you have no idea how to set up the engine, or it's your first time, <b>mentorhelp</b> so that a mentor can assist you.
-You are also next in the chain of command, should the bridge crew fall in the line of duty."})
-
-
-/datum/outfit/job/engineering/chief
-	name = CHIEF_SHIP_ENGINEER
-	jobtype = /datum/job/terragov/engineering/chief
-
-	id = /obj/item/card/id/silver
-	belt = /obj/item/storage/belt/utility/full
-	ears = /obj/item/radio/headset/mainship/mcom
-	w_uniform = /obj/item/clothing/under/marine/officer/ce
-	wear_suit = /obj/item/clothing/suit/storage/marine/officer/req
-	shoes = /obj/item/clothing/shoes/marine/full
-	glasses = /obj/item/clothing/glasses/welding/superior
-	gloves = /obj/item/clothing/gloves/insulated
-	head = /obj/item/clothing/head/beret/marine/techofficer
-	r_store = /obj/item/storage/pouch/construction
-	back = /obj/item/storage/backpack/marine/engineerpack
-
-/datum/outfit/job/engineering/chief/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
-	. = ..()
-	H.equip_to_slot_or_hand(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_R_POUCH)
-	H.equip_to_slot_or_hand(new /obj/item/stack/sheet/plasteel/large_stack, SLOT_IN_R_POUCH)
-	H.equip_to_slot_or_hand(new /obj/item/stack/sandbags/large_stack, SLOT_IN_R_POUCH)
-	H.equip_to_slot_or_hand(new /obj/item/stack/barbed_wire/full, SLOT_IN_R_POUCH)
-
 //Ship Engineer
-/datum/job/terragov/engineering/tech
+/datum/job/terragov/requisitions/tech
 	title = SHIP_TECH
 	comm_title = "ST"
 	paygrade = "PO3"
 	total_positions = 5
-	supervisors = "the chief ship engineer and the requisitions officer"
+	supervisors = "the requisitions officer"
 	access = list(ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_PREP, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_CARGO, ACCESS_CIVILIAN_ENGINEERING)
 	minimal_access = list(ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_PREP, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_CARGO, ACCESS_CIVILIAN_ENGINEERING)
 	skills_type = /datum/skills/st
 	display_order = JOB_DISPLAY_ORDER_SHIP_TECH
-	outfit = /datum/outfit/job/engineering/tech
+	outfit = /datum/outfit/job/requisitions/tech
 	exp_type = EXP_TYPE_REGULAR_ALL
 	exp_requirements = XP_REQ_INTERMEDIATE
 	job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_ALLOWS_PREFS_GEAR|JOB_FLAG_PROVIDES_BANK_ACCOUNT|JOB_FLAG_ADDTOMANIFEST|JOB_FLAG_PROVIDES_SQUAD_HUD
@@ -953,14 +875,14 @@ You are also next in the chain of command, should the bridge crew fall in the li
 	)
 	html_description = {"
 		<b>Difficulty</b>: Medium<br /><br />
-		<b>You answer to the</b> Chief Ship Engineer<br /><br />
+		<b>You answer to the</b> Requisitions Officer<br /><br />
 		<b>Unlock Requirement</b>: Starting Role<br /><br />
 		<b>Gamemode Availability</b>: Nuclear War<br /><br /><br />
 		<b>Duty</b>: Maintain the ship, be in charge of the engines. Be the secondary engineer to a forward operating base, prepare the shipside defenses if needed. Help the Pilot Officer in preparing the dropship.
 	"}
 	minimap_icon = "st"
 
-/datum/job/terragov/engineering/tech/after_spawn(mob/living/carbon/new_mob, mob/user, latejoin = FALSE)
+/datum/job/terragov/requisitions/tech/after_spawn(mob/living/carbon/new_mob, mob/user, latejoin = FALSE)
 	. = ..()
 	if(!ishuman(new_mob))
 		return
@@ -978,15 +900,15 @@ You are also next in the chain of command, should the bridge crew fall in the li
 		if(6001 to INFINITY) // 100 hrs
 			new_human.wear_id.paygrade = "CPO"
 
-/datum/job/terragov/engineering/tech/radio_help_message(mob/M)
+/datum/job/terragov/requisitions/tech/radio_help_message(mob/M)
 	. = ..()
 	to_chat(M, {"Your job is to make sure the ship is operational, you should firstly focus on manning the
 requisitions line and later on to be ready to send supplies for marines who are groundside."})
 
 
-/datum/outfit/job/engineering/tech
+/datum/outfit/job/requisitions/tech
 	name = SHIP_TECH
-	jobtype = /datum/job/terragov/engineering/tech
+	jobtype = /datum/job/terragov/requisitions/tech
 
 	id = /obj/item/card/id/silver
 	belt = /obj/item/storage/belt/utility/full

code/datums/jobs/job/sons_of_mars_shipside.dm

@@ -370,88 +370,13 @@ You can serve your Division in a variety of roles, so choose carefully."})
 	supervisors = "the acting captain"
 	exp_type_department = EXP_TYPE_ENGINEERING
 
-
-//Chief Ship Engineer
-/datum/job/som/engineering/chief
-	title = SOM_CHIEF_ENGINEER
-	paygrade = "SOM_W2"
-	comm_title = "CE"
-	selection_color = "#ffeeaa"
-	total_positions = 1
-	access = list(ACCESS_MARINE_CE, ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_BRIDGE, ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_CARGO, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_PREP)
-	minimal_access = list(ACCESS_MARINE_CE, ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_BRIDGE, ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_CARGO, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_LOGISTICS, ACCESS_MARINE_PREP, ACCESS_MARINE_RO, ACCESS_MARINE_MEDBAY)
-	skills_type = /datum/skills/ce
-	display_order = JOB_DISPLAY_ORDER_CHIEF_ENGINEER
-	outfit = /datum/outfit/job/som/engineering/chief
-	exp_requirements = XP_REQ_EXPERIENCED
-	exp_type = EXP_TYPE_REGULAR_ALL
-	job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_ALLOWS_PREFS_GEAR|JOB_FLAG_PROVIDES_BANK_ACCOUNT|JOB_FLAG_ADDTOMANIFEST|JOB_FLAG_ISCOMMAND|JOB_FLAG_BOLD_NAME_ON_SELECTION|JOB_FLAG_PROVIDES_SQUAD_HUD
-	html_description = {"
-		<b>Difficulty</b>: Hard<br /><br />
-		<b>You answer to the</b> acting Command Staff<br /><br />
-		<b>Unlock Requirement</b>: Starting Role<br /><br />
-		<b>Gamemode Availability</b>: Campaign<br /><br /><br />
-		<b>Duty</b>: Supervise the engineers and technicians on duty. Overview the ship’s engine. Teach what’s right and what’s wrong about engineering, cut corners and find places in any FOB that can easily be destroyed.
-	"}
-	minimap_icon = "cse"
-
-/datum/job/som/engineering/chief/after_spawn(mob/living/carbon/new_mob, mob/user, latejoin = FALSE)
-	. = ..()
-	if(!ishuman(new_mob))
-		return
-	var/mob/living/carbon/human/new_human = new_mob
-	var/playtime_mins = user?.client?.get_exp(title)
-	if(!playtime_mins || playtime_mins < 1 )
-		return
-	switch(playtime_mins)
-		if(0 to 1500) // starting
-			new_human.wear_id.paygrade = "SOM_W2"
-		if(1501 to 6000) // 25 hrs
-			new_human.wear_id.paygrade = "SOM_W3"
-		if(6001 to 18000) // 100 hrs
-			new_human.wear_id.paygrade = "SOM_W4"
-		if(18001 to 30000) // 300 hrs
-			new_human.wear_id.paygrade = "SOM_W5"
-		if(30001 to INFINITY) // 500 hrs
-			new_human.wear_id.paygrade = "SOM_W6"
-
-/datum/job/som/engineering/chief/radio_help_message(mob/M)
-	. = ..()
-	to_chat(M, {"Your job is to maintain the ship's engine and keep everything running.
-If you have no idea how to set up the engine, or it's your first time, <b>mentorhelp</b> so that a mentor can assist you.
-You are also next in the chain of command, should the bridge crew fall in the line of duty."})
-
-
-/datum/outfit/job/som/engineering/chief
-	name = SOM_CHIEF_ENGINEER
-	jobtype = /datum/job/som/engineering/chief
-
-	id = /obj/item/card/id/silver
-	belt = /obj/item/storage/belt/utility/full
-	ears = /obj/item/radio/headset/mainship/mcom
-	w_uniform = /obj/item/clothing/under/marine/officer/ce
-	wear_suit = /obj/item/clothing/suit/storage/marine/officer/req
-	shoes = /obj/item/clothing/shoes/marine/full
-	glasses = /obj/item/clothing/glasses/welding/superior
-	gloves = /obj/item/clothing/gloves/insulated
-	head = /obj/item/clothing/head/beret/marine/techofficer
-	r_store = /obj/item/storage/pouch/construction
-	back = /obj/item/storage/backpack/marine/engineerpack
-
-/datum/outfit/job/som/engineering/chief/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
-	. = ..()
-	H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_R_POUCH)
-	H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, SLOT_IN_R_POUCH)
-	H.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_R_POUCH)
-	H.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_R_POUCH)
-
 //Ship Engineer
 /datum/job/som/engineering/tech
 	title = SOM_TECH
 	comm_title = "TECH"
 	paygrade = "SOM_E2"
 	total_positions = 5
-	supervisors = "the chief station engineer and the requisitions officer"
+	supervisors = "the requisitions officer"
 	access = list(ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_PREP, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_CARGO, ACCESS_CIVILIAN_ENGINEERING)
 	minimal_access = list(ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_PREP, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_CARGO, ACCESS_CIVILIAN_ENGINEERING)
 	skills_type = /datum/skills/st