From fd4a13c4f3781aa12d63768cb5a306322e58ba85 Mon Sep 17 00:00:00 2001
From: Critawakets <sebastienracicot@hotmail.com>
Date: Thu, 15 Oct 2026 23:26:19 -0400
Subject: [PATCH] Scientist now gets ordnance and xenobiology access on
 skeleton crew

---
 .../code/datums/id_trim/jobs.dm               | 122 +++++++++++++++---
 1 file changed, 103 insertions(+), 19 deletions(-)

diff --git a/maplestation_modules/code/datums/id_trim/jobs.dm b/maplestation_modules/code/datums/id_trim/jobs.dm
index 040bdc7915b4..34a7c55a0bae 100644
--- a/maplestation_modules/code/datums/id_trim/jobs.dm
+++ b/maplestation_modules/code/datums/id_trim/jobs.dm
@@ -21,6 +21,13 @@
 		ACCESS_SCIENCE,
 		ACCESS_TECH_STORAGE,
 	)
+	extra_access = list(
+		ACCESS_GENETICS,
+		ACCESS_ROBOTICS,
+		ACCESS_ORDNANCE,
+		ACCESS_ORDNANCE_STORAGE,
+		ACCESS_XENOBIOLOGY,
+	)
 
 /datum/id_trim/job/quartermaster
 	trim_state = "trim_quartermaster"
@@ -39,13 +46,38 @@
 	department_state = "departmenthead"
 	department_color = COLOR_COMMAND_BLUE
 	subdepartment_color = COLOR_COMMAND_BLUE
-	extra_access = list(ACCESS_ENGINE_EQUIP, ACCESS_SHIPPING)
-	minimal_access = list(ACCESS_BRIG, ACCESS_CARGO, ACCESS_CONSTRUCTION, ACCESS_COURT, ACCESS_EVA,
-		ACCESS_EXTERNAL_AIRLOCKS, ACCESS_DETECTIVE, ACCESS_COMMAND, ACCESS_KEYCARD_AUTH, ACCESS_LAWYER,
-		ACCESS_MAINT_TUNNELS, ACCESS_MECH_SECURITY, ACCESS_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MORGUE,
-		ACCESS_RC_ANNOUNCE, ACCESS_RESEARCH, ACCESS_BRIG_ENTRANCE, ACCESS_SECURITY, ACCESS_WEAPONS)
+	minimal_access = list(
+		ACCESS_BRIG,
+		ACCESS_CARGO,
+		ACCESS_CONSTRUCTION,
+		ACCESS_COURT,
+		ACCESS_EVA,
+		ACCESS_EXTERNAL_AIRLOCKS,
+		ACCESS_DETECTIVE,
+		ACCESS_COMMAND,
+		ACCESS_KEYCARD_AUTH,
+		ACCESS_LAWYER,
+		ACCESS_MAINT_TUNNELS,
+		ACCESS_MECH_SECURITY,
+		ACCESS_MEDICAL,
+		ACCESS_MINERAL_STOREROOM,
+		ACCESS_MORGUE,
+		ACCESS_RC_ANNOUNCE,
+		ACCESS_RESEARCH,
+		ACCESS_BRIG_ENTRANCE,
+		ACCESS_SECURITY,
+		ACCESS_WEAPONS,
+		)
+	extra_access = list(
+		ACCESS_ENGINE_EQUIP,
+		ACCESS_SHIPPING,
+		)
 	minimal_wildcard_access = list(ACCESS_ARMORY)
-	template_access = list(ACCESS_CAPTAIN, ACCESS_HOS, ACCESS_CHANGE_IDS)
+	template_access = list(
+		ACCESS_CAPTAIN,
+		ACCESS_HOS,
+		ACCESS_CHANGE_IDS,
+		)
 	job = /datum/job/asset_protection
 	honorifics = list("Officer", "Bodyguard")
 	honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL
@@ -60,13 +92,34 @@
 	department_state = "departmenthead"
 	department_color = COLOR_COMMAND_BLUE
 	subdepartment_color = COLOR_COMMAND_BLUE
-	extra_access = list(ACCESS_RESEARCH, ACCESS_SCIENCE)
-	extra_wildcard_access = list(ACCESS_ARMORY)
-	minimal_access = list(ACCESS_BRIG, ACCESS_CARGO, ACCESS_CONSTRUCTION, ACCESS_COURT, ACCESS_COMMAND,
-		ACCESS_KEYCARD_AUTH, ACCESS_LAWYER, ACCESS_SHIPPING, ACCESS_MAINT_TUNNELS, ACCESS_MEDICAL,
-		ACCESS_MINERAL_STOREROOM, ACCESS_RC_ANNOUNCE, ACCESS_BRIG_ENTRANCE, ACCESS_SECURITY, ACCESS_WEAPONS)
+	minimal_access = list(
+		ACCESS_BRIG,
+		ACCESS_CARGO,
+		ACCESS_CONSTRUCTION,
+		ACCESS_COURT,
+		ACCESS_COMMAND,
+		ACCESS_KEYCARD_AUTH,
+		ACCESS_LAWYER,
+		ACCESS_SHIPPING,
+		ACCESS_MAINT_TUNNELS,
+		ACCESS_MEDICAL,
+		ACCESS_MINERAL_STOREROOM,
+		ACCESS_RC_ANNOUNCE,
+		ACCESS_BRIG_ENTRANCE,
+		ACCESS_SECURITY,
+		ACCESS_WEAPONS,
+		)
 	minimal_wildcard_access = list(ACCESS_VAULT)
-	template_access = list(ACCESS_CAPTAIN, ACCESS_HOP, ACCESS_CHANGE_IDS)
+	extra_access = list(
+		ACCESS_RESEARCH,
+		ACCESS_SCIENCE,
+		)
+	extra_wildcard_access = list(ACCESS_ARMORY)
+	template_access = list(
+		ACCESS_CAPTAIN,
+		ACCESS_HOP,
+		ACCESS_CHANGE_IDS,
+		)
 	job = /datum/job/bridge_officer
 	honorifics = list("Officer", "Assistant", "Steward", "Stewardess")
 	honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL
@@ -80,10 +133,25 @@
 	sechud_icon_state = "hudordnancetechnician"
 	department_color = COLOR_SCIENCE_PINK
 	subdepartment_color = COLOR_SCIENCE_PINK
-	extra_access = list(ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY)
-	minimal_access = list(ACCESS_AUX_BASE, ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM, ACCESS_ORDNANCE,
-		ACCESS_ORDNANCE_STORAGE, ACCESS_RESEARCH, ACCESS_SCIENCE)
-	template_access = list(ACCESS_CAPTAIN, ACCESS_RD, ACCESS_CHANGE_IDS)
+	minimal_access = list(
+		ACCESS_AUX_BASE,
+		ACCESS_MECH_SCIENCE,
+		ACCESS_MINERAL_STOREROOM,
+		ACCESS_ORDNANCE,
+		ACCESS_ORDNANCE_STORAGE,
+		ACCESS_RESEARCH,
+		ACCESS_SCIENCE,
+		)
+	extra_access = list(
+		ACCESS_GENETICS,
+		ACCESS_ROBOTICS,
+		ACCESS_XENOBIOLOGY,
+		)
+	template_access = list(
+		ACCESS_CAPTAIN,
+		ACCESS_RD,
+		ACCESS_CHANGE_IDS,
+	)
 	job = /datum/job/ordnance_tech
 	honorifics = list("Researcher", "Doctor")
 	honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL
@@ -97,9 +165,25 @@
 	sechud_icon_state = "hudxenobiologist"
 	department_color = COLOR_SCIENCE_PINK
 	subdepartment_color = COLOR_SCIENCE_PINK
-	extra_access = list(ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_ORDNANCE, ACCESS_ORDNANCE_STORAGE)
-	minimal_access = list(ACCESS_AUX_BASE, ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM, ACCESS_RESEARCH, ACCESS_SCIENCE, ACCESS_XENOBIOLOGY)
-	template_access = list(ACCESS_CAPTAIN, ACCESS_RD, ACCESS_CHANGE_IDS)
+	minimal_access = list(
+		ACCESS_AUX_BASE,
+		ACCESS_MECH_SCIENCE,
+		ACCESS_MINERAL_STOREROOM,
+		ACCESS_RESEARCH,
+		ACCESS_SCIENCE,
+		ACCESS_XENOBIOLOGY,
+		)
+	extra_access = list(
+		ACCESS_GENETICS,
+		ACCESS_ROBOTICS,
+		ACCESS_ORDNANCE,
+		ACCESS_ORDNANCE_STORAGE,
+		)
+	template_access = list(
+		ACCESS_CAPTAIN,
+		ACCESS_RD,
+		ACCESS_CHANGE_IDS,
+		)
 	job = /datum/job/xenobiologist
 	honorifics = list("Researcher", "Doctor")
 	honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL