From ff0d5940b4cb7671edc3cf41c581753a2a08d202 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 8 Jun 2022 16:24:53 +0200 Subject: [PATCH] [MIRROR] [MDB IGNORE] Big Access Tweaks and Organization [MDB IGNORE] (#14160) * [MDB IGNORE] Big Access Tweaks and Organization * wew Co-authored-by: Son-of-Space <63861499+Son-of-Space@users.noreply.github.com> Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com> --- .../map_files/Deltastation/DeltaStation2.dmm | 29 +- .../map_files/IceBoxStation/IceBoxStation.dmm | 37 +- _maps/map_files/KiloStation/KiloStation.dmm | 20 +- _maps/map_files/MetaStation/MetaStation.dmm | 34 +- _maps/map_files/tramstation/tramstation.dmm | 48 +- code/__DEFINES/access.dm | 214 ++--- code/controllers/subsystem/id_access.dm | 2 +- code/datums/id_trim/jobs.dm | 753 +++++++++++++++--- code/modules/mapping/access_helpers.dm | 19 +- .../file_system/programs/techweb.dm | 4 +- code/modules/research/rdconsole.dm | 2 +- .../modules/goofsec/code/department_guards.dm | 4 +- .../67512_mail_sorting_to_shipping.txt | 2 + 13 files changed, 870 insertions(+), 298 deletions(-) create mode 100644 tools/UpdatePaths/Scripts/67512_mail_sorting_to_shipping.txt diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 85dd9f3c0a3..1c66c52726e 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -1174,7 +1174,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "anF" = ( @@ -8792,7 +8793,7 @@ /obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine Room" }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/iron, /area/station/engineering/main) "clx" = ( @@ -12005,7 +12006,8 @@ name = "Shared Engineering Storage" }, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, /turf/open/floor/iron, /area/station/engineering/storage_shared) "djf" = ( @@ -13864,7 +13866,7 @@ /obj/machinery/door/airlock/engineering{ name = "Engineering Break Room" }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/iron, /area/station/engineering/break_room) "dLg" = ( @@ -14007,7 +14009,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "dNh" = ( @@ -18604,7 +18607,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /turf/open/floor/iron, /area/station/engineering/storage/tech) "fdM" = ( @@ -31572,7 +31575,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/iron, /area/station/engineering/break_room) "iFv" = ( @@ -31689,7 +31692,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "iGU" = ( @@ -55969,7 +55972,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/iron, /area/station/engineering/lobby) "peK" = ( @@ -61031,7 +61035,7 @@ /obj/machinery/door/airlock/hatch{ name = "MiniSat Transit Tube Access" }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) "qwz" = ( @@ -64257,7 +64261,7 @@ }, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) "rvC" = ( @@ -71425,7 +71429,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "tnL" = ( @@ -88569,6 +88573,7 @@ dir = 1 }, /obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/iron, /area/station/engineering/storage/tech) "xJw" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 237b4c8819b..6a6157b2ec1 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -2754,7 +2754,8 @@ }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/iron, /area/station/engineering/storage_shared) "aUC" = ( @@ -8551,7 +8552,8 @@ /obj/machinery/door/airlock/external{ name = "Engineering External Access" }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, /area/station/engineering/storage_shared) "cJi" = ( @@ -14231,8 +14233,9 @@ /obj/machinery/door/airlock/external{ name = "MiniSat External Access" }, -/obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat_interior) "ezq" = ( @@ -21540,7 +21543,8 @@ /obj/machinery/door/airlock/external{ name = "Engineering External Access" }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, /area/station/engineering/storage_shared) "gQE" = ( @@ -25663,7 +25667,7 @@ /obj/effect/landmark/navigate_destination, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /turf/open/floor/plating, /area/station/engineering/storage/tech) "igL" = ( @@ -29747,6 +29751,7 @@ }, /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plating, /area/station/engineering/storage/tech) "jwx" = ( @@ -31265,8 +31270,9 @@ /obj/machinery/door/airlock/external{ name = "MiniSat External Access" }, -/obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat_interior) "jUn" = ( @@ -33500,8 +33506,9 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, /obj/structure/cable/layer3, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "kDs" = ( @@ -35178,7 +35185,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, /turf/open/floor/iron, /area/station/engineering/lobby) "lei" = ( @@ -38162,7 +38170,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting, +/obj/effect/mapping_helpers/airlock/access/all/supply/shipping, /turf/open/floor/iron, /area/station/cargo/sorting) "mfz" = ( @@ -46330,7 +46338,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/iron/dark, /area/station/engineering/main) "oNp" = ( @@ -52630,7 +52639,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/machinery/duct, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/iron/dark, /area/station/engineering/main) "qOP" = ( @@ -57932,7 +57942,8 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "sAs" = ( @@ -60819,7 +60830,7 @@ /obj/machinery/door/airlock/mining/glass{ name = "Delivery Office" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting, +/obj/effect/mapping_helpers/airlock/access/all/supply/shipping, /turf/open/floor/iron, /area/station/cargo/sorting) "tuU" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 3219329612d..49807b8805b 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -7554,7 +7554,7 @@ dir = 8 }, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) "clt" = ( @@ -11493,7 +11493,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "ai-passthrough" }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "dsJ" = ( @@ -13380,7 +13380,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/effect/landmark/navigate_destination, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) "dUQ" = ( @@ -15332,7 +15332,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, /turf/open/floor/iron/dark, /area/station/engineering/lobby) "ewW" = ( @@ -22532,7 +22533,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "ai-passthrough" }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "gsa" = ( @@ -38837,7 +38838,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "ai-passthrough" }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "kQT" = ( @@ -50943,7 +50944,7 @@ /obj/machinery/door/airlock/engineering{ name = "Tech Storage" }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) "oqS" = ( @@ -73947,6 +73948,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) "uUm" = ( @@ -74740,7 +74742,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) "vfb" = ( @@ -82742,7 +82744,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) "xke" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 7ceb6243035..38450448a7f 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -6326,8 +6326,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, /turf/open/floor/iron, /area/station/engineering/break_room) "csQ" = ( @@ -10694,7 +10694,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable/layer3, /obj/effect/mapping_helpers/airlock/access/any/command/general, -/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "dTr" = ( @@ -12461,7 +12462,7 @@ /obj/effect/landmark/navigate_destination, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) "ewU" = ( @@ -14225,8 +14226,9 @@ /obj/machinery/door/poddoor/preopen{ id = "transitlockdown" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, /obj/effect/mapping_helpers/airlock/access/any/command/general, -/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) "fip" = ( @@ -22685,7 +22687,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/satellite) "ikJ" = ( @@ -22802,7 +22804,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, /obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/iron, /area/station/engineering/storage_shared) @@ -24853,8 +24855,9 @@ /obj/machinery/door/poddoor/preopen{ id = "transitlockdown" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, /obj/effect/mapping_helpers/airlock/access/any/command/general, -/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) "iRr" = ( @@ -24977,7 +24980,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable/layer3, /obj/effect/mapping_helpers/airlock/access/any/command/general, -/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) "iSk" = ( @@ -29899,6 +29903,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) "kEe" = ( @@ -41515,7 +41520,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/any/command/general, -/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, /turf/open/floor/iron/dark, /area/station/tcommsat/computer) "oKI" = ( @@ -45615,8 +45621,9 @@ /obj/machinery/door/airlock/hatch{ name = "MiniSat Space Access Airlock" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, /obj/effect/mapping_helpers/airlock/access/any/command/general, -/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, /turf/open/floor/plating, /area/station/ai_monitored/aisat/exterior) "qjP" = ( @@ -55476,7 +55483,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable/layer3, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "txi" = ( @@ -59584,8 +59591,9 @@ /obj/machinery/door/poddoor/preopen{ id = "transitlockdown" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, /obj/effect/mapping_helpers/airlock/access/any/command/general, -/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) "uUg" = ( @@ -61740,7 +61748,7 @@ /obj/effect/turf_decal/bot{ dir = 1 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/iron{ dir = 1 }, diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index eaec009fdb5..6a1c1f159da 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -1117,7 +1117,7 @@ name = "MiniSat Teleporter" }, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) "aCl" = ( @@ -12659,7 +12659,10 @@ id = "Sciencelockdown"; name = "Research Lockdown Blastdoor" }, -/obj/effect/mapping_helpers/airlock/access/all/science/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/iron, /area/station/science/research) "emr" = ( @@ -16328,7 +16331,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/iron, /area/station/engineering/break_room) "fFx" = ( @@ -27504,7 +27508,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "jxF" = ( @@ -28098,7 +28103,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/firedoor, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload, /turf/open/floor/iron/grimy, /area/station/ai_monitored/turret_protected/aisat/foyer) "jHw" = ( @@ -30523,7 +30529,7 @@ name = "MiniSat Recharge Bay" }, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) "ktX" = ( @@ -34683,7 +34689,8 @@ }, /obj/machinery/door/firedoor, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, /turf/open/floor/iron, /area/station/engineering/transit_tube) "lLd" = ( @@ -36459,7 +36466,8 @@ }, /obj/effect/turf_decal/sand/plating, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, /turf/open/floor/plating, /area/station/engineering/transit_tube) "moP" = ( @@ -39824,9 +39832,12 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "sci-entrance-right" }, -/obj/effect/mapping_helpers/airlock/access/all/science/general, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/iron, /area/station/science/research) "nrF" = ( @@ -42756,7 +42767,10 @@ cycle_id = "sci-entrance-right" }, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/science/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/iron, /area/station/science/research) "ovz" = ( @@ -44989,7 +45003,8 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, /turf/open/floor/plating, /area/station/engineering/transit_tube) "piX" = ( @@ -49329,7 +49344,8 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/foyer) "qEU" = ( @@ -56440,7 +56456,8 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/foyer) "tce" = ( @@ -61379,7 +61396,10 @@ id = "Sciencelockdown"; name = "Research Lockdown Blastdoor" }, -/obj/effect/mapping_helpers/airlock/access/all/science/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/iron, /area/station/science/research) "uKg" = ( diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index bfaaef9feba..afb738a23d2 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -76,7 +76,7 @@ ///Cargo general access #define ACCESS_CARGO "cargo" -#define ACCESS_MAIL_SORTING "mail_sorting" +#define ACCESS_SHIPPING "shipping" /// For releasing minerals from the ORM #define ACCESS_MINERAL_STOREROOM "mineral_storeroom" #define ACCESS_MINING_STATION "mining_station" @@ -239,82 +239,82 @@ /// Departmental/general/common area accesses. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_COMMON) #define COMMON_ACCESS list( \ + ACCESS_ATMOSPHERICS, \ + ACCESS_AUX_BASE, \ + ACCESS_BAR, \ + ACCESS_BRIG, \ + ACCESS_BRIG_ENTRANCE, \ + ACCESS_CARGO, \ + ACCESS_CHAPEL_OFFICE, \ + ACCESS_CONSTRUCTION, \ + ACCESS_COURT, \ + ACCESS_CREMATORIUM, \ + ACCESS_DETECTIVE, \ + ACCESS_ENGINE_EQUIP, \ + ACCESS_ENGINEERING, \ + ACCESS_EXTERNAL_AIRLOCKS, \ + ACCESS_GENETICS, \ + ACCESS_HYDROPONICS, \ + ACCESS_JANITOR, \ + ACCESS_KITCHEN, \ + ACCESS_LAWYER, \ + ACCESS_LIBRARY, \ + ACCESS_MAINT_TUNNELS, \ ACCESS_MECH_MINING, \ ACCESS_MECH_MEDICAL, \ ACCESS_MECH_SECURITY, \ ACCESS_MECH_SCIENCE, \ ACCESS_MECH_ENGINE, \ - ACCESS_AUX_BASE, \ - ACCESS_PSYCHOLOGY, \ - ACCESS_PHARMACY, \ - ACCESS_NETWORK, \ - ACCESS_WEAPONS, \ - ACCESS_MINERAL_STOREROOM, \ - ACCESS_BRIG_ENTRANCE, \ - ACCESS_XENOBIOLOGY, \ - ACCESS_MINING_STATION, \ - ACCESS_MAIL_SORTING, \ - ACCESS_MINING, \ - ACCESS_RESEARCH, \ - ACCESS_THEATRE, \ - ACCESS_SURGERY, \ - ACCESS_COURT, \ - ACCESS_QM, \ - ACCESS_VIROLOGY, \ - ACCESS_LAWYER, \ - ACCESS_LIBRARY, \ - ACCESS_HYDROPONICS, \ - ACCESS_PLUMBING, \ - ACCESS_CONSTRUCTION, \ - ACCESS_CARGO, \ - ACCESS_ROBOTICS, \ - ACCESS_KITCHEN, \ - ACCESS_CREMATORIUM, \ - ACCESS_JANITOR, \ - ACCESS_BAR, \ - ACCESS_CHAPEL_OFFICE, \ - ACCESS_EXTERNAL_AIRLOCKS, \ - ACCESS_MAINT_TUNNELS, \ - ACCESS_ENGINE_EQUIP, \ - ACCESS_ENGINEERING, \ - ACCESS_GENETICS, \ - ACCESS_SCIENCE, \ - ACCESS_MORGUE, \ ACCESS_MEDICAL, \ - ACCESS_DETECTIVE, \ - ACCESS_BRIG, \ - ACCESS_SECURITY, \ - ACCESS_ATMOSPHERICS, \ - ACCESS_ORDNANCE_STORAGE, \ + ACCESS_MINERAL_STOREROOM, \ + ACCESS_MINING, \ + ACCESS_MINING_STATION, \ + ACCESS_MORGUE, \ + ACCESS_NETWORK, \ ACCESS_ORDNANCE, \ - ACCESS_BARBER, \ + ACCESS_ORDNANCE_STORAGE, \ + ACCESS_PHARMACY, \ + ACCESS_PLUMBING, \ + ACCESS_PSYCHOLOGY, \ + ACCESS_QM, \ + ACCESS_RESEARCH, \ + ACCESS_ROBOTICS, \ + ACCESS_SCIENCE, \ + ACCESS_SECURITY, \ ACCESS_SERVICE, \ -) + ACCESS_SHIPPING, \ + ACCESS_SURGERY, \ + ACCESS_THEATRE, \ + ACCESS_VIROLOGY, \ + ACCESS_WEAPONS, \ + ACCESS_XENOBIOLOGY, \ + ACCESS_BARBER, \ +) // SKYRAT EDIT ADDITION /// Command staff/secure accesses, think bridge/armoury, ai_upload, notably access to modify ID cards themselves. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_COMMAND) #define COMMAND_ACCESS list( \ - ACCESS_MINISAT, \ - ACCESS_TCOMMS, \ - ACCESS_KEYCARD_AUTH, \ - ACCESS_RC_ANNOUNCE, \ - ACCESS_VAULT, \ - ACCESS_TECH_STORAGE, \ - ACCESS_COMMAND, \ - ACCESS_TELEPORTER, \ - ACCESS_ARMORY, \ ACCESS_AI_UPLOAD, \ + ACCESS_ALL_PERSONAL_LOCKERS, \ + ACCESS_ARMORY, \ ACCESS_CHANGE_IDS, \ + ACCESS_COMMAND, \ ACCESS_EVA, \ ACCESS_GATEWAY, \ - ACCESS_ALL_PERSONAL_LOCKERS, \ + ACCESS_KEYCARD_AUTH, \ + ACCESS_MINISAT, \ + ACCESS_RC_ANNOUNCE, \ + ACCESS_TCOMMS, \ + ACCESS_TECH_STORAGE, \ + ACCESS_TELEPORTER, \ + ACCESS_VAULT, \ ) /// Private head of staff offices, usually only granted to most cards by trimming. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_PRV_COMMAND) #define PRIVATE_COMMAND_ACCESS list( \ - ACCESS_HOS, \ - ACCESS_HOP, \ ACCESS_CE, \ ACCESS_CMO, \ + ACCESS_HOS, \ + ACCESS_HOP, \ ACCESS_RD, \ ) @@ -326,33 +326,33 @@ #define CENTCOM_ACCESS list( \ ACCESS_CENT_BAR, \ ACCESS_CENT_CAPTAIN, \ - ACCESS_CENT_TELEPORTER, \ - ACCESS_CENT_STORAGE, \ + ACCESS_CENT_GENERAL, \ ACCESS_CENT_LIVING, \ ACCESS_CENT_MEDICAL, \ ACCESS_CENT_SPECOPS, \ + ACCESS_CENT_STORAGE, \ + ACCESS_CENT_TELEPORTER, \ ACCESS_CENT_THUNDER, \ - ACCESS_CENT_GENERAL, \ ) /// Syndicate areas off station. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_SYNDICATE) #define SYNDICATE_ACCESS list( \ - ACCESS_SYNDICATE_LEADER, \ ACCESS_SYNDICATE, \ + ACCESS_SYNDICATE_LEADER, \ ) /// Away missions/gateway/space ruins. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_AWAY) #define AWAY_ACCESS list( \ - ACCESS_AWAY_GENERAL, \ ACCESS_AWAY_COMMAND, \ - ACCESS_AWAY_MAINTENANCE, \ - ACCESS_AWAY_MEDICAL, \ - ACCESS_AWAY_SEC, \ ACCESS_AWAY_ENGINEERING, \ + ACCESS_AWAY_GENERAL, \ ACCESS_AWAY_GENERIC1, \ ACCESS_AWAY_GENERIC2, \ ACCESS_AWAY_GENERIC3, \ ACCESS_AWAY_GENERIC4, \ + ACCESS_AWAY_MAINTENANCE, \ + ACCESS_AWAY_MEDICAL, \ + ACCESS_AWAY_SEC, \ ) /// Weird internal Cult access that prevents non-cult from using their doors. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_SPECIAL) @@ -372,106 +372,106 @@ #define REGION_GENERAL "General" /// Used to seed the accesses_by_region list in SSid_access. A list of general service accesses that are overseen by the HoP. #define REGION_ACCESS_GENERAL list( \ - ACCESS_KITCHEN, \ ACCESS_BAR, \ - ACCESS_HYDROPONICS, \ - ACCESS_JANITOR, \ ACCESS_CHAPEL_OFFICE, \ ACCESS_CREMATORIUM, \ - ACCESS_LIBRARY, \ - ACCESS_THEATRE, \ + ACCESS_HYDROPONICS, \ + ACCESS_JANITOR, \ + ACCESS_KITCHEN, \ ACCESS_LAWYER, \ + ACCESS_LIBRARY, \ ACCESS_SERVICE, \ + ACCESS_THEATRE, \ ) /// Name for the Security region. #define REGION_SECURITY "Security" /// Used to seed the accesses_by_region list in SSid_access. A list of all security regional accesses that are overseen by the HoS. #define REGION_ACCESS_SECURITY list( \ - ACCESS_BRIG_ENTRANCE, \ - ACCESS_WEAPONS, \ - ACCESS_SECURITY, \ - ACCESS_BRIG, \ ACCESS_ARMORY, \ - ACCESS_DETECTIVE, \ + ACCESS_BRIG, \ + ACCESS_BRIG_ENTRANCE, \ ACCESS_COURT, \ - ACCESS_MECH_SECURITY, \ + ACCESS_DETECTIVE, \ ACCESS_HOS, \ + ACCESS_MECH_SECURITY, \ + ACCESS_SECURITY, \ + ACCESS_WEAPONS, \ ) /// Name for the Medbay region. #define REGION_MEDBAY "Medbay" /// Used to seed the accesses_by_region list in SSid_access. A list of all medbay regional accesses that are overseen by the CMO. #define REGION_ACCESS_MEDBAY list( \ + ACCESS_CMO, \ + ACCESS_MECH_MEDICAL, \ ACCESS_MEDICAL, \ ACCESS_MORGUE, \ - ACCESS_PLUMBING, \ - ACCESS_VIROLOGY, \ - ACCESS_SURGERY, \ - ACCESS_MECH_MEDICAL, \ - ACCESS_CMO, \ ACCESS_PHARMACY, \ + ACCESS_PLUMBING, \ ACCESS_PSYCHOLOGY, \ + ACCESS_SURGERY, \ + ACCESS_VIROLOGY, \ ) /// Name for the Research region. #define REGION_RESEARCH "Research" /// Used to seed the accesses_by_region list in SSid_access. A list of all research regional accesses that are overseen by the RD. #define REGION_ACCESS_RESEARCH list( \ - ACCESS_RESEARCH, \ - ACCESS_SCIENCE, \ - ACCESS_ORDNANCE, \ - ACCESS_ORDNANCE_STORAGE, \ ACCESS_GENETICS, \ - ACCESS_ROBOTICS, \ - ACCESS_XENOBIOLOGY, \ ACCESS_MECH_SCIENCE, \ ACCESS_MINISAT, \ - ACCESS_RD, \ ACCESS_NETWORK, \ + ACCESS_ORDNANCE, \ + ACCESS_ORDNANCE_STORAGE, \ + ACCESS_RD, \ + ACCESS_RESEARCH, \ + ACCESS_ROBOTICS, \ + ACCESS_SCIENCE, \ + ACCESS_XENOBIOLOGY, \ ) /// Name for the Engineering region. #define REGION_ENGINEERING "Engineering" /// Used to seed the accesses_by_region list in SSid_access. A list of all engineering regional accesses that are overseen by the CE. #define REGION_ACCESS_ENGINEERING list( \ - ACCESS_CONSTRUCTION, \ + ACCESS_ATMOSPHERICS, \ ACCESS_AUX_BASE, \ - ACCESS_MAINT_TUNNELS, \ + ACCESS_CE, \ + ACCESS_CONSTRUCTION, \ ACCESS_ENGINEERING, \ ACCESS_ENGINE_EQUIP, \ ACCESS_EXTERNAL_AIRLOCKS, \ - ACCESS_TECH_STORAGE, \ - ACCESS_ATMOSPHERICS, \ + ACCESS_MAINT_TUNNELS, \ ACCESS_MECH_ENGINE, \ - ACCESS_TCOMMS, \ ACCESS_MINISAT, \ - ACCESS_CE, \ + ACCESS_TCOMMS, \ + ACCESS_TECH_STORAGE, \ ) /// Name for the Supply region. #define REGION_SUPPLY "Supply" /// Used to seed the accesses_by_region list in SSid_access. A list of all cargo regional accesses that are overseen by the HoP. #define REGION_ACCESS_SUPPLY list( \ - ACCESS_MAIL_SORTING, \ - ACCESS_MINING, \ - ACCESS_MINING_STATION, \ + ACCESS_CARGO, \ ACCESS_MECH_MINING, \ ACCESS_MINERAL_STOREROOM, \ - ACCESS_CARGO, \ + ACCESS_MINING, \ + ACCESS_MINING_STATION, \ ACCESS_QM, \ + ACCESS_SHIPPING, \ ACCESS_VAULT, \ ) /// Name for the Command region. #define REGION_COMMAND "Command" /// Used to seed the accesses_by_region list in SSid_access. A list of all command regional accesses that are overseen by the Captain. #define REGION_ACCESS_COMMAND list( \ - ACCESS_COMMAND, \ - ACCESS_RC_ANNOUNCE, \ - ACCESS_KEYCARD_AUTH, \ - ACCESS_CHANGE_IDS, \ ACCESS_AI_UPLOAD, \ - ACCESS_TELEPORTER, \ + ACCESS_ALL_PERSONAL_LOCKERS, \ + ACCESS_CAPTAIN, \ + ACCESS_CHANGE_IDS, \ + ACCESS_COMMAND, \ ACCESS_EVA, \ ACCESS_GATEWAY, \ - ACCESS_ALL_PERSONAL_LOCKERS, \ ACCESS_HOP, \ - ACCESS_CAPTAIN, \ + ACCESS_KEYCARD_AUTH, \ + ACCESS_RC_ANNOUNCE, \ + ACCESS_TELEPORTER, \ ACCESS_VAULT, \ ) /// Name for the Centcom region. @@ -520,13 +520,13 @@ /// All regions that make up the station area. Helper define to quickly designate a region as part of the station or not. Access via SSid_access.station_regions. #define REGION_AREA_STATION list( \ + REGION_COMMAND, \ + REGION_ENGINEERING, \ REGION_GENERAL, \ - REGION_SECURITY, \ REGION_MEDBAY, \ REGION_RESEARCH, \ - REGION_ENGINEERING, \ + REGION_SECURITY, \ REGION_SUPPLY, \ - REGION_COMMAND, \ ) /// Used in ID card access adding procs. Will try to add all accesses and utilises free wildcards, skipping over any accesses it can't add. diff --git a/code/controllers/subsystem/id_access.dm b/code/controllers/subsystem/id_access.dm index 5a36cdd72fe..ad62e3c5f17 100644 --- a/code/controllers/subsystem/id_access.dm +++ b/code/controllers/subsystem/id_access.dm @@ -288,7 +288,7 @@ SUBSYSTEM_DEF(id_access) desc_by_access["[ACCESS_THEATRE]"] = "Theatre" desc_by_access["[ACCESS_RESEARCH]"] = "Science" desc_by_access["[ACCESS_MINING]"] = "Mining" - desc_by_access["[ACCESS_MAIL_SORTING]"] = "Cargo Office" + desc_by_access["[ACCESS_SHIPPING]"] = "Cargo Shipping" desc_by_access["[ACCESS_VAULT]"] = "Main Vault" desc_by_access["[ACCESS_MINING_STATION]"] = "Mining EVA" desc_by_access["[ACCESS_XENOBIOLOGY]"] = "Xenobiology Lab" diff --git a/code/datums/id_trim/jobs.dm b/code/datums/id_trim/jobs.dm index 30c730450b1..4f54d6de61e 100644 --- a/code/datums/id_trim/jobs.dm +++ b/code/datums/id_trim/jobs.dm @@ -80,9 +80,15 @@ assignment = "Assistant" trim_state = "trim_assistant" sechud_icon_state = SECHUD_ASSISTANT - extra_access = list(ACCESS_MAINT_TUNNELS) minimal_access = list() - template_access = list(ACCESS_CAPTAIN, ACCESS_HOP, ACCESS_CHANGE_IDS) + extra_access = list( + ACCESS_MAINT_TUNNELS, + ) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_HOP, + ) job = /datum/job/assistant /datum/id_trim/job/assistant/refresh_trim_access() @@ -93,34 +99,77 @@ // Config has assistant maint access set. if(CONFIG_GET(flag/assistants_have_maint_access)) - access |= list(ACCESS_MAINT_TUNNELS) + access |= list( + ACCESS_MAINT_TUNNELS) /datum/id_trim/job/atmospheric_technician assignment = "Atmospheric Technician" trim_state = "trim_atmospherictechnician" sechud_icon_state = SECHUD_ATMOSPHERIC_TECHNICIAN - extra_access = list(ACCESS_ENGINE_EQUIP, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE) - minimal_access = list(ACCESS_ENGINEERING, ACCESS_ATMOSPHERICS, ACCESS_AUX_BASE, ACCESS_CONSTRUCTION, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MAINT_TUNNELS, ACCESS_MECH_ENGINE, - ACCESS_MINERAL_STOREROOM) - template_access = list(ACCESS_CAPTAIN, ACCESS_CE, ACCESS_CHANGE_IDS) + minimal_access = list( + ACCESS_ATMOSPHERICS, + ACCESS_AUX_BASE, + ACCESS_CONSTRUCTION, + ACCESS_ENGINEERING, + ACCESS_EXTERNAL_AIRLOCKS, + ACCESS_MAINT_TUNNELS, + ACCESS_MECH_ENGINE, + ACCESS_MINERAL_STOREROOM, + ) + extra_access = list( + ACCESS_ENGINE_EQUIP, + ACCESS_MINISAT, + ACCESS_TCOMMS, + ACCESS_TECH_STORAGE, + ) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_HOP, + ) job = /datum/job/atmospheric_technician /datum/id_trim/job/bartender assignment = "Bartender" trim_state = "trim_bartender" sechud_icon_state = SECHUD_BARTENDER - extra_access = list(ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_MORGUE) - minimal_access = list(ACCESS_BAR, ACCESS_MINERAL_STOREROOM, ACCESS_THEATRE, ACCESS_WEAPONS, ACCESS_SERVICE) - template_access = list(ACCESS_CAPTAIN, ACCESS_HOP, ACCESS_CHANGE_IDS) + minimal_access = list( + ACCESS_BAR, + ACCESS_MINERAL_STOREROOM, + ACCESS_SERVICE, + ACCESS_THEATRE, + ACCESS_WEAPONS, + ) + extra_access = list( + ACCESS_HYDROPONICS, + ACCESS_KITCHEN, + ) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_HOP, + ) job = /datum/job/bartender /datum/id_trim/job/botanist assignment = "Botanist" trim_state = "trim_botanist" sechud_icon_state = SECHUD_BOTANIST - extra_access = list(ACCESS_BAR, ACCESS_KITCHEN) - minimal_access = list(ACCESS_HYDROPONICS, ACCESS_MINERAL_STOREROOM, ACCESS_MORGUE, ACCESS_SERVICE) - template_access = list(ACCESS_CAPTAIN, ACCESS_HOP, ACCESS_CHANGE_IDS) + minimal_access = list( + ACCESS_HYDROPONICS, + ACCESS_MINERAL_STOREROOM, + ACCESS_SERVICE, + ) + extra_access = list( + ACCESS_BAR, + ACCESS_KITCHEN, + ACCESS_MORGUE, + ) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_HOP, + ) job = /datum/job/botanist /datum/id_trim/job/captain @@ -128,7 +177,10 @@ intern_alt_name = "Captain-in-Training" trim_state = "trim_captain" sechud_icon_state = SECHUD_CAPTAIN - template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ) job = /datum/job/captain /// Captain gets all station accesses hardcoded in because it's the Captain. @@ -144,27 +196,65 @@ assignment = "Cargo Technician" trim_state = "trim_cargotechnician" sechud_icon_state = SECHUD_CARGO_TECHNICIAN - extra_access = list(ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION) - minimal_access = list(ACCESS_CARGO, ACCESS_MAIL_SORTING, ACCESS_MAINT_TUNNELS, ACCESS_MECH_MINING, ACCESS_MINERAL_STOREROOM) - template_access = list(ACCESS_CAPTAIN, ACCESS_HOP, ACCESS_CHANGE_IDS) + minimal_access = list( + ACCESS_CARGO, + ACCESS_MAINT_TUNNELS, + ACCESS_MECH_MINING, + ACCESS_MINERAL_STOREROOM, + ACCESS_SHIPPING, + ) + extra_access = list( + ACCESS_MINING, + ACCESS_MINING_STATION, + ACCESS_QM, + ) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_HOP, + ) job = /datum/job/cargo_technician /datum/id_trim/job/chaplain assignment = "Chaplain" trim_state = "trim_chaplain" sechud_icon_state = SECHUD_CHAPLAIN + minimal_access = list( + ACCESS_CHAPEL_OFFICE, + ACCESS_CREMATORIUM, + ACCESS_MORGUE, + ACCESS_SERVICE, + ACCESS_THEATRE, + ) extra_access = list() - minimal_access = list(ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_MORGUE, ACCESS_THEATRE, ACCESS_SERVICE) - template_access = list(ACCESS_CAPTAIN, ACCESS_HOP, ACCESS_CHANGE_IDS) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_HOP, + ) job = /datum/job/chaplain /datum/id_trim/job/chemist assignment = "Chemist" trim_state = "trim_chemist" sechud_icon_state = SECHUD_CHEMIST - extra_access = list(ACCESS_SURGERY, ACCESS_VIROLOGY) - minimal_access = list(ACCESS_PLUMBING, ACCESS_MECH_MEDICAL, ACCESS_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MORGUE, ACCESS_PHARMACY) - template_access = list(ACCESS_CAPTAIN, ACCESS_CMO, ACCESS_CHANGE_IDS) + minimal_access = list( + ACCESS_MECH_MEDICAL, + ACCESS_MEDICAL, + ACCESS_MINERAL_STOREROOM, + ACCESS_PHARMACY, + ACCESS_PLUMBING, + ) + extra_access = list( + ACCESS_MORGUE, + ACCESS_SURGERY, + ACCESS_VIROLOGY, + ) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_CMO, + ) job = /datum/job/chemist /datum/id_trim/job/chief_engineer @@ -172,13 +262,37 @@ intern_alt_name = "Chief Engineer-in-Training" trim_state = "trim_chiefengineer" sechud_icon_state = SECHUD_CHIEF_ENGINEER - extra_access = list(ACCESS_TELEPORTER) extra_wildcard_access = list() - minimal_access = list(ACCESS_ATMOSPHERICS, ACCESS_AUX_BASE, ACCESS_CE, ACCESS_CONSTRUCTION, ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_EVA, - ACCESS_EXTERNAL_AIRLOCKS, ACCESS_COMMAND, ACCESS_KEYCARD_AUTH, ACCESS_MAINT_TUNNELS, ACCESS_MECH_ENGINE, - ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_RC_ANNOUNCE, ACCESS_BRIG_ENTRANCE, ACCESS_TCOMMS, ACCESS_TECH_STORAGE) - minimal_wildcard_access = list(ACCESS_CE) - template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS) + minimal_access = list( + ACCESS_ATMOSPHERICS, + ACCESS_AUX_BASE, + ACCESS_BRIG_ENTRANCE, + ACCESS_CE, + ACCESS_COMMAND, + ACCESS_CONSTRUCTION, + ACCESS_ENGINEERING, + ACCESS_ENGINE_EQUIP, + ACCESS_EVA, + ACCESS_EXTERNAL_AIRLOCKS, + ACCESS_KEYCARD_AUTH, + ACCESS_MAINT_TUNNELS, + ACCESS_MECH_ENGINE, + ACCESS_MINERAL_STOREROOM, + ACCESS_MINISAT, + ACCESS_RC_ANNOUNCE, + ACCESS_TCOMMS, + ACCESS_TECH_STORAGE, + ) + minimal_wildcard_access = list( + ACCESS_CE, + ) + extra_access = list( + ACCESS_TELEPORTER, + ) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ) job = /datum/job/chief_engineer /datum/id_trim/job/chief_medical_officer @@ -186,31 +300,71 @@ intern_alt_name = "Chief Medical Officer-in-Training" trim_state = "trim_chiefmedicalofficer" sechud_icon_state = SECHUD_CHIEF_MEDICAL_OFFICER - extra_access = list(ACCESS_TELEPORTER) extra_wildcard_access = list() - minimal_access = list(ACCESS_PLUMBING, ACCESS_EVA, ACCESS_COMMAND, ACCESS_KEYCARD_AUTH, ACCESS_MAINT_TUNNELS, ACCESS_MECH_MEDICAL, - ACCESS_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MORGUE, ACCESS_PHARMACY, ACCESS_PSYCHOLOGY, ACCESS_RC_ANNOUNCE, - ACCESS_BRIG_ENTRANCE, ACCESS_SURGERY, ACCESS_VIROLOGY) - minimal_wildcard_access = list(ACCESS_CMO) - template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS) + minimal_access = list( + ACCESS_BRIG_ENTRANCE, + ACCESS_COMMAND, + ACCESS_KEYCARD_AUTH, + ACCESS_PLUMBING, + ACCESS_EVA, + ACCESS_MAINT_TUNNELS, + ACCESS_MECH_MEDICAL, + ACCESS_MEDICAL, + ACCESS_MINERAL_STOREROOM, + ACCESS_MORGUE, + ACCESS_PHARMACY, + ACCESS_PSYCHOLOGY, + ACCESS_RC_ANNOUNCE, + ACCESS_SURGERY, + ACCESS_VIROLOGY, + ) + minimal_wildcard_access = list( + ACCESS_CMO, + ) + extra_access = list( + ACCESS_TELEPORTER, + ) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ) job = /datum/job/chief_medical_officer /datum/id_trim/job/clown assignment = "Clown" trim_state = "trim_clown" sechud_icon_state = SECHUD_CLOWN + minimal_access = list( + ACCESS_SERVICE, + ACCESS_THEATRE, + ) extra_access = list() - minimal_access = list(ACCESS_THEATRE, ACCESS_SERVICE) - template_access = list(ACCESS_CAPTAIN, ACCESS_HOP, ACCESS_CHANGE_IDS) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_HOP, + ) job = /datum/job/clown /datum/id_trim/job/cook assignment = "Cook" trim_state = "trim_cook" sechud_icon_state = SECHUD_COOK - extra_access = list(ACCESS_BAR, ACCESS_HYDROPONICS) - minimal_access = list(ACCESS_KITCHEN, ACCESS_MINERAL_STOREROOM, ACCESS_MORGUE, ACCESS_SERVICE) - template_access = list(ACCESS_CAPTAIN, ACCESS_HOP, ACCESS_CHANGE_IDS) + minimal_access = list( + ACCESS_KITCHEN, + ACCESS_MINERAL_STOREROOM, + ACCESS_MORGUE, + ACCESS_SERVICE, + ) + extra_access = list( + ACCESS_BAR, + ACCESS_HYDROPONICS, + ) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_HOP, + ) job = /datum/job/cook /datum/id_trim/job/cook/chef @@ -221,19 +375,43 @@ assignment = "Curator" trim_state = "trim_curator" sechud_icon_state = SECHUD_CURATOR + minimal_access = list( + ACCESS_AUX_BASE, + ACCESS_LIBRARY, + ACCESS_MINING_STATION, + ACCESS_SERVICE, + ) extra_access = list() - minimal_access = list(ACCESS_AUX_BASE, ACCESS_LIBRARY, ACCESS_MINING_STATION, ACCESS_SERVICE) - template_access = list(ACCESS_CAPTAIN, ACCESS_HOP, ACCESS_CHANGE_IDS) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_HOP, + ) job = /datum/job/curator /datum/id_trim/job/detective assignment = "Detective" trim_state = "trim_detective" sechud_icon_state = SECHUD_DETECTIVE - extra_access = list(ACCESS_BRIG) - minimal_access = list(ACCESS_SECURITY, ACCESS_COURT, ACCESS_DETECTIVE, ACCESS_BRIG_ENTRANCE,ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, - ACCESS_MECH_SECURITY, ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS) - template_access = list(ACCESS_CAPTAIN, ACCESS_HOS, ACCESS_CHANGE_IDS) + minimal_access = list( + ACCESS_BRIG_ENTRANCE, + ACCESS_COURT, + ACCESS_DETECTIVE, + ACCESS_MAINT_TUNNELS, + ACCESS_MECH_SECURITY, + ACCESS_MINERAL_STOREROOM, + ACCESS_MORGUE, + ACCESS_SECURITY, + ACCESS_WEAPONS, + ) + extra_access = list( + ACCESS_BRIG, + ) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_HOS, + ) job = /datum/job/detective /datum/id_trim/job/detective/refresh_trim_access() @@ -250,9 +428,24 @@ assignment = "Geneticist" trim_state = "trim_geneticist" sechud_icon_state = SECHUD_GENETICIST - extra_access = list(ACCESS_ROBOTICS, ACCESS_TECH_STORAGE, ACCESS_XENOBIOLOGY) - minimal_access = list(ACCESS_GENETICS, ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM, ACCESS_MORGUE, ACCESS_RESEARCH, ACCESS_SCIENCE) - template_access = list(ACCESS_CAPTAIN, ACCESS_RD, ACCESS_CHANGE_IDS) + minimal_access = list( + ACCESS_GENETICS, + ACCESS_MECH_SCIENCE, + ACCESS_MINERAL_STOREROOM, + ACCESS_MORGUE, + ACCESS_RESEARCH, + ACCESS_SCIENCE, + ) + extra_access = list( + ACCESS_ROBOTICS, + ACCESS_TECH_STORAGE, + ACCESS_XENOBIOLOGY, + ) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_RD, + ) job = /datum/job/geneticist /datum/id_trim/job/head_of_personnel @@ -260,16 +453,53 @@ intern_alt_name = "Head of Personnel-in-Training" trim_state = "trim_headofpersonnel" sechud_icon_state = SECHUD_HEAD_OF_PERSONNEL + minimal_access = list( + ACCESS_AI_UPLOAD, + ACCESS_ALL_PERSONAL_LOCKERS, + ACCESS_AUX_BASE, + ACCESS_BAR, + ACCESS_BRIG_ENTRANCE, + ACCESS_CARGO, + ACCESS_CHAPEL_OFFICE, + ACCESS_CHANGE_IDS, + ACCESS_CREMATORIUM, + ACCESS_COMMAND, + ACCESS_COURT, + ACCESS_ENGINEERING, + ACCESS_EVA, + ACCESS_GATEWAY, + ACCESS_HYDROPONICS, + ACCESS_JANITOR, + ACCESS_KEYCARD_AUTH, + ACCESS_KITCHEN, + ACCESS_LAWYER, + ACCESS_LIBRARY, + ACCESS_MAINT_TUNNELS, + ACCESS_MECH_MINING, + ACCESS_MEDICAL, + ACCESS_MINERAL_STOREROOM, + ACCESS_MINING, + ACCESS_MINING_STATION, + ACCESS_PSYCHOLOGY, + ACCESS_QM, + ACCESS_RC_ANNOUNCE, + ACCESS_SCIENCE, + ACCESS_SERVICE, + ACCESS_SHIPPING, + ACCESS_TELEPORTER, + ACCESS_THEATRE, + ACCESS_VAULT, + ACCESS_WEAPONS, + ) + minimal_wildcard_access = list( + ACCESS_HOP, + ) extra_access = list() extra_wildcard_access = list() - minimal_access = list(ACCESS_AI_UPLOAD, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_AUX_BASE, ACCESS_BAR, ACCESS_CARGO, ACCESS_CHAPEL_OFFICE, - ACCESS_CHANGE_IDS, ACCESS_CONSTRUCTION, ACCESS_COURT, ACCESS_CREMATORIUM, ACCESS_ENGINEERING, ACCESS_EVA, ACCESS_GATEWAY, - ACCESS_COMMAND, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_KEYCARD_AUTH, ACCESS_KITCHEN, ACCESS_LAWYER, ACCESS_LIBRARY, - ACCESS_MAIL_SORTING, ACCESS_MAINT_TUNNELS, ACCESS_MECH_MINING, ACCESS_MEDICAL, ACCESS_MINERAL_STOREROOM, - ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MORGUE, ACCESS_PSYCHOLOGY, ACCESS_QM, ACCESS_RC_ANNOUNCE, - ACCESS_RESEARCH, ACCESS_BRIG_ENTRANCE, ACCESS_TELEPORTER, ACCESS_THEATRE, ACCESS_VAULT, ACCESS_WEAPONS, ACCESS_SERVICE) - minimal_wildcard_access = list(ACCESS_HOP) - template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ) job = /datum/job/head_of_personnel /datum/id_trim/job/head_of_security @@ -279,12 +509,41 @@ sechud_icon_state = SECHUD_HEAD_OF_SECURITY extra_access = list(ACCESS_TELEPORTER) extra_wildcard_access = list() - minimal_access = list(ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_ARMORY, ACCESS_AUX_BASE, ACCESS_BRIG, ACCESS_CONSTRUCTION, ACCESS_COURT, - ACCESS_ENGINEERING, ACCESS_EVA, ACCESS_DETECTIVE, ACCESS_GATEWAY, ACCESS_COMMAND, ACCESS_KEYCARD_AUTH, - ACCESS_MAIL_SORTING, ACCESS_MAINT_TUNNELS, ACCESS_MECH_SECURITY, ACCESS_MEDICAL, ACCESS_MINERAL_STOREROOM, - ACCESS_MINING, ACCESS_MORGUE, ACCESS_RC_ANNOUNCE, ACCESS_RESEARCH, ACCESS_SECURITY, ACCESS_BRIG_ENTRANCE, ACCESS_WEAPONS) - minimal_wildcard_access = list(ACCESS_HOS) - template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS) + minimal_access = list( + ACCESS_ALL_PERSONAL_LOCKERS, + ACCESS_ARMORY, + ACCESS_AUX_BASE, + ACCESS_BRIG, + ACCESS_BRIG_ENTRANCE, + ACCESS_CARGO, + ACCESS_COMMAND, + ACCESS_CONSTRUCTION, + ACCESS_COURT, + ACCESS_DETECTIVE, + ACCESS_ENGINEERING, + ACCESS_EVA, + ACCESS_GATEWAY, + ACCESS_KEYCARD_AUTH, + ACCESS_MAINT_TUNNELS, + ACCESS_MECH_SECURITY, + ACCESS_MEDICAL, + ACCESS_MINERAL_STOREROOM, + ACCESS_MINING, + ACCESS_MORGUE, + ACCESS_RC_ANNOUNCE, + ACCESS_SCIENCE, + ACCESS_SECURITY, + ACCESS_SERVICE, + ACCESS_SHIPPING, + ACCESS_WEAPONS, + ) + minimal_wildcard_access = list( + ACCESS_HOS, + ) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ) job = /datum/job/head_of_security /datum/id_trim/job/head_of_security/refresh_trim_access() @@ -301,53 +560,115 @@ assignment = "Janitor" trim_state = "trim_janitor" sechud_icon_state = SECHUD_JANITOR + minimal_access = list( + ACCESS_JANITOR, + ACCESS_MAINT_TUNNELS, + ACCESS_MINERAL_STOREROOM, + ACCESS_SERVICE, + ) extra_access = list() - minimal_access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM, ACCESS_SERVICE) - template_access = list(ACCESS_CAPTAIN, ACCESS_HOP, ACCESS_CHANGE_IDS) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_HOP, + ACCESS_CHANGE_IDS, + ) job = /datum/job/janitor /datum/id_trim/job/lawyer assignment = "Lawyer" trim_state = "trim_lawyer" sechud_icon_state = SECHUD_LAWYER + minimal_access = list( + ACCESS_BRIG_ENTRANCE, + ACCESS_COURT, + ACCESS_LAWYER, + ACCESS_SERVICE, + ) extra_access = list() - minimal_access = list(ACCESS_COURT, ACCESS_LAWYER, ACCESS_BRIG_ENTRANCE, ACCESS_SERVICE) - template_access = list(ACCESS_CAPTAIN, ACCESS_HOP, ACCESS_HOS, ACCESS_CHANGE_IDS) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_HOP, + ACCESS_HOS, + ) job = /datum/job/lawyer /datum/id_trim/job/medical_doctor assignment = "Medical Doctor" trim_state = "trim_medicaldoctor" sechud_icon_state = SECHUD_MEDICAL_DOCTOR - extra_access = list(ACCESS_PLUMBING, ACCESS_VIROLOGY) - minimal_access = list(ACCESS_MECH_MEDICAL, ACCESS_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MORGUE, ACCESS_PHARMACY, ACCESS_SURGERY) - template_access = list(ACCESS_CAPTAIN, ACCESS_CMO, ACCESS_CHANGE_IDS) + extra_access = list( + ACCESS_PLUMBING, + ACCESS_VIROLOGY, + ) + minimal_access = list( + ACCESS_MECH_MEDICAL, + ACCESS_MEDICAL, + ACCESS_MINERAL_STOREROOM, + ACCESS_MORGUE, + ACCESS_PHARMACY, + ACCESS_SURGERY, + ) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_CMO, + ) job = /datum/job/doctor /datum/id_trim/job/mime assignment = "Mime" trim_state = "trim_mime" sechud_icon_state = SECHUD_MIME + minimal_access = list( + ACCESS_SERVICE, + ACCESS_THEATRE, + ) extra_access = list() - minimal_access = list(ACCESS_THEATRE, ACCESS_SERVICE) - template_access = list(ACCESS_CAPTAIN, ACCESS_HOP, ACCESS_CHANGE_IDS) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_HOP, + ) job = /datum/job/mime /datum/id_trim/job/paramedic assignment = "Paramedic" trim_state = "trim_paramedic" sechud_icon_state = SECHUD_PARAMEDIC - extra_access = list(ACCESS_SURGERY) - minimal_access = list(ACCESS_CONSTRUCTION, ACCESS_HYDROPONICS, ACCESS_MAINT_TUNNELS, ACCESS_MECH_MEDICAL, - ACCESS_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MINING, ACCESS_MORGUE, ACCESS_RESEARCH) - template_access = list(ACCESS_CAPTAIN, ACCESS_CMO, ACCESS_CHANGE_IDS) + minimal_access = list( + ACCESS_CARGO, + ACCESS_CONSTRUCTION, + ACCESS_HYDROPONICS, + ACCESS_MAINT_TUNNELS, + ACCESS_MECH_MEDICAL, + ACCESS_MEDICAL, + ACCESS_MINERAL_STOREROOM, + ACCESS_MINING, + ACCESS_MORGUE, + ACCESS_SCIENCE, + ACCESS_SERVICE, + ) + extra_access = list( + ACCESS_SURGERY, + ) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_CMO, + ) job = /datum/job/paramedic /datum/id_trim/job/prisoner assignment = "Prisoner" trim_state = "trim_prisoner" sechud_icon_state = SECHUD_PRISONER - template_access = list(ACCESS_CAPTAIN, ACCESS_HOP, ACCESS_HOS, ACCESS_CHANGE_IDS) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_HOP, + ACCESS_HOS, + ) job = /datum/job/prisoner /datum/id_trim/job/prisoner/one @@ -382,19 +703,43 @@ assignment = "Psychologist" trim_state = "trim_psychologist" sechud_icon_state = SECHUD_PSYCHOLOGIST + minimal_access = list( + ACCESS_MEDICAL, + ACCESS_PSYCHOLOGY, + ACCESS_SERVICE, + ) extra_access = list() - minimal_access = list(ACCESS_MEDICAL, ACCESS_PSYCHOLOGY, ACCESS_SERVICE) - template_access = list(ACCESS_CAPTAIN, ACCESS_HOP, ACCESS_CMO, ACCESS_CHANGE_IDS) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_CMO, + ACCESS_HOP, + ) job = /datum/job/psychologist /datum/id_trim/job/quartermaster assignment = "Quartermaster" trim_state = "trim_quartermaster" sechud_icon_state = SECHUD_QUARTERMASTER + minimal_access = list( + ACCESS_AUX_BASE, + ACCESS_CARGO, + ACCESS_MAINT_TUNNELS, + ACCESS_MECH_MINING, + ACCESS_MINING_STATION, + ACCESS_MINERAL_STOREROOM, + ACCESS_MINING, + ACCESS_QM, + ACCESS_RC_ANNOUNCE, + ACCESS_SHIPPING, + ACCESS_VAULT, + ) extra_access = list() - minimal_access = list(ACCESS_AUX_BASE, ACCESS_CARGO, ACCESS_MAIL_SORTING, ACCESS_MAINT_TUNNELS, ACCESS_MECH_MINING, ACCESS_MINING_STATION, - ACCESS_MINERAL_STOREROOM, ACCESS_MINING, ACCESS_QM, ACCESS_RC_ANNOUNCE, ACCESS_VAULT) - template_access = list(ACCESS_CAPTAIN, ACCESS_HOP, ACCESS_CHANGE_IDS) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_HOP, + ) job = /datum/job/quartermaster /datum/id_trim/job/research_director @@ -402,35 +747,94 @@ intern_alt_name = "Research Director-in-Training" trim_state = "trim_researchdirector" sechud_icon_state = SECHUD_RESEARCH_DIRECTOR + minimal_access = list( + ACCESS_AI_UPLOAD, + ACCESS_AUX_BASE, + ACCESS_BRIG_ENTRANCE, + ACCESS_COMMAND, + ACCESS_CONSTRUCTION, + ACCESS_EVA, + ACCESS_GATEWAY, + ACCESS_GENETICS, + ACCESS_KEYCARD_AUTH, + ACCESS_NETWORK, + ACCESS_MAINT_TUNNELS, + ACCESS_MECH_ENGINE, + ACCESS_MECH_MINING, + ACCESS_MECH_SECURITY, + ACCESS_MECH_SCIENCE, + ACCESS_MINERAL_STOREROOM, + ACCESS_MINISAT, + ACCESS_MORGUE, + ACCESS_ORDNANCE, + ACCESS_ORDNANCE_STORAGE, + ACCESS_RC_ANNOUNCE, + ACCESS_RESEARCH, + ACCESS_ROBOTICS, + ACCESS_SCIENCE, + ACCESS_TECH_STORAGE, + ACCESS_TELEPORTER, + ACCESS_XENOBIOLOGY, + ) + minimal_wildcard_access = list( + ACCESS_RD, + ) extra_access = list() extra_wildcard_access = list() - minimal_access = list(ACCESS_AI_UPLOAD, ACCESS_AUX_BASE, ACCESS_EVA, ACCESS_GATEWAY, ACCESS_GENETICS, ACCESS_COMMAND, ACCESS_KEYCARD_AUTH, - ACCESS_NETWORK, ACCESS_MAINT_TUNNELS, ACCESS_MECH_ENGINE, ACCESS_MECH_MINING, ACCESS_MECH_SECURITY, ACCESS_MECH_SCIENCE, - ACCESS_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINISAT, ACCESS_MORGUE, - ACCESS_ORDNANCE, ACCESS_ORDNANCE_STORAGE, ACCESS_RC_ANNOUNCE, ACCESS_RESEARCH, ACCESS_SCIENCE, ACCESS_ROBOTICS, - ACCESS_BRIG_ENTRANCE, ACCESS_TECH_STORAGE, ACCESS_TELEPORTER, ACCESS_XENOBIOLOGY) - minimal_wildcard_access = list(ACCESS_RD) - template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ) job = /datum/job/research_director /datum/id_trim/job/roboticist assignment = "Roboticist" trim_state = "trim_roboticist" sechud_icon_state = SECHUD_ROBOTICIST - extra_access = list(ACCESS_GENETICS, ACCESS_ORDNANCE, ACCESS_ORDNANCE_STORAGE, ACCESS_XENOBIOLOGY) - minimal_access = list(ACCESS_AUX_BASE, ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM, ACCESS_MORGUE, ACCESS_RESEARCH, ACCESS_SCIENCE, - ACCESS_ROBOTICS, ACCESS_TECH_STORAGE) - template_access = list(ACCESS_CAPTAIN, ACCESS_RD, ACCESS_CHANGE_IDS) + minimal_access = list( + ACCESS_AUX_BASE, + ACCESS_MECH_SCIENCE, + ACCESS_MINERAL_STOREROOM, + ACCESS_MORGUE, + ACCESS_RESEARCH, + ACCESS_ROBOTICS, + ACCESS_SCIENCE, + ACCESS_TECH_STORAGE, + ) + extra_access = list( + ACCESS_GENETICS, + ACCESS_XENOBIOLOGY, + ) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_RD, + ) job = /datum/job/roboticist /datum/id_trim/job/scientist assignment = "Scientist" trim_state = "trim_scientist" sechud_icon_state = SECHUD_SCIENTIST - extra_access = list(ACCESS_GENETICS, ACCESS_ROBOTICS) - minimal_access = list(ACCESS_AUX_BASE, ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM, ACCESS_ORDNANCE, ACCESS_ORDNANCE_STORAGE, - 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_ORDNANCE, + ACCESS_ORDNANCE_STORAGE, + ACCESS_RESEARCH, + ACCESS_SCIENCE, + ACCESS_XENOBIOLOGY, + ) + extra_access = list( + ACCESS_GENETICS, + ACCESS_ROBOTICS, + ) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_RD, + ) job = /datum/job/scientist /// Sec officers have departmental variants. They each have their own trims with bonus departmental accesses. @@ -438,10 +842,25 @@ assignment = "Security Officer" trim_state = "trim_securityofficer" sechud_icon_state = SECHUD_SECURITY_OFFICER - extra_access = list(ACCESS_DETECTIVE, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE) - minimal_access = list(ACCESS_BRIG, ACCESS_COURT, ACCESS_SECURITY, ACCESS_BRIG_ENTRANCE, ACCESS_MECH_SECURITY, - ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS) - template_access = list(ACCESS_CAPTAIN, ACCESS_HOS, ACCESS_CHANGE_IDS) + minimal_access = list( + ACCESS_BRIG, + ACCESS_BRIG_ENTRANCE, + ACCESS_COURT, + ACCESS_MECH_SECURITY, + ACCESS_MINERAL_STOREROOM, + ACCESS_SECURITY, + ACCESS_WEAPONS, + ) + extra_access = list( + ACCESS_DETECTIVE, + ACCESS_MAINT_TUNNELS, + ACCESS_MORGUE, + ) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_HOS, + ) job = /datum/job/security_officer /// List of bonus departmental accesses that departmental sec officers get. var/department_access = list() @@ -461,66 +880,160 @@ /datum/id_trim/job/security_officer/supply assignment = "Security Officer (Cargo)" trim_state = "trim_securityofficer_car" - department_access = list(ACCESS_AUX_BASE, ACCESS_CARGO, ACCESS_MAIL_SORTING, ACCESS_MINING, ACCESS_MINING_STATION) + department_access = list( + ACCESS_AUX_BASE, + ACCESS_CARGO, + ACCESS_MINING, + ACCESS_MINING_STATION, + ACCESS_SHIPPING, + ) /datum/id_trim/job/security_officer/engineering assignment = "Security Officer (Engineering)" trim_state = "trim_securityofficer_engi" - department_access = list(ACCESS_ATMOSPHERICS, ACCESS_AUX_BASE, ACCESS_CONSTRUCTION, ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_TCOMMS) + department_access = list( + ACCESS_ATMOSPHERICS, + ACCESS_AUX_BASE, + ACCESS_CONSTRUCTION, + ACCESS_ENGINEERING, + ACCESS_ENGINE_EQUIP, + ACCESS_TCOMMS, + ) /datum/id_trim/job/security_officer/medical assignment = "Security Officer (Medical)" trim_state = "trim_securityofficer_med" - department_access = list(ACCESS_PHARMACY, ACCESS_PLUMBING, ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_VIROLOGY) + department_access = list( + ACCESS_MEDICAL, + ACCESS_MORGUE, + ACCESS_PHARMACY, + ACCESS_PLUMBING, + ACCESS_SURGERY, + ACCESS_VIROLOGY, + ) /datum/id_trim/job/security_officer/science assignment = "Security Officer (Science)" trim_state = "trim_securityofficer_sci" - department_access = list(ACCESS_AUX_BASE, ACCESS_GENETICS, ACCESS_ORDNANCE, ACCESS_ORDNANCE_STORAGE, ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_SCIENCE, ACCESS_XENOBIOLOGY) + department_access = list( + ACCESS_AUX_BASE, + ACCESS_GENETICS, + ACCESS_ORDNANCE, + ACCESS_ORDNANCE_STORAGE, + ACCESS_RESEARCH, + ACCESS_ROBOTICS, + ACCESS_SCIENCE, + ACCESS_XENOBIOLOGY, + ) /datum/id_trim/job/shaft_miner assignment = "Shaft Miner" trim_state = "trim_shaftminer" sechud_icon_state = SECHUD_SHAFT_MINER - extra_access = list(ACCESS_MAINT_TUNNELS, ACCESS_QM) - minimal_access = list(ACCESS_CARGO, ACCESS_AUX_BASE, ACCESS_MAIL_SORTING, ACCESS_MECH_MINING, ACCESS_MINERAL_STOREROOM, ACCESS_MINING, - ACCESS_MINING_STATION) - template_access = list(ACCESS_CAPTAIN, ACCESS_HOP, ACCESS_CHANGE_IDS) + minimal_access = list( + ACCESS_AUX_BASE, + ACCESS_CARGO, + ACCESS_MECH_MINING, + ACCESS_MINERAL_STOREROOM, + ACCESS_MINING, + ACCESS_MINING_STATION, + ) + extra_access = list( + ACCESS_MAINT_TUNNELS, + ACCESS_QM, + ) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_HOP, + ) job = /datum/job/shaft_miner /// ID card obtained from the mining Disney dollar points vending machine. /datum/id_trim/job/shaft_miner/spare + minimal_access = list( + ACCESS_CARGO, + ACCESS_MECH_MINING, + ACCESS_MINERAL_STOREROOM, + ACCESS_MINING, + ACCESS_MINING_STATION, + ) extra_access = list() - minimal_access = list(ACCESS_CARGO, ACCESS_MAIL_SORTING, ACCESS_MECH_MINING, ACCESS_MINERAL_STOREROOM, ACCESS_MINING, ACCESS_MINING_STATION) template_access = null /datum/id_trim/job/station_engineer assignment = "Station Engineer" trim_state = "trim_stationengineer" sechud_icon_state = SECHUD_STATION_ENGINEER - extra_access = list(ACCESS_ATMOSPHERICS) - minimal_access = list(ACCESS_AUX_BASE, ACCESS_CONSTRUCTION, ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_EXTERNAL_AIRLOCKS, - ACCESS_MAINT_TUNNELS, ACCESS_MECH_ENGINE, ACCESS_MINERAL_STOREROOM, ACCESS_TCOMMS, ACCESS_TECH_STORAGE) - template_access = list(ACCESS_CAPTAIN, ACCESS_CE, ACCESS_CHANGE_IDS) + minimal_access = list( + ACCESS_AUX_BASE, + ACCESS_CONSTRUCTION, + ACCESS_ENGINEERING, + ACCESS_ENGINE_EQUIP, + ACCESS_EXTERNAL_AIRLOCKS, + ACCESS_MAINT_TUNNELS, + ACCESS_MECH_ENGINE, + ACCESS_MINERAL_STOREROOM, + ACCESS_MINISAT, + ACCESS_TCOMMS, + ACCESS_TECH_STORAGE, + ) + extra_access = list( + ACCESS_ATMOSPHERICS, + ) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_CE, + ) job = /datum/job/station_engineer /datum/id_trim/job/virologist assignment = "Virologist" trim_state = "trim_virologist" sechud_icon_state = SECHUD_VIROLOGIST - extra_access = list(ACCESS_PLUMBING, ACCESS_MORGUE, ACCESS_SURGERY) - minimal_access = list(ACCESS_MEDICAL, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_VIROLOGY) - template_access = list(ACCESS_CAPTAIN, ACCESS_CMO, ACCESS_CHANGE_IDS) + minimal_access = list( + ACCESS_MECH_MEDICAL, + ACCESS_MEDICAL, + ACCESS_MINERAL_STOREROOM, + ACCESS_VIROLOGY, + ) + extra_access = list( + ACCESS_PLUMBING, + ACCESS_MORGUE, + ACCESS_SURGERY, + ) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_CMO, + ) job = /datum/job/virologist /datum/id_trim/job/warden assignment = "Warden" trim_state = "trim_warden" sechud_icon_state = SECHUD_WARDEN - extra_access = list(ACCESS_DETECTIVE, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE) - minimal_access = list(ACCESS_ARMORY, ACCESS_BRIG, ACCESS_COURT, ACCESS_MECH_SECURITY, ACCESS_MINERAL_STOREROOM, - ACCESS_SECURITY, ACCESS_BRIG_ENTRANCE, ACCESS_WEAPONS) // See /datum/job/warden/get_access() - template_access = list(ACCESS_CAPTAIN, ACCESS_HOS, ACCESS_CHANGE_IDS) + minimal_access = list( + ACCESS_ARMORY, + ACCESS_BRIG, + ACCESS_BRIG_ENTRANCE, + ACCESS_COURT, + ACCESS_MECH_SECURITY, + ACCESS_MINERAL_STOREROOM, + ACCESS_SECURITY, + ACCESS_WEAPONS, + ) // See /datum/job/warden/get_access() + extra_access = list( + ACCESS_DETECTIVE, + ACCESS_MAINT_TUNNELS, + ACCESS_MORGUE, + ) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_HOS, + ) job = /datum/job/warden /datum/id_trim/job/warden/refresh_trim_access() diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm index a75733e1351..e270451fc96 100644 --- a/code/modules/mapping/access_helpers.dm +++ b/code/modules/mapping/access_helpers.dm @@ -46,6 +46,12 @@ access_list += ACCESS_EVA return access_list +/obj/effect/mapping_helpers/airlock/access/any/command/minisat/get_access() + var/list/access_list = ..() + access_list += ACCESS_MINISAT + return access_list + + /obj/effect/mapping_helpers/airlock/access/any/command/gateway/get_access() var/list/access_list = ..() access_list += ACCESS_GATEWAY @@ -340,9 +346,9 @@ access_list += ACCESS_CARGO return access_list -/obj/effect/mapping_helpers/airlock/access/any/supply/mail_sorting/get_access() +/obj/effect/mapping_helpers/airlock/access/any/supply/shipping/get_access() var/list/access_list = ..() - access_list += ACCESS_MAIL_SORTING + access_list += ACCESS_SHIPPING return access_list /obj/effect/mapping_helpers/airlock/access/any/supply/mining/get_access() @@ -522,6 +528,11 @@ access_list += ACCESS_EVA return access_list +/obj/effect/mapping_helpers/airlock/access/all/command/minisat/get_access() + var/list/access_list = ..() + access_list += ACCESS_MINISAT + return access_list + /obj/effect/mapping_helpers/airlock/access/all/command/gateway/get_access() var/list/access_list = ..() access_list += ACCESS_GATEWAY @@ -786,9 +797,9 @@ access_list += ACCESS_CARGO return access_list -/obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting/get_access() +/obj/effect/mapping_helpers/airlock/access/all/supply/shipping/get_access() var/list/access_list = ..() - access_list += ACCESS_MAIL_SORTING + access_list += ACCESS_SHIPPING return access_list /obj/effect/mapping_helpers/airlock/access/all/supply/mining/get_access() diff --git a/code/modules/modular_computers/file_system/programs/techweb.dm b/code/modules/modular_computers/file_system/programs/techweb.dm index 1ee417b93d1..28c91a44e75 100644 --- a/code/modules/modular_computers/file_system/programs/techweb.dm +++ b/code/modules/modular_computers/file_system/programs/techweb.dm @@ -8,12 +8,12 @@ size = 10 tgui_id = "NtosTechweb" program_icon = "atom" - required_access = list(ACCESS_COMMAND, ACCESS_SCIENCE) + required_access = list(ACCESS_COMMAND, ACCESS_RESEARCH) transfer_access = list(ACCESS_RESEARCH) /// Reference to global science techweb var/datum/techweb/stored_research /// Access needed to lock/unlock the console - var/lock_access = ACCESS_SCIENCE + var/lock_access = ACCESS_RESEARCH /// Determines if the console is locked, and consequently if actions can be performed with it var/locked = FALSE /// Used for compressing data sent to the UI via static_data as payload size is of concern diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 4996a55853a..2e710f4185b 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -22,7 +22,7 @@ Nothing else in the console has ID requirements. icon_screen = "rdcomp" icon_keyboard = "rd_key" circuit = /obj/item/circuitboard/computer/rdconsole - req_access = list(ACCESS_SCIENCE) // Locking and unlocking the console requires science access + req_access = list(ACCESS_RESEARCH) // Locking and unlocking the console requires research access /// Reference to global science techweb var/datum/techweb/stored_research /// The stored technology disk, if present diff --git a/modular_skyrat/modules/goofsec/code/department_guards.dm b/modular_skyrat/modules/goofsec/code/department_guards.dm index aa937dc2d32..dffb0d88adc 100644 --- a/modular_skyrat/modules/goofsec/code/department_guards.dm +++ b/modular_skyrat/modules/goofsec/code/department_guards.dm @@ -376,8 +376,8 @@ trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' trim_state = "trim_customs" sechud_icon_state = SECHUD_CUSTOMS_AGENT - extra_access = list(ACCESS_BRIG_ENTRANCE, ACCESS_MAINT_TUNNELS, ACCESS_MAIL_SORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS) - minimal_access = list(ACCESS_BRIG_ENTRANCE, ACCESS_MAINT_TUNNELS, ACCESS_MAIL_SORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS) + extra_access = list(ACCESS_BRIG_ENTRANCE, ACCESS_MAINT_TUNNELS, ACCESS_SHIPPING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS) + minimal_access = list(ACCESS_BRIG_ENTRANCE, ACCESS_MAINT_TUNNELS, ACCESS_SHIPPING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS) template_access = list(ACCESS_CAPTAIN, ACCESS_QM, ACCESS_CHANGE_IDS) job = /datum/job/customs_agent diff --git a/tools/UpdatePaths/Scripts/67512_mail_sorting_to_shipping.txt b/tools/UpdatePaths/Scripts/67512_mail_sorting_to_shipping.txt new file mode 100644 index 00000000000..7a6699b354b --- /dev/null +++ b/tools/UpdatePaths/Scripts/67512_mail_sorting_to_shipping.txt @@ -0,0 +1,2 @@ +/obj/effect/mapping_helpers/airlock/access/any/supply/mail_sorting : /obj/effect/mapping_helpers/airlock/access/any/supply/shipping +/obj effect/mapping_helpers/airlock/access/all/supply/mail_sorting : /obj/effect/mapping_helpers/airlock/access/all/supply/shipping \ No newline at end of file