From 4de541c8b7e460db516dc83ea47e73b00501fa46 Mon Sep 17 00:00:00 2001 From: MistChristmas <7815982+MistChristmas@users.noreply.github.com> Date: Fri, 26 Jun 2026 07:39:43 +0100 Subject: [PATCH 1/8] Sigh --- code/game/objects/items/circuitboards/airlock.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/circuitboards/airlock.dm b/code/game/objects/items/circuitboards/airlock.dm index 1a729f60c5bc..337670aba3de 100644 --- a/code/game/objects/items/circuitboards/airlock.dm +++ b/code/game/objects/items/circuitboards/airlock.dm @@ -5,7 +5,7 @@ icon_state = "door_electronics" w_class = SIZE_SMALL matter = list("metal" = 50,"glass" = 50) - req_access = list(ACCESS_CIVILIAN_ENGINEERING) + req_access = list(ACCESS_MARINE_ENGINEERING) var/list/conf_access = null /// if set to 1, door would receive req_one_access instead of req_access var/one_access = 0 From 272739c8f1bba68dc5e7c27ffed9559125a57573 Mon Sep 17 00:00:00 2001 From: MistChristmas <7815982+MistChristmas@users.noreply.github.com> Date: Fri, 26 Jun 2026 08:01:26 +0100 Subject: [PATCH 2/8] Bleh --- code/game/objects/items/circuitboards/airlock.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/circuitboards/airlock.dm b/code/game/objects/items/circuitboards/airlock.dm index 337670aba3de..c1b4d98b9c15 100644 --- a/code/game/objects/items/circuitboards/airlock.dm +++ b/code/game/objects/items/circuitboards/airlock.dm @@ -5,7 +5,7 @@ icon_state = "door_electronics" w_class = SIZE_SMALL matter = list("metal" = 50,"glass" = 50) - req_access = list(ACCESS_MARINE_ENGINEERING) + req_access = list(ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_ENGINEERING) var/list/conf_access = null /// if set to 1, door would receive req_one_access instead of req_access var/one_access = 0 From c6d8beccd0f217c72bc2b34c2a08e1995467e825 Mon Sep 17 00:00:00 2001 From: MistChristmas <7815982+MistChristmas@users.noreply.github.com> Date: Fri, 26 Jun 2026 08:04:37 +0100 Subject: [PATCH 3/8] Ugh --- code/game/machinery/air_alarm.dm | 4 ++-- code/game/machinery/bots/cleanbot.dm | 2 +- code/game/machinery/bots/floorbot.dm | 2 +- code/game/machinery/doors/firedoor.dm | 2 +- code/modules/gear_presets/uscm_ship.dm | 32 -------------------------- 5 files changed, 5 insertions(+), 37 deletions(-) diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm index 3b917baf393c..1ee2fbc926fa 100644 --- a/code/game/machinery/air_alarm.dm +++ b/code/game/machinery/air_alarm.dm @@ -84,7 +84,7 @@ GLOBAL_LIST_INIT(aalarm_mode_descriptions, flatten_numeric_alist(alist( idle_power_usage = 80 active_power_usage = 1000 //For heating/cooling rooms. 1000 joules equates to about 1 degree every 2 seconds for a single tile of air. power_channel = POWER_CHANNEL_ENVIRON - req_one_access = list(ACCESS_CIVILIAN_ENGINEERING) + req_one_access = list(ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_ENGINEERING) var/alarm_id = null var/breach_detection = 1 // Whether to use automatic breach detection or not var/frequency = 1439 @@ -1042,7 +1042,7 @@ table tr:first-child th:first-child { border: none;} /obj/structure/machinery/alarm/server/Initialize() . = ..() - req_one_access = list(ACCESS_CIVILIAN_ENGINEERING) + req_one_access = list(ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_ENGINEERING) TLV["oxygen"] = list(-1.0, -1.0,-1.0,-1.0) // Partial pressure, kpa TLV["carbon dioxide"] = list(-1.0, -1.0, 5, 10) // Partial pressure, kpa TLV["phoron"] = list(-1.0, -1.0, 0.2, 0.5) // Partial pressure, kpa diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm index a5bd72cc6a90..b29e3b6c8c29 100644 --- a/code/game/machinery/bots/cleanbot.dm +++ b/code/game/machinery/bots/cleanbot.dm @@ -18,7 +18,7 @@ var/obj/effect/decal/cleanable/target var/obj/effect/decal/cleanable/oldtarget var/oldloc = null - req_access = list(ACCESS_CIVILIAN_ENGINEERING) + req_access = list(ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_ENGINEERING) var/path[] = new() var/patrol_path[] = null var/beacon_freq = 1445 // navigation beacon frequency diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm index c7fbb738aab0..9a5c871feb95 100644 --- a/code/game/machinery/bots/floorbot.dm +++ b/code/game/machinery/bots/floorbot.dm @@ -21,7 +21,7 @@ var/turf/target var/turf/oldtarget var/oldloc = null - req_access = list(ACCESS_CIVILIAN_ENGINEERING) + req_access = list(ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_ENGINEERING) var/path[] = new() var/targetdirection diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 08c919adcfe5..0a4029e31978 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -13,7 +13,7 @@ desc = "Emergency air-tight shutter, capable of sealing off breached areas." icon = 'icons/obj/structures/doors/DoorHazard.dmi' icon_state = "door_open" - req_one_access = list(ACCESS_CIVILIAN_ENGINEERING) + req_one_access = list(ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_ENGINEERING) opacity = FALSE density = FALSE layer = FIREDOOR_OPEN_LAYER diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index b2ff4e5681cc..8c5586c18297 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -33,21 +33,6 @@ selection_categories = list(FACTION_MARINE) idtype = /obj/item/card/id/silver/cl - access = list( - ACCESS_WY_GENERAL, - ACCESS_MARINE_COMMAND, - ACCESS_MARINE_RESEARCH, - ACCESS_MARINE_MEDBAY, - ACCESS_MARINE_DATABASE, - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_WY_FLIGHT, - ACCESS_CIVILIAN_COMMAND, - ) assignment = JOB_CORPORATE_LIAISON job_title = JOB_CORPORATE_LIAISON paygrades = list(PAY_SHORT_WYC2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_WYC3 = JOB_PLAYTIME_TIER_2, PAY_SHORT_WYC4 = JOB_PLAYTIME_TIER_3, PAY_SHORT_WYC5 = JOB_PLAYTIME_TIER_4) @@ -83,20 +68,6 @@ selection_categories = list(FACTION_MARINE) idtype = /obj/item/card/id/silver/cl - access = list( - ACCESS_WY_GENERAL, - ACCESS_MARINE_COMMAND, - ACCESS_MARINE_RESEARCH, - ACCESS_MARINE_MEDBAY, - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_WY_FLIGHT, - ACCESS_CIVILIAN_COMMAND, - ) assignment = JOB_CORPORATE_BODYGUARD job_title = JOB_CORPORATE_BODYGUARD paygrades = list(PAY_SHORT_WY_SEC_TPPO = JOB_PLAYTIME_TIER_0, PAY_SHORT_WY_SEC_PPO = JOB_PLAYTIME_TIER_1, PAY_SHORT_WY_SEC_PPS = JOB_PLAYTIME_TIER_3, PAY_SHORT_WY_SEC_PPC = JOB_PLAYTIME_TIER_4) @@ -231,7 +202,6 @@ ACCESS_MARINE_CE, ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_COMMAND, - ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_GENERAL, ACCESS_MARINE_DATABASE, ACCESS_MARINE_MAINT, @@ -273,7 +243,6 @@ access = list( ACCESS_MARINE_ENGINEERING, - ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_MAINT, ) assignment = JOB_MAINT_TECH @@ -308,7 +277,6 @@ access = list( ACCESS_MARINE_ENGINEERING, - ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_MAINT, ACCESS_MARINE_OT, From c3b6d5fbdaf29de57a5b257a16b1ee31ceeef3d6 Mon Sep 17 00:00:00 2001 From: MistChristmas <7815982+MistChristmas@users.noreply.github.com> Date: Fri, 26 Jun 2026 08:07:42 +0100 Subject: [PATCH 4/8] Duh --- code/game/objects/items/circuitboards/airlock.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/circuitboards/airlock.dm b/code/game/objects/items/circuitboards/airlock.dm index c1b4d98b9c15..e57c1b4641df 100644 --- a/code/game/objects/items/circuitboards/airlock.dm +++ b/code/game/objects/items/circuitboards/airlock.dm @@ -5,7 +5,7 @@ icon_state = "door_electronics" w_class = SIZE_SMALL matter = list("metal" = 50,"glass" = 50) - req_access = list(ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_ENGINEERING) + req_one_access = list(ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_ENGINEERING) var/list/conf_access = null /// if set to 1, door would receive req_one_access instead of req_access var/one_access = 0 From 30dabe7893fb3e5260f499a74740fba0a7cc41f6 Mon Sep 17 00:00:00 2001 From: MistChristmas <7815982+MistChristmas@users.noreply.github.com> Date: Fri, 26 Jun 2026 08:22:04 +0100 Subject: [PATCH 5/8] ShootMe --- code/game/jobs/access.dm | 10 +++++++--- code/game/objects/items/circuitboards/airlock.dm | 16 ++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 1b6849a6f9b5..beac9b856a98 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -391,10 +391,12 @@ return "[MAIN_SHIP_NAME] Chemistry" if(ACCESS_MARINE_MORGUE) return "[MAIN_SHIP_NAME] Morgue" + if(ACCESS_MARINE_ASO) + return "ASO's Office" if(ACCESS_MARINE_CE) return "CE's Office" if(ACCESS_MARINE_RO) - return "RO's Office" + return "QM's Office" if(ACCESS_MARINE_ENGINEERING) return "[MAIN_SHIP_NAME] Engineering" if(ACCESS_MARINE_OT) @@ -403,12 +405,12 @@ return "[MAIN_SHIP_NAME] General Access" if(ACCESS_MARINE_DATABASE) return "[MAIN_SHIP_NAME] Database Access" + if(ACCESS_MARINE_DATABASE_ADMIN) + return "[MAIN_SHIP_NAME] Database Admin" if(ACCESS_MARINE_SENIOR) return "[MAIN_SHIP_NAME] Senior Command" if(ACCESS_MARINE_CO) return "Commander's Quarters" - if(ACCESS_MARINE_DATABASE) - return "[MAIN_SHIP_NAME]'s Database" if(ACCESS_MARINE_COMMAND) return "[MAIN_SHIP_NAME] Command" if(ACCESS_MARINE_CREWMAN) @@ -469,6 +471,8 @@ return "AI Access" if(ACCESS_ARES_DEBUG) return "AI Debug" + if(ACCESS_PRESS) + return "[MAIN_SHIP_NAME] Press" /proc/get_region_accesses_wy(code) switch(code) diff --git a/code/game/objects/items/circuitboards/airlock.dm b/code/game/objects/items/circuitboards/airlock.dm index e57c1b4641df..2a25c154a1d6 100644 --- a/code/game/objects/items/circuitboards/airlock.dm +++ b/code/game/objects/items/circuitboards/airlock.dm @@ -35,7 +35,7 @@ if (locked) t1 += "Swipe ID
" else - t1 += "Block
" + t1 += "Lock & Close
" t1 += "Access requirement is set to " t1 += one_access ? "ONE
" : "ALL
" @@ -66,18 +66,18 @@ if (usr.stat || usr.is_mob_restrained() || (!ishuman(usr) && !istype(usr,/mob/living/silicon))) return if (href_list["close"]) - close_browser(usr, "airlock") + close_browser(usr, "airlock_electronics") return if (href_list["login"]) if(istype(usr,/mob/living/silicon)) - src.locked = 0 - src.last_configurator = usr.name + locked = 0 + last_configurator = usr.name else - var/obj/item/I = usr.get_active_hand() - if (I && src.check_access(I)) - src.locked = 0 - src.last_configurator = I:registered_name + var/obj/item/card_with_access = usr.get_active_hand() + if (card_with_access && src.check_access(card_with_access)) + locked = 0 + last_configurator = card_with_access:registered_name if (locked) return From 49a17740d809b63c59ea58b096aa3aeae9e02247 Mon Sep 17 00:00:00 2001 From: MistChristmas <7815982+MistChristmas@users.noreply.github.com> Date: Fri, 26 Jun 2026 08:24:09 +0100 Subject: [PATCH 6/8] Uuuugh --- code/__DEFINES/access.dm | 3 +-- code/game/jobs/access.dm | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 721d56d99c76..b722f4411cef 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -43,8 +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 -#define ACCESS_MARINE_FIELD_DOC 39 +#define ACCESS_MARINE_FIELD_DOC 38 /// Grants access to Marine record databases #define ACCESS_MARINE_DATABASE 40 diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index beac9b856a98..f6ad46dae51f 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -143,7 +143,7 @@ ACCESS_MARINE_KITCHEN, ACCESS_MARINE_SYNTH, ACCESS_MARINE_ASO, - ACCESS_MARINE_CHAPLAIN, + ACCESS_MARINE_FIELD_DOC, ACCESS_PRESS, ACCESS_MARINE_DATABASE, From 6cb948e88daaf64af4d943af88ec887962f12373 Mon Sep 17 00:00:00 2001 From: MistChristmas <7815982+MistChristmas@users.noreply.github.com> Date: Fri, 26 Jun 2026 08:37:14 +0100 Subject: [PATCH 7/8] ReOrg --- code/game/jobs/access.dm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index f6ad46dae51f..e9eb0e562920 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -109,21 +109,26 @@ return list(ACCESS_ILLEGAL_PIRATE) + get_access(ACCESS_LIST_MARINE_ALL) + get_access(ACCESS_LIST_WY_ALL) + get_access(ACCESS_LIST_COLONIAL_ALL) + get_access(ACCESS_LIST_CLF_ALL) + get_access(ACCESS_LIST_UPP_ALL) if(ACCESS_LIST_MARINE_MAIN) return list( + ACCESS_MARINE_DATABASE, ACCESS_MARINE_SENIOR, ACCESS_MARINE_GENERAL, ACCESS_MARINE_COMMAND, + ACCESS_MARINE_SYNTH, + ACCESS_MARINE_ASO, + ACCESS_MARINE_SEA, ACCESS_MARINE_CMP, ACCESS_MARINE_BRIG, ACCESS_MARINE_ARMORY, ACCESS_MARINE_CMO, + ACCESS_MARINE_FIELD_DOC, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE, ACCESS_MARINE_RESEARCH, ACCESS_MARINE_CE, + ACCESS_MARINE_OT, ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_MAINT, - ACCESS_MARINE_OT, ACCESS_MARINE_RO, ACCESS_MARINE_CARGO, ACCESS_MARINE_PREP, @@ -139,22 +144,16 @@ ACCESS_MARINE_DELTA, ACCESS_MARINE_PILOT, ACCESS_MARINE_DROPSHIP, - ACCESS_MARINE_SEA, ACCESS_MARINE_KITCHEN, - ACCESS_MARINE_SYNTH, - ACCESS_MARINE_ASO, - - ACCESS_MARINE_FIELD_DOC, ACCESS_PRESS, - ACCESS_MARINE_DATABASE, ) if(ACCESS_LIST_MARINE_ALL) return list( - ACCESS_MARINE_CO, - ACCESS_MARINE_DATABASE_ADMIN, ACCESS_MARINE_AI, ACCESS_MARINE_AI_TEMP, + ACCESS_MARINE_CO, + ACCESS_MARINE_DATABASE_ADMIN, ) + get_access(ACCESS_LIST_MARINE_MAIN) if(ACCESS_LIST_EMERGENCY_RESPONSE) From 87cac64ca704fe28de696ac27f372b5720df2951 Mon Sep 17 00:00:00 2001 From: MistChristmas <7815982+MistChristmas@users.noreply.github.com> Date: Fri, 26 Jun 2026 08:50:21 +0100 Subject: [PATCH 8/8] Bleh4 --- code/modules/gear_presets/uscm.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index 0e1bb032bf76..47dcbbc975d9 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -205,7 +205,7 @@ ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_ENGPREP, ACCESS_MARINE_PREP, - ACCESS_CIVILIAN_ENGINEERING, + ACCESS_MARINE_ENGINEERING, ) assignment = JOB_INTEL job_title = JOB_INTEL