From 69fe234cb08a40731586bdbf88ca87e9644803b9 Mon Sep 17 00:00:00 2001 From: warriorstar-orion Date: Mon, 12 Feb 2024 12:11:01 -0500 Subject: [PATCH] Add and apply cargo bay/shuttle access (#23819) * Add cargo bay/shuttle access, keep HOP to office * Miners don't get Bay/Office access unless needed. * NTR gets supply shuttle and cargo bay access. --------- Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> --- _maps/map_files/Delta/delta.dmm | 241 ++++++++++---------- _maps/map_files/MetaStation/MetaStation.dmm | 123 +++++----- _maps/map_files/cerestation/cerestation.dmm | 30 +-- _maps/map_files/cyberiad/cyberiad.dmm | 21 +- code/__DEFINES/access_defines.dm | 2 + code/game/jobs/access.dm | 4 +- code/game/jobs/job/medical_jobs.dm | 4 +- code/game/jobs/job/security_jobs.dm | 4 +- code/game/jobs/job/supervisor.dm | 4 +- code/game/jobs/job/support.dm | 78 ++++++- code/modules/mapping/access_helpers.dm | 11 + 11 files changed, 306 insertions(+), 216 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 5b4a9a5d379..9c40a04ba67 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -1260,7 +1260,7 @@ /obj/machinery/door/airlock/mining/glass{ name = "Supply Break Room" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/simulated/floor/plating, /area/station/supply/office) "akY" = ( @@ -12474,10 +12474,6 @@ /obj/item/storage/fancy/crayons, /turf/simulated/floor/plasteel, /area/station/public/storage/art) -"aPT" = ( -/obj/effect/landmark/damageturf, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "aPU" = ( /obj/structure/table/wood, /obj/item/instrument/guitar, @@ -13099,15 +13095,6 @@ icon_state = "bar" }, /area/station/service/bar) -"aRu" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/eight, -/obj/effect/landmark/damageturf, -/turf/simulated/floor/plasteel/airless{ - dir = 10; - icon_state = "darkblue" - }, -/area/space/nearstation) "aRv" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -24266,10 +24253,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/station/hallway/primary/central) -"btJ" = ( -/obj/structure/grille, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "btL" = ( /turf/simulated/wall/r_wall, /area/station/command/vault) @@ -61042,15 +61025,15 @@ dir = 1; name = "Cargo Bay Desk" }, -/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/general{ - dir = 1 - }, /obj/effect/turf_decal/delivery, /obj/item/desk_bell{ pixel_x = -6; pixel_y = 3; anchored = 1 }, +/obj/effect/mapping_helpers/airlock/windoor/access/all/supply/general{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -69862,9 +69845,9 @@ /obj/machinery/door/airlock/maintenance{ name = "Cargo Bay Maintenance" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/simulated/floor/plasteel, /area/station/maintenance/fore2) "fTZ" = ( @@ -70439,8 +70422,8 @@ /obj/machinery/door/airlock/maintenance{ name = "Cargo Bay Warehouse Maintenance" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/simulated/floor/plasteel, /area/station/maintenance/fore2) "gti" = ( @@ -71264,19 +71247,6 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central) -"gWP" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay" - }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, -/turf/simulated/floor/plasteel, -/area/station/supply/sorting) "gXp" = ( /obj/machinery/door/airlock/security{ name = "Detective" @@ -73177,11 +73147,11 @@ /obj/machinery/door/airlock/mining/glass{ name = "Cargo Bay" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/machinery/door/poddoor/shutters{ id_tag = "qm_warehouse"; name = "Warehouse Shutters" }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/simulated/floor/plasteel, /area/station/supply/sorting) "igJ" = ( @@ -75033,8 +75003,8 @@ locked = 1; name = "Cargo Docking Hatch" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/supply/supply_shuttle, /turf/simulated/floor/plating, /area/station/supply/storage) "jtb" = ( @@ -75453,6 +75423,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass, /obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/simulated/floor/plasteel, /area/station/supply/storage) @@ -79791,6 +79762,21 @@ /obj/effect/landmark/start/head_of_security, /turf/simulated/floor/carpet/red, /area/station/command/office/hos) +"myW" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/mining, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel, +/area/station/supply/miningdock) "mzs" = ( /obj/structure/cable{ d1 = 1; @@ -80059,6 +80045,10 @@ }, /turf/simulated/floor/engine/n2, /area/station/engineering/atmos) +"mIl" = ( +/obj/structure/grille, +/turf/simulated/floor/plating/airless, +/area/space/nearstation) "mJw" = ( /obj/machinery/light{ dir = 8 @@ -82693,21 +82683,6 @@ icon_state = "freezerfloor" }, /area/station/public/sleep) -"olz" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining/glass, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/supply/storage) "olR" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining, @@ -83226,10 +83201,6 @@ icon_state = "whitepurple" }, /area/station/science/break_room) -"ozK" = ( -/obj/effect/spawner/window/reinforced/grilled, -/turf/simulated/floor/plating, -/area/station/medical/virology) "ozS" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ @@ -86928,6 +86899,22 @@ icon_state = "darkblue" }, /area/station/command/bridge) +"qVF" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/mining/glass, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/turf/simulated/floor/plasteel, +/area/station/supply/storage) "qWf" = ( /obj/machinery/door/airlock/engineering{ name = "Aft Starboard Solar Access" @@ -87618,6 +87605,20 @@ }, /turf/simulated/floor/plasteel, /area/station/command/customs) +"rnp" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/mining/glass{ + name = "Cargo Bay" + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, +/obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting, +/turf/simulated/floor/plasteel, +/area/station/supply/sorting) "rnA" = ( /obj/structure/chair/stool{ dir = 8 @@ -89520,7 +89521,7 @@ /obj/machinery/door/airlock/maintenance{ name = "Cargo Bay Warehouse Maintenance" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/simulated/floor/plasteel, /area/station/supply/sorting) "spp" = ( @@ -91425,21 +91426,6 @@ /obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) -"tyN" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/supply/mining, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/station/supply/miningdock) "tyQ" = ( /obj/machinery/economy/vending/medical, /turf/simulated/floor/plasteel{ @@ -91831,7 +91817,6 @@ /area/station/medical/medbay) "tKX" = ( /obj/effect/spawner/window/reinforced/grilled, -/obj/structure/cable, /turf/simulated/floor/plating, /area/station/medical/virology) "tLO" = ( @@ -94550,6 +94535,11 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/supply/miningdock) +"vuL" = ( +/obj/effect/spawner/window/reinforced/grilled, +/obj/structure/cable, +/turf/simulated/floor/plating, +/area/station/medical/virology) "vuX" = ( /obj/machinery/alarm{ dir = 4; @@ -95893,7 +95883,6 @@ /obj/machinery/door/airlock/mining/glass{ name = "Cargo Bay" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -95907,6 +95896,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/simulated/floor/plasteel, /area/station/supply/sorting) "wmB" = ( @@ -97273,6 +97263,10 @@ /obj/effect/decal/cleanable/fungus, /turf/simulated/wall, /area/station/maintenance/aft) +"xcn" = ( +/obj/effect/landmark/damageturf, +/turf/simulated/floor/plating/airless, +/area/space/nearstation) "xcs" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -98247,6 +98241,15 @@ icon_state = "neutral" }, /area/station/maintenance/fsmaint) +"xGL" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/maintenance/eight, +/obj/effect/landmark/damageturf, +/turf/simulated/floor/plasteel/airless{ + dir = 10; + icon_state = "darkblue" + }, +/area/space/nearstation) "xGY" = ( /obj/structure/cable{ d1 = 1; @@ -132112,7 +132115,7 @@ azd aAp awX abj -aRu +xGL ghZ aFq aVK @@ -132368,7 +132371,7 @@ aCo azd aAq awX -aPT +xcn abj aVK aGp @@ -140339,7 +140342,7 @@ jkv wnt eOG aFF -gWP +rnp uJC ibg aKy @@ -142149,7 +142152,7 @@ aJd aJd aGK ayD -olz +qVF jKE ayD bbe @@ -142923,7 +142926,7 @@ aSG aWx nQX aZp -tyN +myW bcF bfz bfz @@ -147647,9 +147650,9 @@ cBf wdL dGw dGw -ozK -ozK -ozK +tKX +tKX +tKX dGw dGw hGZ @@ -149962,7 +149965,7 @@ dFG dFG vOB kce -tKX +vuL dFG dFG abj @@ -150878,7 +150881,7 @@ abj aaa abj abj -btJ +mIl aaa ygH tFK @@ -151135,7 +151138,7 @@ aaa aaa aaa aaa -btJ +mIl abj ygH aJx @@ -151392,7 +151395,7 @@ aaa aaa aaa aaa -btJ +mIl aaa ygH uUu @@ -154270,7 +154273,7 @@ nlB aaa abj abj -btJ +mIl abj abj iuY @@ -154784,7 +154787,7 @@ aaa aaa aaa abj -btJ +mIl abj abj iuY @@ -155299,7 +155302,7 @@ aaa aaa abj abj -btJ +mIl abj iuY rEQ @@ -157332,10 +157335,10 @@ aaa aaa abj abj -btJ -btJ -btJ -btJ +mIl +mIl +mIl +mIl abj abj fhF @@ -157594,7 +157597,7 @@ aaa abj abj aaa -btJ +mIl fhF fhF fhF @@ -157604,7 +157607,7 @@ fhF fhF abj abj -btJ +mIl aaa aaa aaa @@ -157848,10 +157851,10 @@ aaa abj abj abj -btJ -btJ -btJ -btJ +mIl +mIl +mIl +mIl fhF fhF fhF @@ -157861,7 +157864,7 @@ fhF fhF abj aaa -btJ +mIl aaa aaa aaa @@ -158118,7 +158121,7 @@ fhF fhF abj aaa -btJ +mIl aaa aaa aaa @@ -158365,7 +158368,7 @@ aaa aaa aaa aaa -btJ +mIl fhF fhF fhF @@ -158373,9 +158376,9 @@ fhF fhF fhF fhF -btJ +mIl abj -btJ +mIl aaa aaa aaa @@ -158616,13 +158619,13 @@ aaa aaa aaa aaa -btJ +mIl aaa aaa aaa aaa aaa -btJ +mIl fhF fhF fhF @@ -158630,7 +158633,7 @@ fhF fhF fhF fhF -btJ +mIl abj abj aaa @@ -158873,20 +158876,20 @@ aaa aaa aaa aaa -btJ +mIl aaa aaa aaa aaa aaa bPS -btJ -btJ +mIl +mIl abj bPS abj -btJ -btJ +mIl +mIl bPS aaa aaa @@ -159130,7 +159133,7 @@ aaa aaa aaa aaa -btJ +mIl aaa aaa aaa @@ -159395,11 +159398,11 @@ aaa aaa aaa aaa -btJ -btJ -btJ -btJ -btJ +mIl +mIl +mIl +mIl +mIl aaa aaa aaa diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 7caf8ed35ea..ed67b187fdc 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -5618,7 +5618,7 @@ locked = 1; name = "Supply Dock Airlock" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/obj/effect/mapping_helpers/airlock/access/all/supply/supply_shuttle, /turf/simulated/floor/plating, /area/station/supply/storage) "aDB" = ( @@ -7500,7 +7500,8 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining, +/obj/effect/mapping_helpers/airlock/access/any/supply/cargo_bay, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "aKf" = ( @@ -7515,7 +7516,8 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/mining, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining, +/obj/effect/mapping_helpers/airlock/access/any/supply/cargo_bay, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "aKg" = ( @@ -13753,7 +13755,7 @@ "bcu" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bcv" = ( @@ -15036,7 +15038,7 @@ }, /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/simulated/floor/plating, /area/station/supply/storage) "bfp" = ( @@ -17163,7 +17165,7 @@ "bku" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting, /turf/simulated/floor/plating, /area/station/supply/office) "bkw" = ( @@ -19102,10 +19104,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/machinery/door/airlock/mining/glass{ name = "Mailroom" }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting, /turf/simulated/floor/plasteel, /area/station/supply/office) "bpF" = ( @@ -23297,14 +23299,6 @@ icon_state = "darkbluecorners" }, /area/station/turret_protected/aisat/interior) -"bAB" = ( -/obj/structure/table/wood, -/obj/machinery/bottler, -/obj/structure/sign/poster/random{ - pixel_y = -32 - }, -/turf/simulated/floor/wood, -/area/station/service/bar) "bAC" = ( /turf/simulated/floor/plating/airless, /area/station/engineering/solar/auxport) @@ -31710,6 +31704,14 @@ }, /turf/simulated/floor/plasteel, /area/station/science/robotics) +"cdj" = ( +/obj/structure/table/wood, +/obj/machinery/bottler, +/obj/structure/sign/poster/random{ + pixel_y = -32 + }, +/turf/simulated/floor/wood, +/area/station/service/bar) "cdk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -47333,6 +47335,18 @@ icon_state = "red" }, /area/station/security/permabrig) +"dQI" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel, +/area/station/science/research) "dRt" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, @@ -57810,7 +57824,7 @@ dir = 1; name = "Delivery Desk" }, -/obj/effect/mapping_helpers/airlock/windoor/access/all/supply/general{ +/obj/effect/mapping_helpers/airlock/windoor/access/all/supply/mail_sorting{ dir = 1 }, /turf/simulated/floor/plasteel, @@ -59008,7 +59022,8 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting, +/obj/effect/mapping_helpers/airlock/access/any/supply/cargo_bay, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining, /turf/simulated/floor/plasteel, /area/station/supply/lobby) "iKZ" = ( @@ -59644,7 +59659,7 @@ /obj/machinery/door/airlock/mining{ name = "Warehouse" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/simulated/floor/plasteel, /area/station/supply/storage) "jau" = ( @@ -68028,6 +68043,30 @@ }, /turf/simulated/floor/plating, /area/station/command/office/rd) +"mEd" = ( +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + name = "Kitchen Junction"; + sort_type_txt = "20" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/wood, +/area/station/service/bar) "mEe" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -73679,8 +73718,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/machinery/door/airlock/mining/glass, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/simulated/floor/plasteel, /area/station/supply/office) "peo" = ( @@ -80660,18 +80699,6 @@ /obj/effect/spawner/random_spawners/fungus_maybe, /turf/simulated/wall/r_wall, /area/station/public/mrchangs) -"sdj" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/station/science/research) "sdJ" = ( /obj/machinery/door/airlock/freezer, /obj/effect/mapping_helpers/airlock/access/all/service/kitchen, @@ -83576,7 +83603,7 @@ dir = 4 }, /obj/effect/turf_decal/delivery, -/obj/effect/mapping_helpers/airlock/windoor/access/all/supply/general{ +/obj/effect/mapping_helpers/airlock/windoor/access/all/supply/mail_sorting{ dir = 4 }, /turf/simulated/floor/plasteel, @@ -84187,7 +84214,7 @@ dir = 4 }, /obj/effect/turf_decal/delivery, -/obj/effect/mapping_helpers/airlock/windoor/access/all/supply/general{ +/obj/effect/mapping_helpers/airlock/windoor/access/all/supply/mail_sorting{ dir = 4 }, /turf/simulated/floor/plasteel, @@ -93089,30 +93116,6 @@ icon_state = "neutralcorner" }, /area/station/supply/lobby) -"xLw" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 4; - name = "Kitchen Junction"; - sort_type_txt = "20" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/wood, -/area/station/service/bar) "xLA" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -128857,7 +128860,7 @@ byM bEA bvz bEv -xLw +mEd uhV lBQ fjy @@ -131464,7 +131467,7 @@ cQg rOD cDa mra -sdj +dQI vCB lHQ eIa @@ -131680,7 +131683,7 @@ bsp buI bwO pjb -bAB +cdj aoG aoG aoG diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm index f623a16b318..e62009da323 100644 --- a/_maps/map_files/cerestation/cerestation.dmm +++ b/_maps/map_files/cerestation/cerestation.dmm @@ -5086,7 +5086,7 @@ locked = 1; name = "Cargo Docking Hatch" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/obj/effect/mapping_helpers/airlock/access/all/supply/supply_shuttle, /turf/simulated/floor/plating, /area/station/supply/office) "aGx" = ( @@ -26315,8 +26315,8 @@ locked = 1; name = "Cargo Docking Hatch" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/supply/supply_shuttle, /turf/simulated/floor/plating, /area/station/supply/office) "cLz" = ( @@ -30363,9 +30363,10 @@ "dgl" = ( /obj/machinery/door/airlock/mining/glass, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining, +/obj/effect/mapping_helpers/airlock/access/any/supply/general, /turf/simulated/floor/plasteel{ icon_state = "darkbrownfull" }, @@ -39929,7 +39930,7 @@ /obj/machinery/door/airlock/mining{ name = "Cargo Warehouse" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/simulated/floor/plasteel{ icon_state = "darkbrownfull" }, @@ -53718,18 +53719,18 @@ name = "Cargo Desk"; dir = 1 }, -/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/mail_sorting{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/mining{ - dir = 1 - }, /obj/machinery/door/firedoor, /obj/item/desk_bell{ pixel_x = 7; pixel_y = 7; anchored = 1 }, +/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/general{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/mining{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "darkbrownfull" }, @@ -68739,8 +68740,9 @@ /obj/machinery/door/airlock/mining/glass{ name = "Cargo Bay" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/any/supply/cargo_bay, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining, /turf/simulated/floor/plasteel{ icon_state = "darkbrownfull" }, @@ -75579,12 +75581,13 @@ /obj/machinery/door/airlock/mining/glass{ name = "Cargo Bay" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting, /obj/structure/cable/orange{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/supply/cargo_bay, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining, /turf/simulated/floor/plasteel{ icon_state = "darkbrownfull" }, @@ -77446,7 +77449,6 @@ name = "Disposals" }, /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, -/obj/effect/mapping_helpers/airlock/access/any/supply/general, /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) @@ -87157,11 +87159,11 @@ /obj/machinery/door/airlock/glass{ name = "Disposals" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 50c5b1d14bd..4d83b4afdc2 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -38894,7 +38894,7 @@ locked = 1; name = "Cargo Docking Hatch" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/obj/effect/mapping_helpers/airlock/access/all/supply/supply_shuttle, /turf/simulated/floor/plating, /area/station/supply/storage) "cuE" = ( @@ -72289,7 +72289,7 @@ locked = 1; name = "Cargo Docking Hatch" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/obj/effect/mapping_helpers/airlock/access/all/supply/supply_shuttle, /turf/simulated/floor/plating, /area/station/supply/storage) "mDF" = ( @@ -73598,7 +73598,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -73610,6 +73609,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/simulated/floor/plasteel, /area/station/supply/storage) "nrh" = ( @@ -78601,7 +78601,7 @@ /obj/machinery/door/airlock/maintenance{ name = "Cargo Bay Warehouse Maintenance" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/simulated/floor/plating, /area/station/maintenance/port) "pIR" = ( @@ -82338,7 +82338,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -82348,6 +82347,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining, +/obj/effect/mapping_helpers/airlock/access/any/supply/general, /turf/simulated/floor/plasteel, /area/station/supply/office) "rwZ" = ( @@ -83452,8 +83453,9 @@ /obj/machinery/door/airlock/mining/glass{ name = "Delivery Office" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining, +/obj/effect/mapping_helpers/airlock/access/any/supply/mail_sorting, /turf/simulated/floor/plasteel, /area/station/supply/office) "sbD" = ( @@ -85327,12 +85329,12 @@ /obj/machinery/door/airlock/maintenance{ name = "Cargo Bay Maintenance" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/simulated/floor/plating, /area/station/maintenance/port) "tcM" = ( @@ -88750,7 +88752,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -88759,6 +88760,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/simulated/floor/plasteel, /area/station/supply/storage) "uTj" = ( @@ -94930,7 +94932,6 @@ /obj/machinery/door/airlock/mining/glass{ name = "Delivery Office" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -94945,6 +94946,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining, +/obj/effect/mapping_helpers/airlock/access/any/supply/mail_sorting, /turf/simulated/floor/plasteel, /area/station/supply/office) "xVy" = ( diff --git a/code/__DEFINES/access_defines.dm b/code/__DEFINES/access_defines.dm index ea67634a1ba..a897dba5de2 100644 --- a/code/__DEFINES/access_defines.dm +++ b/code/__DEFINES/access_defines.dm @@ -72,6 +72,8 @@ #define ACCESS_MINISAT 75 #define ACCESS_MINERAL_STOREROOM 76 #define ACCESS_NETWORK 77 +#define ACCESS_CARGO_BAY 78 +#define ACCESS_SUPPLY_SHUTTLE 79 #define ACCESS_WEAPONS 99 //Weapon authorization for secbots diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index b5f06204fc4..edc60bdef29 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -123,7 +123,7 @@ /proc/get_all_accesses() return list(ACCESS_MINISAT, ACCESS_AI_UPLOAD, ACCESS_ARMORY, ACCESS_ATMOSPHERICS, ACCESS_BAR, ACCESS_SEC_DOORS, ACCESS_BLUESHIELD, - ACCESS_HEADS, ACCESS_CAPTAIN, ACCESS_CARGO, ACCESS_MAILSORTING, ACCESS_CHAPEL_OFFICE, ACCESS_CE, ACCESS_CHEMISTRY, ACCESS_CLOWN, ACCESS_CMO, + ACCESS_HEADS, ACCESS_CAPTAIN, ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_SUPPLY_SHUTTLE, ACCESS_MAILSORTING, ACCESS_CHAPEL_OFFICE, ACCESS_CE, ACCESS_CHEMISTRY, ACCESS_CLOWN, ACCESS_CMO, ACCESS_COURT, ACCESS_CONSTRUCTION, ACCESS_CREMATORIUM, ACCESS_JANITOR, ACCESS_ENGINE, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_FORENSICS_LOCKERS, ACCESS_GENETICS, ACCESS_EXPEDITION, ACCESS_BRIG, ACCESS_HOP, ACCESS_HOS, ACCESS_HYDROPONICS, ACCESS_CHANGE_IDS, ACCESS_KEYCARD_AUTH, ACCESS_KITCHEN, ACCESS_LAWYER, ACCESS_LIBRARY, ACCESS_MAGISTRATE, ACCESS_MAINT_TUNNELS, ACCESS_HEADS_VAULT, ACCESS_MEDICAL, ACCESS_MIME, @@ -159,7 +159,7 @@ if(REGION_ENGINEERING) //engineering and maintenance return list(ACCESS_CONSTRUCTION, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_TECH_STORAGE, ACCESS_ATMOSPHERICS, ACCESS_MINISAT, ACCESS_CE) if(REGION_SUPPLY) //supply - return list(ACCESS_MAILSORTING, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_QM, ACCESS_HEADS_VAULT) + return list(ACCESS_MAILSORTING, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_SUPPLY_SHUTTLE, ACCESS_QM, ACCESS_HEADS_VAULT) if(REGION_COMMAND) //command return list(ACCESS_HEADS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_TCOMSAT, ACCESS_EXPEDITION, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_HEADS_VAULT, ACCESS_BLUESHIELD, ACCESS_NTREP, ACCESS_HOP, ACCESS_CAPTAIN) if(REGION_CENTCOMM) //because why the heck not diff --git a/code/game/jobs/job/medical_jobs.dm b/code/game/jobs/job/medical_jobs.dm index 736351bb585..ac8f1ca4e38 100644 --- a/code/game/jobs/job/medical_jobs.dm +++ b/code/game/jobs/job/medical_jobs.dm @@ -286,8 +286,8 @@ supervisors = "the chief medical officer" department_head = list("Chief Medical Officer") selection_color = "#ffeef0" - access = list(ACCESS_PARAMEDIC, ACCESS_MEDICAL, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_EVA, ACCESS_MORGUE, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_MAILSORTING) - minimal_access=list(ACCESS_PARAMEDIC, ACCESS_MEDICAL, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_EVA, ACCESS_MORGUE, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_MAILSORTING) + access = list(ACCESS_PARAMEDIC, ACCESS_MEDICAL, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_EVA, ACCESS_MORGUE, ACCESS_CARGO, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_MAILSORTING) + minimal_access=list(ACCESS_PARAMEDIC, ACCESS_MEDICAL, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_EVA, ACCESS_MORGUE, ACCESS_CARGO, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_MAILSORTING) minimal_player_age = 3 exp_map = list(EXP_TYPE_CREW = 180) outfit = /datum/outfit/job/paramedic diff --git a/code/game/jobs/job/security_jobs.dm b/code/game/jobs/job/security_jobs.dm index c3598e987e5..2b7c76ebb67 100644 --- a/code/game/jobs/job/security_jobs.dm +++ b/code/game/jobs/job/security_jobs.dm @@ -12,11 +12,11 @@ department_account_access = TRUE access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS, - ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING, + ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_SUPPLY_SHUTTLE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING, ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_EXPEDITION, ACCESS_WEAPONS) minimal_access = list(ACCESS_EVA, ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS, - ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING, + ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_SUPPLY_SHUTTLE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING, ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_EXPEDITION, ACCESS_WEAPONS) minimal_player_age = 21 exp_map = list(EXP_TYPE_SECURITY = 1200) diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index c7d7891df7c..c7185827262 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -128,7 +128,7 @@ minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_EVA, ACCESS_HEADS, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, - ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, + ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_SUPPLY_SHUTTLE, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, ACCESS_CLOWN, ACCESS_MIME, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_EXPEDITION, ACCESS_WEAPONS, ACCESS_NTREP) blacklisted_disabilities = list(DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_NERVOUS, DISABILITY_FLAG_LISP) @@ -174,7 +174,7 @@ ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_EXPEDITION, ACCESS_WEAPONS, ACCESS_BLUESHIELD) minimal_access = list(ACCESS_SEC_DOORS, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_ENGINE, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH, - ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_HEADS, ACCESS_BLUESHIELD, ACCESS_WEAPONS, ACCESS_CARGO, ACCESS_MINING) + ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_HEADS, ACCESS_BLUESHIELD, ACCESS_WEAPONS, ACCESS_CARGO, ACCESS_MAILSORTING, ACCESS_MINING) blacklisted_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY, DISABILITY_FLAG_NERVOUS, DISABILITY_FLAG_LISP) missing_limbs_allowed = FALSE outfit = /datum/outfit/job/blueshield diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index f8fa8389a9b..5f0041122bf 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -10,8 +10,42 @@ department_head = list("Captain") department_account_access = TRUE selection_color = "#e2c59d" - access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_HEADS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_HEADS_VAULT) - minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_HEADS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_HEADS_VAULT) + access = list( + ACCESS_CARGO_BAY, + ACCESS_CARGO_BOT, + ACCESS_CARGO, + ACCESS_HEADS_VAULT, + ACCESS_HEADS, + ACCESS_KEYCARD_AUTH, + ACCESS_MAILSORTING, + ACCESS_MAINT_TUNNELS, + ACCESS_MINERAL_STOREROOM, + ACCESS_MINING_STATION, + ACCESS_MINING, + ACCESS_MINT, + ACCESS_QM, + ACCESS_RC_ANNOUNCE, + ACCESS_SEC_DOORS, + ACCESS_SUPPLY_SHUTTLE, + ) + minimal_access = list( + ACCESS_CARGO_BAY, + ACCESS_CARGO_BOT, + ACCESS_CARGO, + ACCESS_HEADS_VAULT, + ACCESS_HEADS, + ACCESS_KEYCARD_AUTH, + ACCESS_MAILSORTING, + ACCESS_MAINT_TUNNELS, + ACCESS_MINERAL_STOREROOM, + ACCESS_MINING_STATION, + ACCESS_MINING, + ACCESS_MINT, + ACCESS_QM, + ACCESS_RC_ANNOUNCE, + ACCESS_SEC_DOORS, + ACCESS_SUPPLY_SHUTTLE, + ) blacklisted_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY) outfit = /datum/outfit/job/qm important_information = "This role requires you to coordinate a department. You are required to be familiar with Standard Operating Procedure (Supply), basic job duties, and act professionally (roleplay)." @@ -46,8 +80,26 @@ supervisors = "the quartermaster" department_head = list("Quartermaster") selection_color = "#eeddbe" - access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) - minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM) + access = list( + ACCESS_CARGO_BAY, + ACCESS_CARGO, + ACCESS_MAILSORTING, + ACCESS_MAINT_TUNNELS, + ACCESS_MINERAL_STOREROOM, + ACCESS_MINING_STATION, + ACCESS_MINING, + ACCESS_MINT, + ACCESS_QM, + ACCESS_SUPPLY_SHUTTLE, + ) + minimal_access = list( + ACCESS_CARGO_BAY, + ACCESS_CARGO, + ACCESS_MAILSORTING, + ACCESS_MAINT_TUNNELS, + ACCESS_MINERAL_STOREROOM, + ACCESS_SUPPLY_SHUTTLE, + ) alt_titles = list("Mail Carrier", "Courier") outfit = /datum/outfit/job/cargo_tech @@ -74,8 +126,22 @@ supervisors = "the quartermaster" department_head = list("Quartermaster") selection_color = "#eeddbe" - access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) - minimal_access = list(ACCESS_MINING, ACCESS_MINT, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM) + access = list( + ACCESS_MAILSORTING, + ACCESS_MAINT_TUNNELS, + ACCESS_MINERAL_STOREROOM, + ACCESS_MINING_STATION, + ACCESS_MINING, + ACCESS_MINT, + ACCESS_QM, + ) + minimal_access = list( + ACCESS_MAINT_TUNNELS, + ACCESS_MINERAL_STOREROOM, + ACCESS_MINING_STATION, + ACCESS_MINING, + ACCESS_MINT, + ) alt_titles = list("Spelunker") outfit = /datum/outfit/job/mining diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm index 13c0573a1f7..c01bcd703e5 100644 --- a/code/modules/mapping/access_helpers.dm +++ b/code/modules/mapping/access_helpers.dm @@ -212,8 +212,12 @@ icon_state = "access_helper_sup" /obj/effect/mapping_helpers/airlock/access/any/supply/general + name = "cargo office" access = ACCESS_CARGO +/obj/effect/mapping_helpers/airlock/access/any/supply/cargo_bay + access = ACCESS_CARGO_BAY + /obj/effect/mapping_helpers/airlock/access/any/supply/mail_sorting access = ACCESS_MAILSORTING @@ -427,8 +431,15 @@ icon_state = "access_helper_sup" /obj/effect/mapping_helpers/airlock/access/all/supply/general + name = "cargo office" access = ACCESS_CARGO +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay + access = ACCESS_CARGO_BAY + +/obj/effect/mapping_helpers/airlock/access/all/supply/supply_shuttle + access = ACCESS_SUPPLY_SHUTTLE + /obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting access = ACCESS_MAILSORTING