Adds the Military Chaplain

code/__DEFINES/access.dm

@@ -43,6 +43,7 @@ most of them are tied into map-placed objects. This should be reworked in the fu
 
 #define ACCESS_MARINE_SYNTH 36
 #define ACCESS_MARINE_ASO 37
+#define ACCESS_MARINE_CHAPLAIN 38
 
 // AI Core Accesses
 /// Used in temporary passes

code/__DEFINES/job.dm

@@ -77,8 +77,9 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 #define JOB_DROPSHIP_CREW_CHIEF "Dropship Crew Chief"
 #define JOB_CREWMAN "Vehicle Crewman"
 #define JOB_INTEL "Intelligence Officer"
+#define JOB_CHAPLAIN "Military Chaplain"
 #define JOB_AUXILIARY_ROLES    /datum/timelock/auxiliary
-#define JOB_AUXILIARY_ROLES_LIST   list(JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_INTEL)
+#define JOB_AUXILIARY_ROLES_LIST   list(JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_INTEL, JOB_CHAPLAIN)
 
 #define JOB_POLICE "Military Police"
 #define JOB_WARDEN "Military Warden"

code/__DEFINES/mode.dm

@@ -111,13 +111,13 @@
 var/global/list/ROLES_COMMAND = list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_POLICE, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_CHIEF_REQUISITION, JOB_CHIEF_ENGINEER, JOB_CMO, JOB_CHIEF_POLICE, JOB_SEA, JOB_SYNTH, JOB_WARDEN)
 
 //Marine roles
-#define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE)
+#define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE, JOB_CHAPLAIN)
 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_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, 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_COMBAT_REPORTER, JOB_MESS_SERGEANT, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH)
+var/global/list/ROLES_MISC = list(JOB_SYNTH, JOB_WORKING_JOE, JOB_SEA, JOB_CHAPLAIN, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH)
 var/global/list/ROLES_POLICE = list(JOB_CHIEF_POLICE, JOB_WARDEN, 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_REQUISITION = list(JOB_CHIEF_REQUISITION, JOB_CARGO_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION, JOB_MESS_SERGEANT)
 var/global/list/ROLES_MEDICAL = list(JOB_CMO, JOB_RESEARCHER, JOB_DOCTOR, JOB_NURSE, JOB_WO_CMO, JOB_WO_RESEARCHER, JOB_WO_DOCTOR)
 var/global/list/ROLES_MARINES = list(JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE)
 var/global/list/ROLES_SQUAD_ALL = list(SQUAD_MARINE_1, SQUAD_MARINE_2, SQUAD_MARINE_3, SQUAD_MARINE_4, SQUAD_MARINE_5, SQUAD_MARINE_CRYO)

code/datums/factions/uscm.dm

@@ -85,6 +85,8 @@
 				border_rk = "command"
 			if(JOB_INTEL)
 				marine_rk = "io"
+			if(JOB_CHAPLAIN)
+				marine_rk = "chap"
 			if(JOB_PILOT)
 				marine_rk = "po"
 			if(JOB_DROPSHIP_CREW_CHIEF)

code/datums/skills.dm

@@ -748,6 +748,18 @@ MILITARY NONCOMBATANT
 ---------------------
 */
 
+/datum/skills/chaplain
+	name = "Military Chaplain"
+	skills = list(
+		SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN,
+		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
+		SKILL_POLICE = SKILL_POLICE_FLASH,
+		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
+		SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+		SKILL_DOMESTIC = SKILL_DOMESTIC_TRAINED,
+	)
+
 /datum/skills/doctor
 	name = "Doctor"
 	skills = list(

code/game/area/almayer.dm

@@ -553,6 +553,11 @@
 	icon_state = "officerrnr"
 	fake_zlevel = 1 // upperdeck
 
+/area/almayer/living/chaplainoffice
+	name = "\improper Chaplain's Office"
+	icon_state = "livingspace"
+	fake_zlevel = 1 // upperdeck
+
 /area/almayer/medical
 	minimap_color = MINIMAP_AREA_MEDBAY
 

code/game/gamemodes/colonialmarines/whiskey_outpost.dm

@@ -20,7 +20,7 @@
 		/datum/job/command/bridge/whiskey = JOB_SO,
 		/datum/job/command/tank_crew/whiskey = JOB_CREWMAN,
 		/datum/job/command/police/whiskey = JOB_POLICE,
-		/datum/job/command/pilot/whiskey = JOB_PILOT,
+		/datum/job/command/auxiliary/pilot/whiskey = JOB_PILOT,
 		/datum/job/logistics/requisition/whiskey = JOB_CHIEF_REQUISITION,
 		/datum/job/civilian/professor/whiskey = JOB_CMO,
 		/datum/job/civilian/doctor/whiskey = JOB_DOCTOR,

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

@@ -112,11 +112,11 @@ Glory to the commander. Glory to the USCM."}
 //*************************************
 //----------------PILOT----------------
 //*************************************/
-/datum/job/command/pilot/whiskey
+/datum/job/command/auxiliary/pilot/whiskey
 	title = JOB_WO_PILOT
 	gear_preset = /datum/equipment_preset/wo/mortar_crew
 
-/datum/job/command/pilot/whiskey/generate_entry_message(mob/living/carbon/human/H)
+/datum/job/command/auxiliary/pilot/whiskey/generate_entry_message(mob/living/carbon/human/H)
 	. = {"You're entrusted with the maintaining of the mortars for the outpost. You were expecting to bomb some CLF, maybe, but not this...
 Listen in on your radio, and pay attention to provide fire support for the marines. Watch out for friendly-fire!"}
 

code/game/jobs/job/civilians/other/mess_seargent.dm

@@ -2,7 +2,7 @@
 	title = JOB_MESS_SERGEANT
 	total_positions = 1
 	spawn_positions = 1
-	selection_class = "job_ot"
+	selection_class = "job_ct"
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
 	supervisors = "the auxiliary support officer"
 	gear_preset = /datum/equipment_preset/uscm_ship/chef

code/game/jobs/job/civilians/other/reporter.dm

@@ -6,7 +6,7 @@
 	total_positions = 1
 	spawn_positions = 1
 	selection_class = "job_cl"
-	supervisors = "the acting commanding officer"
+	supervisors = "the acting commander"
 	gear_preset = /datum/equipment_preset/uscm_ship/reporter
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
 	selection_class = "job_cl"

code/game/jobs/job/civilians/support/cmo.dm

@@ -2,7 +2,7 @@
 	title = JOB_CMO
 	total_positions = 1
 	spawn_positions = 1
-	supervisors = "the acting commanding officer"
+	supervisors = "the acting commander"
 	selection_class = "job_cmo"
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
 	gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/cmo

code/game/jobs/job/civilians/support/synthetic.dm

@@ -4,12 +4,12 @@
 	spawn_positions = 1
 	allow_additional = 1
 	scaled = 1
-	supervisors = "the acting commanding officer"
+	supervisors = "the acting commander"
 	selection_class = "job_synth"
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADMIN_NOTIFY|ROLE_WHITELISTED|ROLE_CUSTOM_SPAWN
 	flags_whitelist = WHITELIST_SYNTHETIC
 	gear_preset = /datum/equipment_preset/synth/uscm
-	entry_message_body = "You are a <a href='"+URL_WIKI_SYN_GUIDE+"'>Synthetic!</a> You are held to a higher standard and are required to obey not only the Server Rules but Marine Law and Synthetic Rules. Failure to do so may result in your White-list Removal. Your primary job is to support and assist all USCM Departments and Personnel on-board. In addition, being a Synthetic gives you knowledge in every field and specialization possible on-board the ship. As a Synthetic you answer to the acting commanding officer. Special circumstances may change this!"
+	entry_message_body = "You are a <a href='"+URL_WIKI_SYN_GUIDE+"'>Synthetic!</a> You are held to a higher standard and are required to obey not only the Server Rules but Marine Law and Synthetic Rules. Failure to do so may result in your White-list Removal. Your primary job is to support and assist all USCM Departments and Personnel on-board. In addition, being a Synthetic gives you knowledge in every field and specialization possible on-board the ship. As a Synthetic you answer to the acting commander. Special circumstances may change this!"
 
 /datum/job/civilian/synthetic/New()
 	. = ..()

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

@@ -17,6 +17,7 @@ AddTimelock(/datum/job/command/auxiliary_officer, list(
 /obj/effect/landmark/start/auxiliary_officer
 	name = JOB_AUXILIARY_OFFICER
 	job = /datum/job/command/auxiliary_officer
+	icon_state = "aux_spawn"
 
 /datum/timelock/auxiliary
 	name = "Auxiliary Roles"

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

@@ -0,0 +1,18 @@
+/datum/job/command/auxiliary/chaplain
+	title = JOB_CHAPLAIN
+	total_positions = 1
+	spawn_positions = 1
+	allow_additional = TRUE
+	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
+	gear_preset = /datum/equipment_preset/uscm_ship/chaplain
+	entry_message_body = "You are charged with helping the marines of the USS Almayer find spiritual peace and providing a safe space for them to talk and address their sins. Further, you are responsible for ensuring the last rites are given to the dead and dying."
+
+AddTimelock(/datum/job/command/auxiliary/chaplain, list(
+	JOB_AUXILIARY_ROLES = 5 HOURS,
+))
+
+/obj/effect/landmark/start/chaplain
+	name = JOB_CHAPLAIN
+	job = /datum/job/command/auxiliary/chaplain
+	icon_state = "chp_spawn"
+

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

@@ -1,4 +1,4 @@
-/datum/job/command/crew_chief
+/datum/job/command/auxiliary/crew_chief
 	title = JOB_DROPSHIP_CREW_CHIEF
 	total_positions = 2
 	spawn_positions = 2
@@ -9,11 +9,11 @@
 	gear_preset = /datum/equipment_preset/uscm_ship/dcc
 	entry_message_body = "<a href='"+URL_WIKI_DCC_GUIDE+"'>Your job is to assist</a> the pilot officer maintain the ship's dropship. You have authority only on the dropship, but you are expected to maintain order, as not to disrupt the pilot."
 
-AddTimelock(/datum/job/command/crew_chief, list(
+AddTimelock(/datum/job/command/auxiliary/crew_chief, list(
 	JOB_SQUAD_ROLES = 5 HOURS
 ))
 
 /obj/effect/landmark/start/crew_chief
 	name = JOB_DROPSHIP_CREW_CHIEF
 	icon_state = "dcc_spawn"
-	job = /datum/job/command/crew_chief
+	job = /datum/job/command/auxiliary/crew_chief

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

@@ -1,19 +1,18 @@
 //Intelligence Officer
-/datum/job/command/intel
+/datum/job/command/auxiliary/intel
 	title = JOB_INTEL
 	total_positions = 3
 	spawn_positions = 3
 	allow_additional = 1
 	scaled = 1
-	supervisors = "the auxiliary support officer"
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
 	gear_preset = "USCM Intelligence Officer (IO) (Cryo)"
 	entry_message_body = "<a href='"+URL_WIKI_IO_GUIDE+"'>Your job is to assist the marines in collecting intelligence related</a> to the current operation to better inform command of their opposition. You are in charge of gathering any data disks, folders, and notes you may find on the operational grounds and decrypt them to grant the USCM additional resources."
 
-/datum/job/command/intel/set_spawn_positions(count)
+/datum/job/command/auxiliary/intel/set_spawn_positions(count)
 	spawn_positions = int_slot_formula(count)
 
-/datum/job/command/intel/get_total_positions(latejoin = 0)
+/datum/job/command/auxiliary/intel/get_total_positions(latejoin = 0)
 	var/positions = spawn_positions
 	if(latejoin)
 		positions = int_slot_formula(get_total_marines())
@@ -23,11 +22,11 @@
 			total_positions_so_far = positions
 	return positions
 
-AddTimelock(/datum/job/command/intel, list(
+AddTimelock(/datum/job/command/auxiliary/intel, list(
 	JOB_SQUAD_ROLES = 5 HOURS
 ))
 
 /obj/effect/landmark/start/intel
 	name = JOB_INTEL
 	icon_state = "io_spawn"
-	job = /datum/job/command/intel
+	job = /datum/job/command/auxiliary/intel

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

@@ -1,19 +1,18 @@
-/datum/job/command/pilot
+/datum/job/command/auxiliary/pilot
 	title = JOB_PILOT
 	total_positions = 2
 	spawn_positions = 2
 	allow_additional = TRUE
 	scaled = TRUE
-	supervisors = "the auxiliary support officer"
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
 	gear_preset = /datum/equipment_preset/uscm_ship/po
 	entry_message_body = "<a href='"+URL_WIKI_PO_GUIDE+"'>Your job is to fly, protect, and maintain the ship's dropship.</a> While you are an officer, your authority is limited to the dropship, where you have authority over the enlisted personnel. If you are not piloting, there is an autopilot fallback for command, but don't leave the dropship without reason."
 
-AddTimelock(/datum/job/command/pilot, list(
+AddTimelock(/datum/job/command/auxiliary/pilot, list(
 	JOB_SQUAD_ROLES = 5 HOURS
 ))
 
 /obj/effect/landmark/start/pilot
 	name = JOB_PILOT
 	icon_state = "po_spawn"
-	job = /datum/job/command/pilot
+	job = /datum/job/command/auxiliary/pilot

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

@@ -1,4 +1,4 @@
-/datum/job/command/senior
+/datum/job/command/auxiliary/senior
 	title = JOB_SEA
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADMIN_NOTIFY|ROLE_WHITELISTED
 	flags_whitelist = WHITELIST_MENTOR
@@ -7,11 +7,11 @@
 
 	job_options = list("Gunnery Sergeant" = "GySGT", "Master Sergeant" = "MSgt", "First Sergeant" = "1Sgt", "Master Gunnery Sergeant" = "MGySgt", "Sergeant Major" = "SgtMaj")
 
-/datum/job/command/senior/announce_entry_message(mob/living/carbon/human/H)
+/datum/job/command/auxiliary/senior/announce_entry_message(mob/living/carbon/human/H)
 	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(all_hands_on_deck), "Attention all hands, [H.get_paygrade(0)] [H.real_name] on deck!"), 1.5 SECONDS)
 	return ..()
 
-/datum/job/command/senior/filter_job_option(mob/job_applicant)
+/datum/job/command/auxiliary/senior/filter_job_option(mob/job_applicant)
 	. = ..()
 
 	var/list/filtered_job_options = list(job_options[1])
@@ -24,7 +24,7 @@
 
 	return filtered_job_options
 
-AddTimelock(/datum/job/command/senior, list(
+AddTimelock(/datum/job/command/auxiliary/senior, list(
 	JOB_SQUAD_ROLES = 15 HOURS,
 
 	JOB_ENGINEER_ROLES = 10 HOURS,
@@ -37,4 +37,4 @@ AddTimelock(/datum/job/command/senior, list(
 /obj/effect/landmark/start/senior
 	name = JOB_SEA
 	icon_state = "sea_spawn"
-	job = /datum/job/command/senior
+	job = /datum/job/command/auxiliary/senior

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

@@ -1,9 +1,12 @@
 /datum/job/command
 	selection_class = "job_command"
-	supervisors = "the acting commanding officer"
+	supervisors = "the acting commander"
 	total_positions = 1
 	spawn_positions = 1
 
+/datum/job/command/auxiliary
+	supervisors = "the auxiliary support officer"
+
 /datum/timelock/command
 	name = "Command Roles"
 
@@ -23,7 +26,7 @@
 
 /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/marine/squad/leader.dm

@@ -2,7 +2,7 @@
 	title = JOB_SQUAD_LEADER
 	total_positions = 4
 	spawn_positions = 4
-	supervisors = "the acting commanding officer"
+	supervisors = "the acting commander"
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD
 	gear_preset = /datum/equipment_preset/uscm/leader
 	entry_message_body = "<a href='"+URL_WIKI_SL_GUIDE+"'>You are responsible for the men and women of your squad.</a> Make sure they are on task, working together, and communicating. You are also in charge of communicating with command and letting them know about the situation first hand. Keep out of harm's way."

code/game/machinery/computer/dropship_weapons.dm

@@ -266,8 +266,7 @@
 		var/mob/M = usr
 		if(ishuman(M))
 			var/mob/living/carbon/human/H = M
-			if(!H.allow_gun_usage)
-				to_chat(H, SPAN_WARNING("Your programming prevents you from operating dropship weaponry!"))
+			if(!H.can_use_weapon())
 				return
 		var/obj/structure/dropship_equipment/weapon/DEW = selected_equipment
 		if(!selected_equipment || !selected_equipment.is_weapon)
@@ -506,8 +505,7 @@
 		var/mob/M = usr
 		if(ishuman(M))
 			var/mob/living/carbon/human/H = M
-			if(!H.allow_gun_usage)
-				to_chat(H, SPAN_WARNING("Your programming prevents you from operating dropship weaponry!"))
+			if(!H.can_use_weapon())
 				return
 		if(!skillcheck(M, SKILL_PILOT, SKILL_PILOT_TRAINED)) //only pilots can fire dropship weapons.
 			to_chat(usr, SPAN_WARNING("A screen with graphics and walls of physics and engineering values open, you immediately force it closed."))

code/game/objects/effects/landmarks/landmarks.dm

@@ -341,10 +341,10 @@
 	job = /datum/job/civilian/synthetic/whiskey
 
 /obj/effect/landmark/start/whiskey/senior
-	job = /datum/job/command/senior  //Need to create a WO variant in the future
+	job = /datum/job/command/auxiliary/senior  //Need to create a WO variant in the future
 
 /obj/effect/landmark/start/whiskey/pilot
-	job = /datum/job/command/pilot/whiskey
+	job = /datum/job/command/auxiliary/pilot/whiskey
 
 /obj/effect/landmark/start/whiskey/tank_crew
 	job = /datum/job/command/tank_crew/whiskey

code/game/objects/items/explosives/grenades/grenade.dm

@@ -36,8 +36,7 @@
 		to_chat(user, SPAN_WARNING("You don't have the dexterity to do this!"))
 		return FALSE
 
-	if(harmful && !user.allow_gun_usage)
-		to_chat(user, SPAN_WARNING("Your programming prevents you from using this!"))
+	if(harmful && !user.can_use_weapon())
 		return FALSE
 
 	return TRUE

code/game/objects/structures/signs.dm

@@ -303,7 +303,7 @@
 	icon_state = "lifesupport"
 
 /obj/structure/sign/safety/maint
-	name = "maintenace semiotic"
+	name = "maintenance semiotic"
 	desc = "Semiotic Standard denoting the nearby presence of maintenance access."
 	icon_state = "maint"
 
@@ -568,7 +568,7 @@
 
 /obj/structure/sign/ROsign
 	name = "\improper USCM Requisitions Office Guidelines"
-	desc = " 1. You are not entitled to service or equipment. Attachments are a privilege, not a right.\n 2. You must be fully dressed to obtain service. Cyrosleep underwear is non-permissible.\n 3. The Requsitions Officer has the final say and the right to decline service. Only the Acting Commanding Officer may override their decisions.\n 4. Please treat your Requsitions staff with respect. They work hard."
+	desc = " 1. You are not entitled to service or equipment. Attachments are a privilege, not a right.\n 2. You must be fully dressed to obtain service. Cyrosleep underwear is non-permissible.\n 3. The Requsitions Officer has the final say and the right to decline service. Only the Acting Commander may override their decisions.\n 4. Please treat your Requsitions staff with respect. They work hard."
 	icon_state = "roplaque"
 
 /obj/structure/sign/prop1

code/modules/client/preferences.dm

@@ -639,7 +639,7 @@ var/const/MAX_SAVE_SLOTS = 10
 //splitJobs - Allows you split the table by job. You can make different tables for each department by including their heads. Defaults to CE to make it look nice.
 //width - Screen' width. Defaults to 550 to make it look nice.
 //height - Screen's height. Defaults to 500 to make it look nice.
-/datum/preferences/proc/SetChoices(mob/user, limit = 19, list/splitJobs = list(JOB_CHIEF_REQUISITION), width = 950, height = 700)
+/datum/preferences/proc/SetChoices(mob/user, limit = 19, list/splitJobs = list(JOB_SEA, JOB_SQUAD_LEADER), width = 1300, height = 700)
 	if(!RoleAuthority)
 		return
 
@@ -752,7 +752,7 @@ var/const/MAX_SAVE_SLOTS = 10
 //splitJobs - Allows you split the table by job. You can make different tables for each department by including their heads. Defaults to CE to make it look nice.
 //width - Screen' width. Defaults to 550 to make it look nice.
 //height - Screen's height. Defaults to 500 to make it look nice.
-/datum/preferences/proc/set_job_slots(mob/user, limit = 19, list/splitJobs = list(JOB_CHIEF_REQUISITION), width = 950, height = 700)
+/datum/preferences/proc/set_job_slots(mob/user, limit = 19, list/splitJobs = list(JOB_SEA, JOB_SQUAD_LEADER), width = 1300, height = 700)
 	if(!RoleAuthority)
 		return