diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_inn.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_inn.dmm index 1ef9a5f56093..aa151f479613 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_inn.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_inn.dmm @@ -102,14 +102,14 @@ /area/ruin/powered/inn) "bi" = ( /obj/machinery/door/airlock/grunge{ - name = "Backroom"; - req_access_txt = "25" + name = "Backroom" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plasteel, /area/ruin/powered/inn) "bx" = ( @@ -223,7 +223,8 @@ id = "inndoor"; name = "Inn Front door Shutter"; pixel_x = 6; - pixel_y = -24 + pixel_y = -24; + req_access = list("bar") }, /turf/open/floor/wood/broken/two, /area/ruin/powered/inn) @@ -292,9 +293,7 @@ /turf/open/floor/wood, /area/ruin/powered/inn) "ka" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "25" - }, +/obj/machinery/door/airlock/external, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -302,6 +301,7 @@ dir = 8 }, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plasteel, /area/ruin/powered/inn) "kf" = ( @@ -374,13 +374,12 @@ /turf/open/floor/wood/broken/five, /area/ruin/powered/inn) "mW" = ( -/obj/machinery/door/window/southright{ - req_access_txt = "25" - }, +/obj/machinery/door/window/southright, /obj/machinery/light/small{ dir = 4 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/service/bar, /turf/open/floor/wood, /area/ruin/powered/inn) "nd" = ( @@ -476,15 +475,14 @@ /turf/open/floor/wood, /area/ruin/powered/inn) "qm" = ( -/obj/machinery/door/airlock/wood/glass{ - req_access_txt = "25" - }, +/obj/machinery/door/airlock/wood/glass, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plasteel/cafeteria, /area/ruin/powered/inn) "qq" = ( @@ -499,7 +497,7 @@ /area/ruin/powered/inn) "qT" = ( /obj/structure/closet/secure_closet/personal/cabinet{ - req_access = list(25) + req_access = list("bar") }, /obj/item/clothing/suit/hooded/wintercoat, /obj/item/tank/internals/emergency_oxygen, @@ -782,7 +780,7 @@ /obj/item/bedsheet/adjusted/brown, /obj/structure/bed, /obj/effect/mob_spawn/human/innkeeper{ - dir = 8 + dir = 4 }, /turf/open/floor/carpet/red, /area/ruin/powered/inn) @@ -861,7 +859,9 @@ /turf/open/floor/plasteel/white, /area/ruin/powered/inn) "Lb" = ( -/obj/structure/closet/secure_closet/freezer/meat, +/obj/structure/closet/secure_closet/freezer/meat{ + req_access = list("bar") + }, /turf/open/floor/plasteel/cafeteria, /area/ruin/powered/inn) "Ld" = ( @@ -879,8 +879,7 @@ /area/ruin/powered/inn/shed) "LE" = ( /obj/machinery/door/airlock/wood{ - name = "Personal Quarters"; - req_access_txt = "25" + name = "Personal Quarters" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -888,10 +887,13 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/carpet/red, /area/ruin/powered/inn) "LU" = ( -/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/structure/closet/secure_closet/freezer/kitchen{ + req_access = list("bar") + }, /obj/machinery/light{ dir = 8 }, @@ -1090,9 +1092,7 @@ /turf/open/floor/plating, /area/icemoon/underground/explored) "Xs" = ( -/obj/machinery/door/airlock/wood{ - req_access_txt = "25" - }, +/obj/machinery/door/airlock/wood, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -1102,6 +1102,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/wood, /area/ruin/powered/inn) "XK" = ( @@ -1129,7 +1130,9 @@ /turf/open/floor/wood, /area/ruin/powered/inn) "YJ" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/freezer/fridge{ + req_access = list("bar") + }, /turf/open/floor/plasteel/cafeteria, /area/ruin/powered/inn) "YV" = ( diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm index b0767b732f5d..df208041c55c 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm @@ -1,11 +1,12 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/obj/machinery/power/apc/auto_name/south{ - pixel_y = -23 - }, /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/power/apc/syndicate{ + name = "Power Station APC"; + pixel_y = -23 + }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/reactor) "ab" = ( @@ -213,7 +214,7 @@ id = "icemoon_syndicate_canteen_windows"; name = "Canteen Shutters"; pixel_y = 24; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/machinery/oven, /turf/open/floor/plasteel/cafeteria, @@ -279,8 +280,7 @@ /area/ruin/syndicate_icemoon/xenobio) "bP" = ( /obj/machinery/door/airlock/hatch{ - name = "Equipment Room"; - req_access_txt = "150" + name = "Equipment Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -289,6 +289,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/secred/filled/end/lower, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/security) "bQ" = ( @@ -355,8 +356,7 @@ /area/ruin/syndicate_icemoon/command) "cl" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Command Wing"; - req_access_txt = "150" + name = "Command Wing" }, /obj/structure/cable{ icon_state = "1-2" @@ -373,6 +373,7 @@ /obj/effect/turf_decal/siding/red{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/mineral/plastitanium, /area/ruin/syndicate_icemoon/command) "cn" = ( @@ -505,10 +506,6 @@ /area/ruin/syndicate_icemoon/canteen) "cN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/reactor) "cQ" = ( @@ -542,9 +539,6 @@ dir = 10 }, /obj/item/storage/fancy/donut_box, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/research) "cV" = ( @@ -563,8 +557,7 @@ "cW" = ( /obj/structure/fans/tiny, /obj/machinery/door/airlock/external{ - name = "Nuclear Power Station"; - req_access_txt = "150" + name = "Nuclear Power Station" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/structure/cable{ @@ -576,12 +569,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/reactor) "cZ" = ( @@ -676,13 +664,13 @@ /area/ruin/syndicate_icemoon/engine) "dq" = ( /obj/structure/cable, -/obj/machinery/power/apc/auto_name/south{ - pixel_y = -23; - req_access = list(150) - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, +/obj/machinery/power/apc/syndicate{ + name = "Central Hallway APC"; + pixel_y = -23 + }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/hallway) "dt" = ( @@ -715,8 +703,7 @@ /area/ruin/syndicate_icemoon/engine) "dz" = ( /obj/machinery/door/airlock/research/glass{ - name = "Xenobiology"; - req_access_txt = "150" + name = "Xenobiology" }, /obj/structure/cable{ icon_state = "4-8" @@ -737,13 +724,10 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/xenobio) "dB" = ( -/obj/machinery/power/apc/auto_name/west{ - pixel_x = -25; - req_access = list(150) - }, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, @@ -757,6 +741,10 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/syndicate{ + name = "Warehouse APC"; + pixel_x = -25 + }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/warehouse) "dF" = ( @@ -769,8 +757,7 @@ /area/icemoon/surface/outdoors) "dI" = ( /obj/machinery/door/airlock/engineering{ - name = "Fuel Storage"; - req_access_txt = "150" + name = "Fuel Storage" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -778,6 +765,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/reactor) "dK" = ( @@ -1115,8 +1103,7 @@ /area/ruin/syndicate_icemoon/warehouse) "fA" = ( /obj/machinery/door/airlock{ - name = "Cabin 4"; - req_access_txt = "150" + name = "Cabin 4" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -1312,8 +1299,7 @@ /area/ruin/syndicate_icemoon/warehouse) "gH" = ( /obj/machinery/door/airlock/engineering{ - name = "Power Storage and Radiation Response Equipment"; - req_access_txt = "150" + name = "Power Storage and Radiation Response Equipment" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -1327,6 +1313,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/engine) "gK" = ( @@ -1449,9 +1436,6 @@ /area/ruin/syndicate_icemoon/warehouse) "ht" = ( /obj/structure/window/reinforced/spawner/north, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /turf/open/floor/engine, /area/ruin/syndicate_icemoon/xenobio) "hu" = ( @@ -1465,9 +1449,6 @@ "hv" = ( /obj/effect/turf_decal/trimline/purple/filled/line/lower, /obj/structure/filingcabinet, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, /obj/structure/window/reinforced/spawner/east, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/research) @@ -1541,8 +1522,7 @@ /area/ruin/syndicate_icemoon/hallway) "ib" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Primary Treatment Centre"; - req_access_txt = "150" + name = "Primary Treatment Centre" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -1560,6 +1540,7 @@ dir = 1 }, /obj/effect/turf_decal/siding/blue, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/white, /area/ruin/syndicate_icemoon/medical) "im" = ( @@ -1667,8 +1648,7 @@ /area/ruin/syndicate_icemoon/canteen) "jd" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Commander's Quarters"; - req_access_txt = "151" + name = "Commander's Quarters" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -1682,6 +1662,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/leader, /turf/open/floor/carpet/red, /area/ruin/syndicate_icemoon/command) "ji" = ( @@ -1689,9 +1670,7 @@ /turf/open/floor/engine, /area/ruin/syndicate_icemoon/reactor) "jp" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/maintenance_hatch, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ icon_state = "1-2" @@ -1701,6 +1680,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/maintenance) "jr" = ( @@ -1745,8 +1726,7 @@ /area/ruin/syndicate_icemoon/command) "jL" = ( /obj/machinery/door/airlock/hatch{ - name = "Security"; - req_access_txt = "150" + name = "Security" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -1754,6 +1734,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/security) "jM" = ( @@ -1764,19 +1745,14 @@ /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/hallway) "jN" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/hallway) "jP" = ( @@ -1797,11 +1773,10 @@ /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/hallway) "kg" = ( -/obj/machinery/computer/reactor/syndie_base, -/obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 1 +/obj/machinery/computer/reactor/syndie_base{ + pixel_y = 7 }, +/obj/structure/table/reinforced, /obj/item/paper/guides/jobs/engi/agcnr, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/reactor) @@ -1869,10 +1844,9 @@ /turf/open/floor/plating, /area/ruin/syndicate_icemoon/engine) "kG" = ( -/obj/machinery/door/airlock/external/glass{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external/glass, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/xenobio) "kH" = ( @@ -2004,8 +1978,7 @@ /area/ruin/syndicate_icemoon/hallway) "ll" = ( /obj/machinery/door/airlock/research{ - name = "Research Wing"; - req_access_txt = "150" + name = "Research Wing" }, /obj/structure/cable{ icon_state = "4-8" @@ -2026,6 +1999,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/research) "ln" = ( @@ -2129,12 +2103,9 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/auto_name/south{ - pixel_y = -23; - req_access = list(150) - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/machinery/power/apc/syndicate{ + name = "Research Wing APC"; + pixel_y = -23 }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/research) @@ -2204,8 +2175,7 @@ /obj/structure/table/glass, /obj/machinery/door/window/northleft{ dir = 2; - name = "First-Aid Supplies"; - req_access_txt = "150" + name = "First-Aid Supplies" }, /obj/item/storage/firstaid/regular, /obj/item/storage/firstaid/regular{ @@ -2216,6 +2186,7 @@ pixel_x = -3; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general, /turf/open/floor/plasteel/white, /area/ruin/syndicate_icemoon/medical) "lR" = ( @@ -2270,7 +2241,7 @@ /area/ruin/syndicate_icemoon/command) "mc" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = list(150) + req_access = list("syndicate") }, /obj/effect/spawner/lootdrop/donkpockets, /obj/effect/spawner/lootdrop/donkpockets, @@ -2315,7 +2286,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/closet/crate/secure/gear{ - req_access_txt = "150" + req_access = list("syndicate") }, /obj/effect/turf_decal/box/white/corners{ dir = 4 @@ -2353,14 +2324,15 @@ /obj/item/paper_bin, /obj/structure/table/reinforced, /obj/item/pen, -/obj/machinery/door/window/brigdoor/northleft{ - req_access_txt = "151" - }, +/obj/machinery/door/window/brigdoor/northleft, /obj/machinery/door/window, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/leader{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/command) "mm" = ( @@ -2411,8 +2383,7 @@ /area/ruin/syndicate_icemoon/reactor) "mu" = ( /obj/machinery/door/airlock/external{ - name = "Nuclear Power Station Access"; - req_access_txt = "150" + name = "Nuclear Power Station Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -2432,6 +2403,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/engine) "mv" = ( @@ -2512,10 +2484,6 @@ /turf/open/floor/wood, /area/ruin/syndicate_icemoon/canteen) "nf" = ( -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23; - req_access = list(150) - }, /obj/effect/turf_decal/siding/wood{ dir = 5 }, @@ -2523,6 +2491,10 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/machinery/power/apc/syndicate{ + name = "Command APC"; + pixel_y = 23 + }, /turf/open/floor/wood, /area/ruin/syndicate_icemoon/command) "nj" = ( @@ -2541,18 +2513,18 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/research{ - name = "Chemistry"; - req_access_txt = "150" + name = "Chemistry" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/white, /area/ruin/syndicate_icemoon/research) "np" = ( /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = list(150) + req_access = list("syndicate") }, /obj/item/storage/box/ingredients/american, /obj/item/storage/box/ingredients/delights, @@ -2568,8 +2540,7 @@ /area/ruin/syndicate_icemoon/canteen) "nt" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Commander's Office"; - req_access_txt = "151" + name = "Commander's Office" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -2592,6 +2563,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/leader, /turf/open/floor/wood, /area/ruin/syndicate_icemoon/command) "nz" = ( @@ -2627,10 +2599,6 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) "nL" = ( -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23; - req_access = list(150) - }, /obj/structure/cable{ icon_state = "0-4" }, @@ -2648,12 +2616,16 @@ /obj/item/stack/sheet/glass{ amount = 10 }, +/obj/machinery/power/apc/syndicate{ + name = "Security Wing APC"; + pixel_y = 23 + }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/security) "nN" = ( /obj/machinery/ministile{ - req_one_access = list(151); - dir = 4 + dir = 4; + req_access = list("syndicate_leader") }, /obj/effect/turf_decal/trimline/white/arrow_ccw{ dir = 1 @@ -2692,8 +2664,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/east{ - req_access = list(150) +/obj/machinery/power/apc/syndicate{ + name = "Engineering Wing APC"; + pixel_x = 25 }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/engine) @@ -2741,8 +2714,7 @@ /area/ruin/syndicate_icemoon/hallway) "oD" = ( /obj/machinery/door/airlock{ - name = "Cabin 1"; - req_access_txt = "150" + name = "Cabin 1" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -2757,8 +2729,7 @@ icon_state = "4-8" }, /obj/machinery/door/window/eastright{ - name = "Kitchen"; - req_access_txt = "150" + name = "Kitchen" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -2767,6 +2738,9 @@ dir = 8 }, /obj/effect/turf_decal/siding/wood/corner/thin, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 4 + }, /turf/open/floor/plasteel/cafeteria, /area/ruin/syndicate_icemoon/canteen) "oI" = ( @@ -2805,7 +2779,9 @@ dir = 8 }, /obj/machinery/door/window{ - req_access_txt = "150"; + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ dir = 8 }, /turf/open/floor/engine, @@ -2814,10 +2790,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -26 - }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/security) "pd" = ( @@ -2914,17 +2886,13 @@ /obj/structure/closet/crate/secure/gear{ desc = "A secure gear crate. A faded note on it reads 'CHAIR NOT INCLUDED'."; name = "electric chair kit crate"; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/item/screwdriver/nuke, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -26 - }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/security) "pC" = ( @@ -3066,8 +3034,7 @@ /area/ruin/syndicate_icemoon/research) "qo" = ( /obj/machinery/door/airlock/medical{ - name = "Operating Room"; - req_access_txt = "150" + name = "Operating Room" }, /obj/machinery/holosign/surgery{ id = "syndie_icemoon_surgery_holo" @@ -3088,6 +3055,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/white, /area/ruin/syndicate_icemoon/medical) "qq" = ( @@ -3250,8 +3218,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/external{ - name = "Nuclear Power Station Access"; - req_access_txt = "150" + name = "Nuclear Power Station Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -3259,12 +3226,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/engine) "re" = ( @@ -3518,8 +3480,7 @@ /area/ruin/syndicate_icemoon/xenobio) "su" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Control Room"; - req_access_txt = "150" + name = "Control Room" }, /obj/structure/cable{ icon_state = "1-2" @@ -3530,6 +3491,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/mineral/plastitanium, /area/ruin/syndicate_icemoon/command) "sw" = ( @@ -3670,7 +3632,9 @@ dir = 4 }, /obj/machinery/door/window{ - req_access_txt = "150"; + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ dir = 4 }, /turf/open/floor/engine, @@ -3714,11 +3678,6 @@ /obj/structure/chair/office/dark{ dir = 1 }, -/obj/item/radio/intercom{ - freerange = 1; - name = "Syndicate Radio Intercom"; - pixel_y = 24 - }, /turf/open/floor/carpet/red, /area/ruin/syndicate_icemoon/command) "tU" = ( @@ -3762,7 +3721,7 @@ /area/ruin/syndicate_icemoon/hallway) "ub" = ( /obj/structure/closet/crate/secure/weapon{ - req_access_txt = "150" + req_access = list("syndicate") }, /obj/item/ammo_box/c10mm{ pixel_y = 6 @@ -3809,13 +3768,6 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) -"ug" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ruin/syndicate_icemoon/reactor) "ul" = ( /turf/open/floor/plating/snowed/smoothed/icemoon, /area/ruin/syndicate_icemoon/canteen) @@ -3849,13 +3801,13 @@ /area/ruin/syndicate_icemoon/command) "uG" = ( /obj/machinery/deepfryer, -/obj/machinery/power/apc/auto_name/south{ - pixel_y = -23; - req_access = list(150) - }, /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/power/apc/syndicate{ + name = "Canteen APC"; + pixel_y = -23 + }, /turf/open/floor/plasteel/cafeteria, /area/ruin/syndicate_icemoon/canteen) "uS" = ( @@ -3868,9 +3820,6 @@ /area/ruin/syndicate_icemoon/hallway) "uV" = ( /obj/structure/window/reinforced/spawner/north, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /obj/machinery/light{ dir = 4 }, @@ -4003,15 +3952,14 @@ /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/hallway) "vE" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/abandoned, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/ruin/syndicate_icemoon/maintenance) "vG" = ( @@ -4043,7 +3991,7 @@ /area/ruin/syndicate_icemoon/medical) "vR" = ( /obj/structure/closet/crate/secure/gear{ - req_access_txt = "151"; + req_access = list("syndicate"); desc = "An old, dusty crate." }, /obj/item/clothing/gloves/color/captain/centcom/admiral{ @@ -4142,8 +4090,7 @@ /area/ruin/syndicate_icemoon/medical) "wn" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medical Bay"; - req_access_txt = "150" + name = "Medical Bay" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -4157,6 +4104,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/white, /area/ruin/syndicate_icemoon/medical) "wp" = ( @@ -4190,9 +4138,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/reactor) "wz" = ( -/obj/machinery/door/airlock/hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/hatch, /obj/structure/fans/tiny, /obj/effect/turf_decal/weather/snow/corner{ dir = 4 @@ -4206,12 +4152,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/shed) "wA" = ( @@ -4264,7 +4205,8 @@ /obj/machinery/button/door{ id = "syndie_icemoon_warehouse"; name = "Warehouse Shutters"; - pixel_y = -24 + pixel_y = -24; + req_access = list("syndicate") }, /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -4372,7 +4314,9 @@ }, /obj/machinery/light, /obj/machinery/door/window{ - req_access_txt = "150"; + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ dir = 4 }, /turf/open/floor/engine, @@ -4461,7 +4405,7 @@ /obj/machinery/button/door{ id = "syndieicemoon_sci_shutters"; name = "Window Shutters"; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/white, @@ -4544,12 +4488,6 @@ "xV" = ( /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, /turf/open/floor/engine, /area/ruin/syndicate_icemoon/xenobio) "xW" = ( @@ -4557,8 +4495,7 @@ id = "syndieicemoon_brig_cell" }, /obj/machinery/door/airlock/hatch{ - name = "Cell"; - req_access_txt = "150" + name = "Cell" }, /obj/structure/cable{ icon_state = "1-2" @@ -4574,14 +4511,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/security) "xY" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/research) "ya" = ( @@ -4639,7 +4574,7 @@ name = "Vault Bolt Control"; normaldoorcontrol = 1; pixel_y = -24; - req_access_txt = "151"; + req_access = list("syndicate_leader"); specialfunctions = 4; pixel_x = 6 }, @@ -4657,7 +4592,7 @@ id = "syndicate_icemoon_bridge_windows"; name = "Window Shutters"; pixel_y = -24; - req_access_txt = "150"; + req_access = list("syndicate_leader"); specialfunctions = 4; pixel_x = -6 }, @@ -4746,8 +4681,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/hatch{ - name = "Electric Chair"; - req_access_txt = "150" + name = "Electric Chair" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -4756,6 +4690,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/secred/filled/end/lower, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/security) "zm" = ( @@ -4771,8 +4706,7 @@ lethal = 1; name = "base turret controls"; pixel_y = -24; - req_access = null; - req_access_txt = "150" + req_access = list("syndicate") }, /turf/open/floor/mineral/plastitanium, /area/ruin/syndicate_icemoon/command) @@ -4920,8 +4854,7 @@ "zW" = ( /obj/machinery/door/airlock/vault{ id_tag = "syndicate_icemoon_vault"; - name = "Vault"; - req_access_txt = "151" + name = "Vault" }, /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -4930,6 +4863,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/leader, /turf/open/floor/mineral/plastitanium, /area/ruin/syndicate_icemoon/command) "zX" = ( @@ -4987,8 +4921,7 @@ "Af" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/machinery/door/airlock/medical/glass{ - name = "Primary Treatment Centre"; - req_access_txt = "150" + name = "Primary Treatment Centre" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -5002,6 +4935,7 @@ /obj/effect/turf_decal/siding/blue{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/white, /area/ruin/syndicate_icemoon/medical) "Ag" = ( @@ -5042,7 +4976,7 @@ "AG" = ( /obj/machinery/vending/toyliberationstation{ onstation = 0; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 4 @@ -5097,7 +5031,8 @@ /obj/machinery/button/door{ id = "syndie_icemoon_warehouse"; name = "Warehouse Shutters"; - pixel_y = 24 + pixel_y = 24; + req_access = list("syndicate") }, /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -5121,7 +5056,7 @@ /obj/machinery/button/door{ id = "syndicate_icemoon_reactor_access"; name = "Reactor Access"; - req_access_txt = "150" + req_access = list("syndicate") }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/reactor) @@ -5196,7 +5131,7 @@ "Bt" = ( /obj/machinery/button/door{ id = "syndieicemoon_observatory_shutters"; - req_access_txt = "150"; + req_access = list("syndicate"); name = "Observatory Shutters"; pixel_x = -24 }, @@ -5379,8 +5314,7 @@ /area/ruin/syndicate_icemoon/dorms) "Cl" = ( /obj/machinery/door/airlock{ - name = "Cabin 5"; - req_access_txt = "150" + name = "Cabin 5" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -5398,8 +5332,7 @@ /area/ruin/syndicate_icemoon/xenobio) "Cq" = ( /obj/machinery/door/airlock/hatch{ - name = "Security"; - req_access_txt = "150" + name = "Security" }, /obj/structure/cable{ icon_state = "1-2" @@ -5416,6 +5349,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/security) "Cz" = ( @@ -5430,8 +5364,7 @@ /obj/item/storage/box/beakers/bluespace, /obj/item/storage/box/beakers/bluespace, /obj/structure/closet/secure_closet/chemical{ - req_access = null; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/item/storage/box/syringes, /turf/open/floor/plasteel/white, @@ -5499,7 +5432,7 @@ department = "Unidentified"; desc = "Used to send black pages to Nanotrasen stations."; name = "Syndicate Fax Machine"; - req_one_access = list(150) + req_access = list("syndicate") }, /obj/item/stamp/chameleon{ pixel_x = -6; @@ -5584,11 +5517,11 @@ /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/reactor) "Db" = ( -/obj/machinery/power/apc/auto_name/west{ +/obj/structure/cable, +/obj/machinery/power/apc/syndicate{ pixel_x = -25; - req_access = list(150) + name = "Shed APC" }, -/obj/structure/cable, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/shed) "De" = ( @@ -5662,8 +5595,13 @@ "Dq" = ( /obj/structure/table/reinforced, /obj/item/phone/real/syndicate_ruin{ - pixel_x = 4; - pixel_y = 5 + pixel_x = 17; + pixel_y = 7 + }, +/obj/item/radio/intercom{ + freerange = 1; + name = "Syndicate Radio Intercom"; + pixel_y = -4 }, /turf/open/floor/carpet/red, /area/ruin/syndicate_icemoon/command) @@ -5684,8 +5622,7 @@ /area/ruin/syndicate_icemoon/canteen) "Dx" = ( /obj/machinery/door/airlock/engineering{ - name = "Fuel Storage"; - req_access_txt = "150" + name = "Fuel Storage" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -5699,6 +5636,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/reactor) "Dy" = ( @@ -5712,9 +5650,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/hallway) "Dz" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/abandoned, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only{ @@ -5723,11 +5659,11 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/maintenance) "DA" = ( /obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "150"; name = "Laundry" }, /obj/machinery/door/firedoor/border_only{ @@ -5736,6 +5672,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/dorms) "DB" = ( @@ -5743,7 +5680,7 @@ dir = 1 }, /obj/structure/closet/crate/secure/gear{ - req_access_txt = "150" + req_access = list("syndicate") }, /obj/item/clothing/gloves/combat, /obj/item/clothing/gloves/combat, @@ -5886,7 +5823,6 @@ /area/ruin/syndicate_icemoon/canteen) "Ev" = ( /obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "150"; name = "Construction Area" }, /obj/effect/decal/cleanable/dirt, @@ -5897,6 +5833,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/maintenance) "Ey" = ( @@ -5951,10 +5888,7 @@ /obj/machinery/button/door{ id = "syndieicemoon_sci_shutters"; name = "Window Shutters"; - req_access_txt = "150" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 + req_access = list("syndicate") }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/research) @@ -6048,8 +5982,7 @@ /area/ruin/syndicate_icemoon/command) "Fi" = ( /obj/machinery/door/airlock/research{ - name = "Research Wing"; - req_access_txt = "150" + name = "Research Wing" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -6066,6 +5999,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/research) "Fm" = ( @@ -6142,9 +6076,7 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) "FN" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -6163,6 +6095,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/hallway) "FP" = ( @@ -6216,8 +6149,8 @@ dir = 8 }, /obj/machinery/ministile{ - req_one_access = list(151); - dir = 4 + dir = 4; + req_access = list("syndicate_leader") }, /obj/effect/turf_decal/trimline/white/arrow_ccw{ dir = 1 @@ -6265,6 +6198,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/warehouse) "Gj" = ( @@ -6277,10 +6211,6 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/auto_name/west{ - pixel_x = -25; - req_access = list(150) - }, /obj/structure/closet/crate, /obj/item/paper{ info = "Due to several incidents of dumbasses tripping into plasma rivers, we have stocked plasmaman survival supplies. Not that you'll be able to get them alive anyway." @@ -6293,6 +6223,10 @@ /obj/item/tank/internals/plasmaman/belt/full, /obj/item/tank/internals/plasmaman/full, /obj/item/tank/internals/plasmaman/full, +/obj/machinery/power/apc/syndicate{ + name = "Medical Wing APC"; + pixel_x = -25 + }, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/medical) "Gp" = ( @@ -6547,8 +6481,7 @@ /area/ruin/syndicate_icemoon/warehouse) "HX" = ( /obj/machinery/door/airlock/external{ - name = "Nuclear Power Station"; - req_access_txt = "150" + name = "Nuclear Power Station" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -6562,6 +6495,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/reactor) "HZ" = ( @@ -6582,7 +6516,6 @@ /area/ruin/syndicate_icemoon/canteen) "Ig" = ( /obj/machinery/door/airlock/hatch{ - req_access_txt = "150"; name = "Moat Observatory" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -6597,6 +6530,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/hallway) "Il" = ( @@ -6666,9 +6600,7 @@ /obj/machinery/shower{ dir = 4 }, -/obj/machinery/door/window/eastright{ - req_access_txt = "150" - }, +/obj/machinery/door/window/eastright, /obj/structure/window/reinforced, /obj/item/soap/syndie, /turf/open/floor/plasteel/showroomfloor, @@ -6837,8 +6769,7 @@ /area/ruin/syndicate_icemoon/shed) "JJ" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medical Bay"; - req_access_txt = "150" + name = "Medical Bay" }, /obj/structure/cable{ icon_state = "4-8" @@ -6849,6 +6780,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/white, /area/ruin/syndicate_icemoon/medical) "JK" = ( @@ -6912,7 +6844,7 @@ /area/ruin/syndicate_icemoon/hallway) "JZ" = ( /obj/structure/closet/secure_closet/freezer/meat{ - req_access = list(150) + req_access = list("syndicate") }, /obj/machinery/light/small, /turf/open/floor/plating/snowed/smoothed/icemoon, @@ -6978,7 +6910,6 @@ id = "syndie_icemoon_surgery_holo"; name = "Surgery Holosign"; pixel_x = 24; - req_access_txt = "150"; pixel_y = -3 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -6992,7 +6923,7 @@ name = "Window Shutters"; pixel_x = 24; pixel_y = 6; - req_access_txt = "150" + req_access = list("syndicate") }, /turf/open/floor/plasteel/white, /area/ruin/syndicate_icemoon/medical) @@ -7057,10 +6988,6 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23; - req_access = list(150) - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, @@ -7074,6 +7001,10 @@ pixel_x = 13; pixel_y = 23 }, +/obj/machinery/power/apc/syndicate{ + name = "Crew Quarters APC"; + pixel_y = 23 + }, /turf/open/floor/wood, /area/ruin/syndicate_icemoon/dorms) "KY" = ( @@ -7163,9 +7094,7 @@ /area/ruin/syndicate_icemoon/medical) "LM" = ( /obj/structure/fans/tiny, -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -7187,6 +7116,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/hallway) "LP" = ( @@ -7205,10 +7135,6 @@ /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/security) "LT" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/dark, @@ -7226,8 +7152,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance_hatch{ - name = "Medical Support Systems"; - req_access_txt = "150" + name = "Medical Support Systems" }, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 @@ -7244,6 +7169,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/medical) "LZ" = ( @@ -7313,8 +7239,7 @@ /area/ruin/syndicate_icemoon/dorms) "MB" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_access_txt = "150" + name = "Engineering" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -7331,6 +7256,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/engine) "MF" = ( @@ -7362,9 +7288,7 @@ /area/ruin/syndicate_icemoon/hallway) "Ng" = ( /obj/structure/fans/tiny, -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, @@ -7374,10 +7298,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/hallway) "Nj" = ( @@ -7386,12 +7307,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/research) "Nk" = ( @@ -7403,7 +7318,7 @@ id = "syndicate_icemoon_dorms_window"; name = "Window Shutters"; pixel_y = -24; - req_access_txt = "150"; + req_access = list("syndicate"); pixel_x = -6 }, /obj/effect/turf_decal/siding/wood, @@ -7637,14 +7552,13 @@ /area/icemoon/surface/outdoors) "OA" = ( /obj/structure/closet/secure_closet/medical1{ - req_access = null; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/item/gun/syringe/rapidsyringe, /obj/item/storage/firstaid/hypospray/syndicate, /obj/item/clothing/glasses/hud/health, /obj/item/storage/lockbox/vialbox/hypo_deluxe{ - req_access = list(150) + req_access = list("syndicate") }, /obj/effect/turf_decal/siding/blue{ dir = 10 @@ -7664,13 +7578,13 @@ /area/ruin/syndicate_icemoon/medical) "OK" = ( /obj/machinery/door/airlock/hatch{ - name = "Security"; - req_access_txt = "150" + name = "Security" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/security) "OL" = ( @@ -7723,8 +7637,7 @@ /area/icemoon/surface/outdoors) "Pf" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_access_txt = "150" + name = "Engineering" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -7732,6 +7645,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/engine) "Pj" = ( @@ -7739,8 +7653,7 @@ dir = 8 }, /obj/machinery/door/airlock/hatch{ - name = "Cold Room"; - req_access_txt = "150" + name = "Cold Room" }, /obj/structure/fans/tiny, /obj/machinery/door/firedoor/border_only{ @@ -7752,6 +7665,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/wood, /area/ruin/syndicate_icemoon/canteen) "Pm" = ( @@ -7817,7 +7731,7 @@ name = "Vault Bolt Control"; normaldoorcontrol = 1; pixel_y = 24; - req_access_txt = "151"; + req_access = list("syndicate_leader"); specialfunctions = 4 }, /turf/open/floor/circuit/red/anim, @@ -7905,8 +7819,7 @@ /area/icemoon/surface/outdoors) "Qm" = ( /obj/machinery/door/airlock/hatch{ - name = "Storage Room"; - req_access_txt = "150" + name = "Storage Room" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -7918,6 +7831,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/wood, /area/ruin/syndicate_icemoon/canteen) "Qn" = ( @@ -8036,7 +7950,7 @@ info = "Please be advised that the firing pins in your standard-issue SMG and the research team's rifles are designed to explode if removed. DO NOT TRY TO REMOVE THEM." }, /obj/structure/closet/crate/secure/weapon{ - req_access_txt = "150" + req_access = list("syndicate") }, /obj/effect/turf_decal/box/white, /obj/item/gun/ballistic/shotgun/doublebarrel, @@ -8056,9 +7970,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/maintenance_hatch, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -8066,6 +7978,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/maintenance) "Rh" = ( @@ -8147,12 +8060,6 @@ "Rz" = ( /obj/structure/window/reinforced/spawner/west, /obj/structure/window/reinforced/spawner/north, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /turf/open/floor/engine, /area/ruin/syndicate_icemoon/xenobio) "RA" = ( @@ -8266,12 +8173,14 @@ "Sj" = ( /obj/machinery/door/window/eastright{ name = "Bar"; - req_access_txt = "150"; dir = 1 }, /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 1 + }, /turf/open/floor/wood, /area/ruin/syndicate_icemoon/canteen) "Sl" = ( @@ -8395,13 +8304,13 @@ /area/icemoon/surface/outdoors) "SG" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/auto_name/south{ - pixel_y = -23; - req_access = list(150) - }, /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/power/apc/syndicate{ + name = "Maintenance APC"; + pixel_y = -23 + }, /turf/open/floor/plasteel, /area/ruin/syndicate_icemoon/maintenance) "SK" = ( @@ -8426,8 +8335,7 @@ /area/ruin/syndicate_icemoon/dorms) "SS" = ( /obj/machinery/door/airlock/hatch{ - name = "Storage Room"; - req_access_txt = "150" + name = "Storage Room" }, /obj/structure/fans/tiny, /obj/structure/cable{ @@ -8439,6 +8347,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/cafeteria, /area/ruin/syndicate_icemoon/canteen) "SU" = ( @@ -8505,9 +8414,6 @@ /area/ruin/syndicate_icemoon/engine) "Te" = ( /obj/structure/window/reinforced/spawner/north, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /mob/living/simple_animal/slime, /turf/open/floor/engine, /area/ruin/syndicate_icemoon/xenobio) @@ -8639,8 +8545,7 @@ /area/ruin/syndicate_icemoon/command) "TQ" = ( /obj/machinery/door/airlock{ - name = "Cabin 2"; - req_access_txt = "150" + name = "Cabin 2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -8747,10 +8652,6 @@ /obj/effect/turf_decal/stripes{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 26 - }, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -8856,7 +8757,7 @@ id = "syndicate_icemoon_hop_shutters"; name = "Window Shutters"; pixel_y = -24; - req_access_txt = "150"; + req_access = list("syndicate"); specialfunctions = 4; pixel_x = -6 }, @@ -9017,12 +8918,6 @@ }, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/research) "Wh" = ( @@ -9125,7 +9020,7 @@ id = "syndicate_icemoon_powerstation_windows"; name = "Window Shutters"; pixel_x = 24; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -9147,11 +9042,14 @@ /obj/machinery/button/door{ id = "syndicate_icemoon_reactor_vent"; name = "Reactor Vent"; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/item/sealant{ pixel_x = 12 }, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/reactor) "WK" = ( @@ -9313,10 +9211,6 @@ /area/ruin/syndicate_icemoon/hallway) "XS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -9369,9 +9263,9 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23; - req_access = list(150) +/obj/machinery/power/apc/syndicate{ + name = "Xenobiology Wing APC"; + pixel_y = 23 }, /turf/open/floor/plasteel/dark, /area/ruin/syndicate_icemoon/xenobio) @@ -9462,7 +9356,7 @@ id = "syndieicemoon_brig_cell"; name = "Cell Lockdown"; pixel_x = 24; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 6 @@ -9491,9 +9385,7 @@ /turf/closed/wall/mineral/plastitanium, /area/ruin/syndicate_icemoon/engine) "YH" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/structure/fans/tiny, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -9501,6 +9393,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/syndicate_icemoon/engine) "YI" = ( @@ -9531,8 +9424,7 @@ /area/ruin/syndicate_icemoon/canteen) "YZ" = ( /obj/machinery/door/airlock{ - name = "Cabin 3"; - req_access_txt = "150" + name = "Cabin 3" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -10834,7 +10726,7 @@ Ez IS wx oI -ug +Ag gU xP NP diff --git a/_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm b/_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm index 78cd5eacf7b8..0c50926ed1a6 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm @@ -351,13 +351,12 @@ /turf/open/floor/carpet/red, /area/ruin/powered/sinden) "tW" = ( -/obj/machinery/door/airlock/wood{ - req_access_txt = "25" - }, +/obj/machinery/door/airlock/wood, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/wood, /area/ruin/powered/sinden) "tZ" = ( @@ -417,15 +416,14 @@ /turf/open/floor/plating, /area/ruin/powered/sinden) "xT" = ( -/obj/machinery/door/airlock/wood{ - req_access_txt = "25" - }, +/obj/machinery/door/airlock/wood, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plating, /area/ruin/powered/sinden) "zw" = ( @@ -544,7 +542,7 @@ /area/ruin/powered/sinden) "HD" = ( /obj/structure/closet/secure_closet/personal/cabinet{ - req_access = list(25) + req_access = list("bar") }, /obj/item/storage/firstaid/regular, /obj/item/stack/spacecash/c200, @@ -596,15 +594,14 @@ /turf/open/floor/mineral/titanium, /area/ruin/powered/sinden) "Ln" = ( -/obj/machinery/door/airlock/wood{ - req_access_txt = "25" - }, +/obj/machinery/door/airlock/wood, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/carpet/black, /area/ruin/powered/sinden) "LL" = ( @@ -628,15 +625,14 @@ /turf/open/floor/wood, /area/ruin/powered/sinden) "Nb" = ( -/obj/machinery/door/airlock/wood{ - req_access_txt = "25" - }, +/obj/machinery/door/airlock/wood, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/wood, /area/ruin/powered/sinden) "Nr" = ( @@ -766,9 +762,8 @@ /turf/open/floor/carpet/green, /area/ruin/powered/sinden) "Va" = ( -/obj/machinery/door/airlock/wood{ - req_access_txt = "25" - }, +/obj/machinery/door/airlock/wood, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/wood, /area/ruin/powered/sinden) "Wd" = ( diff --git a/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm b/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm index e4f84e8a9721..6fb04d361293 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm @@ -641,9 +641,9 @@ "fU" = ( /obj/machinery/door/window/brigdoor/westleft{ dir = 2; - name = "Disposals Conveyor"; - req_access_txt = "150" + name = "Disposals Conveyor" }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "gb" = ( @@ -724,14 +724,14 @@ id = "lavalandsyndi_telecomms"; name = "Telecomms Blast Door Control"; pixel_y = 36; - req_access_txt = "150"; + req_access = list("syndicate"); pixel_x = -6 }, /obj/machinery/button/door{ id = "lavalandsyndi_centralwindows"; name = "Exterior Windows Blast Door Control"; pixel_y = 36; - req_access_txt = "150"; + req_access = list("syndicate"); pixel_x = 6 }, /obj/item/radio/intercom{ @@ -901,7 +901,7 @@ "ja" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/closet/crate/secure/weapon{ - req_access_txt = "150" + req_access = list("syndicate") }, /obj/item/ammo_box/c10mm{ pixel_y = 6 @@ -972,15 +972,14 @@ /turf/open/floor/engine/o2, /area/ruin/powered/syndicate_lava_base/engineering) "jo" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/cargo) "jt" = ( @@ -1123,8 +1122,7 @@ /area/ruin/powered/syndicate_lava_base/bar) "kn" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Convincing Room"; - req_access_txt = "150" + name = "Convincing Room" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -1132,6 +1130,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/main) "ko" = ( @@ -1250,7 +1249,7 @@ dir = 4 }, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /turf/open/floor/plasteel/dark, @@ -1323,8 +1322,7 @@ /area/ruin/powered/syndicate_lava_base/dormitories) "mB" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay"; - req_access_txt = "150" + name = "Cargo Bay" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -1335,6 +1333,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "mF" = ( @@ -1376,8 +1375,7 @@ lethal = 1; name = "Base turret controls"; pixel_y = 30; - req_access = null; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/machinery/syndicatebomb/self_destruct{ anchored = 1 @@ -1526,8 +1524,7 @@ /area/ruin/powered/syndicate_lava_base/engineering) "nR" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_access_txt = "150" + name = "Engineering" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -1544,6 +1541,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/engineering) "nY" = ( @@ -1644,12 +1642,14 @@ id = "lavalandsyndi_bar"; name = "Bar Blast Door Control"; pixel_y = 26; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/machinery/door/window/northleft{ dir = 8; - name = "Bar"; - req_access_txt = "150" + name = "Bar" + }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 8 }, /turf/open/floor/plasteel, /area/ruin/powered/syndicate_lava_base/bar) @@ -1721,8 +1721,10 @@ /area/ruin/powered/syndicate_lava_base/engineering) "qc" = ( /obj/machinery/door/window/eastright{ - name = "Kitchen"; - req_access_txt = "150" + name = "Kitchen" + }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 4 }, /turf/open/floor/plasteel/cafeteria, /area/ruin/powered/syndicate_lava_base/bar) @@ -1799,6 +1801,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/medbay) "qv" = ( @@ -2025,8 +2028,7 @@ /area/ruin/powered/syndicate_lava_base/dormitories) "sb" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Warehouse"; - req_access_txt = "150" + name = "Warehouse" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -2034,6 +2036,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "sk" = ( @@ -2171,8 +2174,7 @@ "td" = ( /obj/machinery/door/airlock/vault{ id_tag = "syndie_lavaland_vault"; - name = "Vault Access"; - req_access_txt = "150" + name = "Vault Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -2187,6 +2189,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/vault) "tf" = ( @@ -2424,7 +2427,9 @@ /area/ruin/powered/syndicate_lava_base/vault) "wF" = ( /obj/effect/turf_decal/bot, -/obj/machinery/mineral/ore_redemption, +/obj/machinery/mineral/ore_redemption{ + req_access = list("syndicate") + }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "wI" = ( @@ -2534,13 +2539,12 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/powered/syndicate_lava_base/virology) "xN" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/structure/fans/tiny, /obj/machinery/door/poddoor/preopen{ id = "syndie_lavaland_exitdoors" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/main) "xS" = ( @@ -2567,7 +2571,7 @@ icon_state = "1-2" }, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, /turf/open/floor/plasteel/dark, @@ -2587,7 +2591,7 @@ id = "lavalandsyndi_cargo"; name = "Cargo Bay Blast Door Control"; pixel_x = 26; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/structure/chair/office/dark{ dir = 1 @@ -2635,15 +2639,14 @@ /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/engineering) "yV" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/main) "yY" = ( @@ -2789,8 +2792,7 @@ /area/ruin/powered/syndicate_lava_base/bar) "AJ" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_access_txt = "150" + name = "Cargo Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -2800,6 +2802,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "AQ" = ( @@ -2903,7 +2906,7 @@ /obj/item/ammo_casing/shotgun/syndie, /obj/item/ammo_casing/shotgun/syndie, /obj/item/storage/belt/bandolier, -/obj/item/clothing/under/rank/bartender, +/obj/item/clothing/under/rank/civilian/bartender, /obj/item/clothing/head/that, /obj/item/clothing/glasses/sunglasses/reagent, /turf/open/floor/wood, @@ -2964,8 +2967,7 @@ dir = 10 }, /obj/structure/closet/secure_closet/chemical{ - req_access = null; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/item/clothing/glasses/science, /obj/item/clothing/glasses/science, @@ -2977,7 +2979,7 @@ /area/ruin/powered/syndicate_lava_base/chemistry) "BL" = ( /obj/machinery/vending/toyliberationstation{ - req_access_txt = "150" + req_access = list("syndicate") }, /obj/effect/turf_decal/siding/brown/end{ dir = 4 @@ -3037,8 +3039,7 @@ /area/ruin/powered/syndicate_lava_base/cargo) "Ci" = ( /obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "150" + name = "Experimentation Lab" }, /obj/machinery/door/poddoor/preopen{ id = "lavalandsyndi"; @@ -3048,6 +3049,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/engine, /area/ruin/powered/syndicate_lava_base/chemistry) "Cl" = ( @@ -3059,8 +3061,7 @@ /area/ruin/powered/syndicate_lava_base/cargo) "Cn" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Telecommunications"; - req_access_txt = "150" + name = "Telecommunications" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -3080,6 +3081,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/telecomms) "CD" = ( @@ -3180,7 +3182,7 @@ id = "syndie_lavaland_exitdoors"; name = "Central External Airlock Blast Door Control"; pixel_y = -24; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/structure/safe/floor, /obj/item/reagent_containers/food/drinks/bottle/vodka, @@ -3397,7 +3399,7 @@ /area/ruin/powered/syndicate_lava_base/bar) "Ft" = ( /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = list(150) + req_access = list("syndicate") }, /obj/item/kitchen/knife/butcher, /obj/item/clothing/suit/apron/chef, @@ -3439,10 +3441,9 @@ /turf/open/floor/plasteel/grimy, /area/ruin/powered/syndicate_lava_base/dormitories) "FN" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/cargo) "FW" = ( @@ -3479,21 +3480,22 @@ /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/engineering) "Gq" = ( -/obj/effect/turf_decal/siding/green{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, +/obj/effect/turf_decal/siding/green/corner, +/obj/effect/turf_decal/siding/green/corner{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/virology) "Gs" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/closet/crate/secure/gear{ - req_access_txt = "150" + req_access = list("syndicate") }, /obj/item/clothing/gloves/combat, /obj/item/clothing/gloves/combat, @@ -3544,7 +3546,7 @@ id = "lavalandsyndi"; name = "Syndicate Experimentation Lockdown Control"; pixel_y = -26; - req_access_txt = "150" + req_access = list("syndicate") }, /turf/open/floor/engine, /area/ruin/powered/syndicate_lava_base/chemistry) @@ -3629,6 +3631,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/virology) "Hi" = ( @@ -3658,25 +3661,30 @@ dir = 4 }, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/engineering) "Hv" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Monkey Pen"; - req_access_txt = "150" + name = "Monkey Pen" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/grass, +/obj/effect/turf_decal/siding/green/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/green/corner{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/virology) "Hw" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Warehouse"; - req_access_txt = "150" + name = "Warehouse" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -3684,6 +3692,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "Hy" = ( @@ -4185,15 +4194,14 @@ /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "MH" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/main) "ML" = ( @@ -4230,6 +4238,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/bar) "MR" = ( @@ -4380,15 +4389,14 @@ /turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/jungleland/toxic_pit) "Oa" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/machinery/door/poddoor/preopen{ id = "lavalandsyndi"; name = "Syndicate Research Experimentation Shutters" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/chemistry) "Oe" = ( @@ -4431,8 +4439,7 @@ /area/ruin/powered/syndicate_lava_base/chemistry) "OD" = ( /obj/machinery/door/airlock{ - name = "Kitchen cold room"; - req_access_txt = "150" + name = "Kitchen cold room" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -4449,6 +4456,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/showroomfloor, /area/ruin/powered/syndicate_lava_base/bar) "OL" = ( @@ -4501,7 +4509,7 @@ /area/ruin/powered/syndicate_lava_base/bar) "Pk" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = list(150) + req_access = list("syndicate") }, /obj/effect/spawner/lootdrop/donkpockets, /obj/item/storage/box/ingredients/vegetarian, @@ -4615,6 +4623,16 @@ }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/virology) +"Qm" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ruin/powered/syndicate_lava_base/main) "Qp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -4784,8 +4802,10 @@ "Sb" = ( /obj/machinery/door/window/brigdoor{ dir = 1; - name = "Isolation Pen"; - req_access_txt = "150" + name = "Isolation Pen" + }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 1 }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/virology) @@ -4794,8 +4814,7 @@ /area/ruin/powered/syndicate_lava_base/chemistry) "Sj" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Telecommunications"; - req_access_txt = "150" + name = "Telecommunications" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -4809,6 +4828,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/telecomms) "Sm" = ( @@ -4816,7 +4836,7 @@ id = "lavalandsyndi"; name = "Syndicate Experimentation Lockdown Control"; pixel_y = 26; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/effect/turf_decal/siding/purple{ dir = 1 @@ -4856,7 +4876,7 @@ /obj/item/storage/lockbox/vialbox/virology{ pixel_x = -7; pixel_y = 2; - req_access = list(150) + req_access = list("syndicate") }, /obj/item/book/manual/wiki/infections{ pixel_y = 7 @@ -4875,9 +4895,7 @@ /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/powered/syndicate_lava_base/engineering) "SG" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/machinery/door/poddoor/preopen{ id = "lavalandsyndi"; name = "Syndicate Research Experimentation Shutters" @@ -4889,6 +4907,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/chemistry) "SI" = ( @@ -4937,11 +4956,10 @@ /turf/open/floor/plasteel, /area/ruin/powered/syndicate_lava_base/bar) "ST" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/structure/fans/tiny, /obj/machinery/atmospherics/pipe/simple/yellow/hidden, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/telecomms) "SU" = ( @@ -5114,8 +5132,7 @@ /area/ruin/powered/syndicate_lava_base/telecomms) "UK" = ( /obj/machinery/door/airlock/research{ - name = "Science Pod"; - req_access_txt = "150" + name = "Science Pod" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -5135,8 +5152,17 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/chemistry) +"UQ" = ( +/obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, +/obj/machinery/door/poddoor/preopen{ + id = "syndie_lavaland_exitdoors" + }, +/turf/open/floor/plating, +/area/ruin/powered/syndicate_lava_base/main) "UX" = ( /obj/effect/turf_decal/siding/brown, /obj/structure/disposalpipe/segment{ @@ -5149,8 +5175,7 @@ /area/ruin/powered/syndicate_lava_base/cargo) "Vg" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Pod"; - req_access_txt = "150" + name = "Engineering Pod" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -5167,6 +5192,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/engineering) "VG" = ( @@ -5269,8 +5295,7 @@ /area/ruin/powered/syndicate_lava_base/cargo) "WK" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Pod"; - req_access_txt = "150" + name = "Cargo Pod" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -5290,12 +5315,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "WL" = ( /obj/structure/closet/secure_closet/medical1{ - req_access = null; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/effect/turf_decal/siding/blue{ dir = 5 @@ -5304,7 +5329,7 @@ /obj/item/storage/firstaid/hypospray/syndicate, /obj/item/clothing/glasses/hud/health, /obj/item/storage/lockbox/vialbox/hypo_deluxe{ - req_access = list(150) + req_access = list("syndicate") }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/medbay) @@ -5413,8 +5438,10 @@ /obj/effect/decal/cleanable/blood/old, /obj/machinery/door/window/brigdoor{ dir = 8; - name = "Cell"; - req_access_txt = "150" + name = "Cell" + }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 8 }, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/main) @@ -7509,7 +7536,7 @@ hc zB qr JU -yV +Qm El WK El @@ -7630,7 +7657,7 @@ fw fw JU fh -xN +UQ MS El yY diff --git a/_maps/RandomRuins/JungleRuins/miningbase.dmm b/_maps/RandomRuins/JungleRuins/miningbase.dmm index a76174f98fcc..ab4711856f09 100644 --- a/_maps/RandomRuins/JungleRuins/miningbase.dmm +++ b/_maps/RandomRuins/JungleRuins/miningbase.dmm @@ -82,8 +82,7 @@ /area/mine/storage) "aX" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Infirmary"; - req_one_access_txt = "54;63" + name = "Infirmary" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -100,6 +99,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white/side{ dir = 4 }, @@ -160,7 +162,7 @@ "bx" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/secure_closet/contraband/armory{ - req_access = list(63) + req_access = list("sec_basic") }, /turf/open/floor/plasteel, /area/mine/living_quarters) @@ -954,8 +956,7 @@ /area/mine/living_quarters) "iz" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -963,6 +964,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/mine/living_quarters) "iC" = ( @@ -1386,13 +1388,13 @@ /area/mine/break_room) "px" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Station Maintenance"; - req_access_txt = "48" + name = "Mining Station Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark, /area/mine/maintenance) "pB" = ( @@ -1440,14 +1442,14 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva_secondary) "qh" = ( @@ -1498,13 +1500,13 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/siding/wideplating{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva_secondary) "qR" = ( @@ -1832,9 +1834,11 @@ dir = 1 }, /obj/machinery/door/airlock/medical/glass{ - name = "Infirmary"; - req_one_access_txt = "54;63" + name = "Infirmary" }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white, /area/mine/infirmary) "wU" = ( @@ -2185,8 +2189,7 @@ /area/mine/break_room) "BC" = ( /obj/machinery/door/airlock/mining{ - name = "Mining Station Storage"; - req_access_txt = "48" + name = "Mining Station Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -2203,6 +2206,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/production) "BM" = ( @@ -2600,12 +2604,12 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva) "GT" = ( @@ -2728,28 +2732,30 @@ /area/mine/maintenance) "Je" = ( /obj/machinery/door/airlock/mining{ - name = "Mining Station Storage"; - req_access_txt = "48" + name = "Mining Station Storage" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark/side, /area/mine/maintenance) "Ji" = ( -/obj/machinery/door/window/eastleft{ - req_access_txt = "48" - }, -/obj/machinery/door/window/westleft{ - req_access_txt = "48" - }, +/obj/machinery/door/window/eastleft, +/obj/machinery/door/window/westleft, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/supply/mining_station{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/all/supply/mining_station{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/mine/maintenance) "Jt" = ( @@ -2768,6 +2774,12 @@ /obj/machinery/door/airlock/medical{ name = "Recovery Room" }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white/side{ dir = 4 }, @@ -2798,8 +2810,7 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -2808,6 +2819,7 @@ dir = 8 }, /obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plating, /area/mine/storage) "Kf" = ( @@ -3156,19 +3168,18 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/effect/turf_decal/siding/wideplating, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva) "PS" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Station Maintenance"; - req_access_txt = "48" + name = "Mining Station Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -3185,6 +3196,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark/side{ dir = 8 }, @@ -3207,8 +3219,7 @@ /area/mine/maintenance) "Qv" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mining Station EVA"; - req_access_txt = "54" + name = "Mining Station EVA" }, /obj/structure/cable{ icon_state = "1-2" @@ -3222,6 +3233,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva) "QE" = ( @@ -3304,6 +3316,9 @@ dir = 4 }, /obj/machinery/door/airlock/medical, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white, /area/mine/infirmary) "RR" = ( @@ -3370,8 +3385,7 @@ /area/mine/break_room) "Tf" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Mining Station Atmospherics"; - req_access_txt = "48" + name = "Mining Station Atmospherics" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -3379,6 +3393,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark/side{ dir = 8 }, @@ -3399,7 +3414,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/door/airlock/engineering/glass, +/obj/machinery/door/airlock/engineering/glass{ + name = "Vacant Room" + }, /turf/open/floor/plasteel, /area/mine/vacant) "TG" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 35e82fe817e4..0fd1ccc1b8a2 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -154,7 +154,7 @@ /area/ruin/powered/beach) "aF" = ( /obj/machinery/vending/boozeomat{ - req_access_txt = "0"; + req_access = null; set_obj_flags = "EMAGGED" }, /turf/open/floor/wood, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_fishing.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_fishing.dmm index 8ce33a885177..dc4c4b71e2ae 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_fishing.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_fishing.dmm @@ -27,8 +27,7 @@ /area/ruin/powered/fishing/shop) "aF" = ( /obj/machinery/door/airlock/maintenance{ - name = "kitchen storage"; - req_access_txt = "Fisherman" + name = "kitchen storage" }, /obj/effect/turf_decal/trimline/brown/filled/end, /obj/machinery/door/firedoor/border_only, @@ -376,7 +375,7 @@ /area/ruin/powered/fishing/shop) "kB" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = "Fisherman" + req_access = null }, /obj/item/reagent_containers/glass/mixbowl{ pixel_x = 1; @@ -448,10 +447,6 @@ "ld" = ( /obj/structure/rack, /obj/item/ship_in_a_bottle, -/obj/item/clothing/under/sailor, -/obj/item/clothing/under/sailor, -/obj/item/clothing/under/sailor, -/obj/item/clothing/under/sailor, /obj/effect/spawner/lootdrop/glowstick, /obj/effect/spawner/lootdrop/glowstick, /obj/effect/spawner/lootdrop/glowstick, @@ -786,15 +781,13 @@ id = "fishshop"; name = "Giftshop Shutters"; pixel_x = 28; - pixel_y = 8; - req_access_txt = "Fisherman" + pixel_y = 8 }, /obj/machinery/button/door{ id = "fishing lockdown"; name = "Lockdown Control"; pixel_x = 28; - pixel_y = -7; - req_access_txt = "Fisherman" + pixel_y = -7 }, /obj/effect/mob_spawn/human/fishing/alive, /obj/structure/cloth_curtain, @@ -848,8 +841,7 @@ id = "fishing lockdown"; name = "Lockdown Control"; pixel_x = 25; - pixel_y = -6; - req_access_txt = "Fisherman" + pixel_y = -6 }, /obj/machinery/hydroponics/constructable, /turf/open/floor/plasteel, @@ -1007,8 +999,7 @@ dir = 4 }, /obj/machinery/door/window/westleft{ - dir = 2; - req_access_txt = "Fisherman" + dir = 2 }, /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, @@ -1332,15 +1323,13 @@ id = "fishing lockdown"; name = "Lockdown Control"; pixel_x = -23; - pixel_y = 9; - req_access_txt = "Fisherman" + pixel_y = 9 }, /obj/machinery/button/door{ id = "fishshop"; name = "Giftshop Shutters"; pixel_x = -23; - pixel_y = -6; - req_access_txt = "Fisherman" + pixel_y = -6 }, /turf/open/floor/plasteel, /area/ruin/powered/fishing/shop) @@ -1418,8 +1407,7 @@ /area/ruin/powered/fishing/shop) "Gv" = ( /obj/machinery/door/airlock/wood{ - name = "bunk room"; - req_access_txt = "Fisherman" + name = "bunk room" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -1506,9 +1494,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/powered/fishing/kitchen) "IW" = ( -/obj/machinery/door/window/westleft{ - req_access_txt = "Fisherman" - }, +/obj/machinery/door/window/westleft, /obj/machinery/door/poddoor/shutters{ id = "fishshop" }, @@ -1676,8 +1662,7 @@ "Qn" = ( /obj/effect/turf_decal/caution/stand_clear, /obj/machinery/door/airlock/glass{ - name = "kitchen access"; - req_access_txt = "Fisherman" + name = "kitchen access" }, /obj/effect/turf_decal/trimline/brown/filled/line, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -1716,7 +1701,7 @@ /area/ruin/powered/fishing/hall) "QL" = ( /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = "Fisherman" + req_access = null }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, @@ -1902,9 +1887,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/door/window/westleft{ - req_access_txt = "Fisherman" - }, +/obj/machinery/door/window/westleft, /turf/open/floor/plasteel/dark/telecomms, /area/ruin/powered/fishing/tcom) "Vn" = ( @@ -2058,7 +2041,7 @@ /area/ruin/powered/fishing/shop) "Zd" = ( /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /turf/open/water/safe, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter_inn.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter_inn.dmm index a65f0839177b..c2cba30e83bc 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter_inn.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter_inn.dmm @@ -568,8 +568,7 @@ /area/ruin/powered/inn) "Kt" = ( /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = null; - req_access_txt = "0" + req_access = null }, /obj/item/storage/box/donkpockets, /obj/item/reagent_containers/food/condiment/enzyme, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_cafe_of_broken_dreams.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_cafe_of_broken_dreams.dmm index dd957aab48fa..f06aa272a98a 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_cafe_of_broken_dreams.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_cafe_of_broken_dreams.dmm @@ -59,8 +59,7 @@ /area/ruin/powered) "aF" = ( /obj/item/reagent_containers/glass/bottle/radscrub{ - desc = "War. War never changes. But this can clean your radiation contamination problems!"; - + desc = "War. War never changes. But this can clean your radiation contamination problems!" }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) @@ -95,7 +94,6 @@ "aN" = ( /obj/structure/bed, /obj/item/bedsheet, -/obj/item/clothing/under/scratch, /turf/open/floor/wood, /area/ruin/powered) "aO" = ( @@ -217,8 +215,7 @@ "bn" = ( /obj/structure/closet/secure_closet/bar{ pixel_x = -3; - pixel_y = -1; - req_access_txt = "25" + pixel_y = -1 }, /turf/open/floor/wood, /area/ruin/powered) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_cursedtoyshop.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_cursedtoyshop.dmm index 292c36fd8200..87679c891d72 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_cursedtoyshop.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_cursedtoyshop.dmm @@ -589,7 +589,6 @@ "bm" = ( /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; - req_access_txt = "0"; use_power = 0 }, /turf/closed/wall/mineral/wood, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_gas_station.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_gas_station.dmm index f1ad88e9d389..1d804c765449 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_gas_station.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_gas_station.dmm @@ -14,7 +14,7 @@ }, /obj/structure/closet/crate/secure{ name = "Emergency Supplies Crate"; - req_access_txt = "36" + req_access = list("clerk") }, /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/glass/fifty, @@ -67,10 +67,9 @@ /turf/open/floor/plasteel/white, /area/ruin/powered/gasstation) "aU" = ( -/obj/machinery/door/airlock/centcom{ - req_access_txt = "36" - }, +/obj/machinery/door/airlock/centcom, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plating, /area/ruin/powered/gasstation) "aV" = ( @@ -198,10 +197,10 @@ /area/ruin/powered/gasstation) "gZ" = ( /obj/machinery/door/airlock/hatch{ - req_access = null; - req_access_txt = "36" + req_access = null }, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel/white, /area/ruin/powered/gasstation) "ha" = ( @@ -219,19 +218,31 @@ /obj/effect/mob_spawn/human/gasstation_clerk, /turf/open/floor/plasteel/white, /area/ruin/powered/gasstation) +"ia" = ( +/obj/structure/window{ + dir = 8 + }, +/obj/structure/displaycase/labcage{ + desc = "For displaying of more valuable items you have acquired."; + name = "Shop Display Case"; + req_access = list("clerk"); + start_showpiece_type = null + }, +/turf/open/floor/plasteel/white, +/area/ruin/powered/gasstation) "ii" = ( /obj/item/trash/chips, /turf/open/floor/plasteel/white, /area/ruin/powered/gasstation) "iq" = ( /obj/machinery/door/window{ - req_access = null; - req_access_txt = "36" + req_access = null }, /obj/machinery/door/poddoor/shutters/preopen{ id = "cashiershutters"; name = "Cashier Shutters" }, +/obj/effect/mapping_helpers/windoor/access/all/service/clerk, /turf/open/floor/plasteel/white, /area/ruin/powered/gasstation) "ir" = ( @@ -612,8 +623,7 @@ /obj/structure/displaycase/labcage{ desc = "For displaying of more valuable items you have acquired."; name = "Shop Display Case"; - req_access = null; - req_access_txt = "36"; + req_access = list("clerk"); start_showpiece_type = null }, /turf/open/floor/plasteel/white, @@ -622,7 +632,7 @@ /obj/machinery/button/door{ id = "cashiershutters"; name = "Cashier Lockdown"; - req_access_txt = "36" + req_access = list("clerk") }, /turf/closed/wall/rust, /area/ruin/powered/gasstation) @@ -722,9 +732,8 @@ /obj/structure/displaycase/labcage{ desc = "For displaying of more valuable items you have acquired."; name = "Shop Display Case"; - req_access = null; - req_access_txt = "36"; - start_showpiece_type = null + start_showpiece_type = null; + req_access = list("clerk") }, /turf/open/floor/plasteel/white, /area/ruin/powered/gasstation) @@ -772,7 +781,7 @@ /obj/machinery/button/door{ id = "gasstation"; name = "Gas Station Lockdown"; - req_access_txt = "36" + req_access = list("clerk") }, /turf/closed/wall/rust, /area/ruin/powered/gasstation) @@ -1315,7 +1324,7 @@ cV cV RV sJ -Qw +ia fB Xf cV diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_medical.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_medical.dmm index beab03230486..ad298fcfbbee 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_medical.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_medical.dmm @@ -715,9 +715,7 @@ /turf/open/floor/plasteel, /area/ruin/powered) "bQ" = ( -/obj/machinery/door/airlock/security/glass{ - req_access_txt = "63" - }, +/obj/machinery/door/airlock/security/glass, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 8; @@ -731,6 +729,7 @@ dir = 1; icon_state = "tile_corner" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/ruin/powered) "bR" = ( @@ -752,9 +751,7 @@ /area/ruin/powered) "bS" = ( /obj/structure/fans/tiny/invisible, -/obj/machinery/door/airlock/security/glass{ - req_one_access_txt = "63" - }, +/obj/machinery/door/airlock/security/glass, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 8; @@ -768,6 +765,7 @@ dir = 1; icon_state = "tile_corner" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/ruin/powered) "bT" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_russianbunker.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_russianbunker.dmm index 152899714d8f..604ee0c5c79c 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_russianbunker.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_russianbunker.dmm @@ -164,8 +164,7 @@ name = "Shuttle turret control"; pixel_x = 32; pixel_y = -28; - req_access = null; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/item/clothing/suit/armor/heavy/juggernaut, /obj/item/clothing/head/helmet/juggernaut, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index ce1bd0cc41ad..e8d9dc5de2bf 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -19,8 +19,7 @@ /area/ruin/powered/syndicate_lava_base/testlab) "af" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_access_txt = "150" + name = "Engineering" }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -32,7 +31,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/syndicate, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/engineering) "ah" = ( @@ -78,7 +83,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 5 }, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/dormitories) "ap" = ( @@ -200,9 +208,7 @@ /obj/effect/turf_decal/siding/purple{ dir = 8 }, -/obj/machinery/mineral/ore_redemption{ - req_access = list(150) - }, +/obj/machinery/mineral/ore_redemption, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/testlab) "bE" = ( @@ -217,10 +223,13 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/bar) "bU" = ( @@ -417,9 +426,8 @@ /area/ruin/powered/syndicate_lava_base/virology) "dL" = ( /obj/structure/fans/tiny, -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/cargo) "dM" = ( @@ -463,8 +471,7 @@ /area/ruin/powered/syndicate_lava_base/medbay) "dU" = ( /obj/machinery/smartfridge/chemistry/preloaded, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/plating, +/turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/powered/syndicate_lava_base/chemistry) "dV" = ( /obj/effect/turf_decal/siding/wood{ @@ -480,11 +487,11 @@ /obj/item/paper_bin, /obj/item/pen, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/south{ - pixel_y = -23; - req_access = list(150) - }, /obj/effect/turf_decal/siding/purple, +/obj/machinery/power/apc/syndicate{ + name = "Chemistry Division APC"; + pixel_y = -23 + }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/chemistry) "dY" = ( @@ -494,8 +501,7 @@ pixel_y = -5 }, /obj/structure/closet/secure_closet/chemical{ - req_access = null; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/item/storage/box/beakers/bluespace, /obj/item/storage/box/beakers/bluespace, @@ -566,7 +572,7 @@ /area/ruin/powered/syndicate_lava_base/arrivals) "ej" = ( /obj/structure/closet/crate/secure/weapon{ - req_access_txt = "150" + req_access = list("syndicate") }, /obj/item/ammo_box/c10mm{ pixel_y = 6 @@ -592,9 +598,6 @@ /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "em" = ( -/obj/effect/turf_decal/siding/green{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -604,6 +607,10 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/effect/turf_decal/siding/green/corner, +/obj/effect/turf_decal/siding/green/corner{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/virology) "eo" = ( @@ -633,7 +640,7 @@ pixel_y = 32 }, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /turf/open/floor/plasteel/dark, @@ -681,9 +688,7 @@ /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/medbay) "eD" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/structure/cable{ icon_state = "4-8" }, @@ -694,6 +699,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/testlab) "eE" = ( @@ -763,7 +769,7 @@ /obj/machinery/button/door{ id = "lavalandsyndi_virology"; name = "Virology Blast Door Control"; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/item/storage/box/monkeycubes, /obj/effect/turf_decal/siding/green{ @@ -775,7 +781,7 @@ /obj/item/storage/lockbox/vialbox/virology{ pixel_x = -7; pixel_y = 2; - req_access = list(150) + req_access = list("syndicate") }, /obj/item/book/manual/wiki/infections{ pixel_y = 7 @@ -824,7 +830,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel/grimy, /area/ruin/powered/syndicate_lava_base/dormitories) "fa" = ( @@ -838,7 +849,11 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/virology) "fb" = ( @@ -915,8 +930,7 @@ /area/ruin/powered/syndicate_lava_base/medbay) "fh" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Monkey Pen"; - req_access_txt = "150" + name = "Monkey Pen" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -924,8 +938,20 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/grass, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/effect/turf_decal/siding/green/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/green/corner{ + dir = 1 + }, +/turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/virology) "fj" = ( /obj/structure/cable{ @@ -980,7 +1006,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plasteel/grimy, /area/ruin/powered/syndicate_lava_base/dormitories) "fu" = ( @@ -1163,7 +1194,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /turf/open/floor/plasteel/dark, @@ -1193,14 +1224,13 @@ dir = 8 }, /obj/structure/closet/secure_closet/medical1{ - req_access = null; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/item/gun/syringe/rapidsyringe, /obj/item/storage/firstaid/hypospray/syndicate, /obj/item/clothing/glasses/hud/health, /obj/item/storage/lockbox/vialbox/hypo_deluxe{ - req_access = list(150) + req_access = list("syndicate") }, /obj/machinery/airalarm/syndicate{ dir = 4; @@ -1218,12 +1248,11 @@ /area/ruin/powered/syndicate_lava_base/medbay) "gu" = ( /obj/structure/fans/tiny, -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/arrivals) "gv" = ( @@ -1260,7 +1289,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel/grimy, /area/ruin/powered/syndicate_lava_base/dormitories) "gB" = ( @@ -1387,11 +1421,11 @@ "gW" = ( /obj/effect/turf_decal/siding/blue, /obj/machinery/vending/medical/syndicate_access, -/obj/machinery/power/apc/auto_name/south{ - pixel_y = -23; - req_access = list(150) - }, /obj/structure/cable, +/obj/machinery/power/apc/syndicate{ + name = "Medical Division APC"; + pixel_y = -23 + }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/medbay) "gX" = ( @@ -1424,9 +1458,9 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/auto_name/south{ - pixel_y = -23; - req_access = list(150) +/obj/machinery/power/apc/syndicate{ + name = "Engineering Division APC"; + pixel_y = -23 }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/engineering) @@ -1526,7 +1560,7 @@ /area/ruin/powered/syndicate_lava_base/engineering) "hr" = ( /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = list(150) + req_access = list("syndicate") }, /obj/machinery/airalarm/syndicate{ dir = 1; @@ -1658,10 +1692,6 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/main) "hJ" = ( -/obj/machinery/power/apc/auto_name/east{ - pixel_x = 24; - req_access = list(150) - }, /obj/structure/cable{ icon_state = "0-2" }, @@ -1669,6 +1699,10 @@ dir = 4 }, /obj/machinery/vending/fishing, +/obj/machinery/power/apc/syndicate{ + name = "Primary Hallway APC"; + pixel_x = 25 + }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "hM" = ( @@ -1706,7 +1740,10 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/bar) "hR" = ( @@ -1813,7 +1850,7 @@ id = "syndicate_lavaland_vault_windows"; name = "Vault Window Shutters"; pixel_y = -24; - req_access_txt = "150" + req_access = list("syndicate") }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/vault) @@ -1838,7 +1875,7 @@ name = "Vault Bolt Control"; normaldoorcontrol = 1; pixel_y = -24; - req_access_txt = "150"; + req_access = list("syndicate"); specialfunctions = 4 }, /turf/open/floor/mineral/plastitanium, @@ -1866,10 +1903,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, -/obj/machinery/power/apc/auto_name/east{ - pixel_x = 24; - req_access = list(150) - }, /obj/structure/cable{ icon_state = "0-8" }, @@ -1879,12 +1912,15 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, +/obj/machinery/power/apc/syndicate{ + name = "Bar Division APC"; + pixel_x = 25 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/bar) "ie" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_access_txt = "150" + name = "Engineering" }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -1896,7 +1932,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/syndicate, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/engineering) "ig" = ( @@ -1923,7 +1965,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/medbay) "iq" = ( @@ -1966,7 +2014,7 @@ id = "lavalandsyndi_bar"; name = "Bar Blast Door Control"; pixel_y = 26; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -1985,8 +2033,7 @@ /area/ruin/powered/syndicate_lava_base/dormitories) "iA" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_access_txt = "150" + name = "Cargo Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -1994,7 +2041,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/cargo) "iB" = ( @@ -2005,7 +2058,7 @@ id = "lavalandsyndi_chemistry"; name = "Chemistry Blast Door Control"; pixel_y = 26; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/machinery/chem_master, /obj/effect/turf_decal/siding/purple{ @@ -2027,7 +2080,7 @@ id = "lavalandsyndi_telecomms"; name = "Telecomms Blast Door Control"; pixel_y = 26; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/effect/turf_decal/siding/red{ dir = 1 @@ -2289,6 +2342,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/powered/syndicate_lava_base/dormitories) "jq" = ( @@ -2339,7 +2398,7 @@ dir = 5 }, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, /obj/structure/table/reinforced, @@ -2359,8 +2418,7 @@ /area/ruin/powered/syndicate_lava_base/bar) "jA" = ( /obj/machinery/door/airlock/atmos{ - name = "Turbine"; - req_access_txt = "150" + name = "Turbine" }, /obj/structure/cable{ icon_state = "4-8" @@ -2374,7 +2432,13 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/syndicate, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/engineering) "jC" = ( @@ -2656,7 +2720,7 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, /obj/machinery/airalarm/syndicate{ @@ -2777,15 +2841,18 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/closet/crate/secure/gear{ - req_access_txt = "150" + req_access = list("syndicate") }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "ks" = ( -/obj/machinery/door/firedoor/heavy, /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/main) "ku" = ( @@ -2831,12 +2898,12 @@ /obj/item/reagent_containers/spray/cleaner, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe/antiviral, -/obj/machinery/power/apc/auto_name/south{ - pixel_y = -23; - req_access = list(150) - }, /obj/structure/cable, /obj/machinery/light_switch, +/obj/machinery/power/apc/syndicate{ + name = "Virology Division APC"; + pixel_y = -23 + }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/virology) "ky" = ( @@ -2929,7 +2996,9 @@ dir = 1 }, /obj/effect/turf_decal/tile/bar, -/obj/structure/closet/syndicate, +/obj/structure/closet/syndicate{ + req_access = list("syndicate") + }, /obj/item/gun/ballistic/shotgun/doublebarrel, /obj/item/ammo_casing/shotgun/beanbag, /obj/item/ammo_casing/shotgun/beanbag, @@ -3010,9 +3079,8 @@ /area/ruin/powered/syndicate_lava_base/engineering) "kY" = ( /obj/structure/fans/tiny, -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/telecomms) "kZ" = ( @@ -3069,13 +3137,18 @@ /turf/open/floor/plasteel, /area/ruin/powered/syndicate_lava_base/bar) "lh" = ( -/obj/machinery/door/airlock/virology/glass{ - name = "Monkey Pen"; - req_access_txt = "150" +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay" }, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/grass, -/area/ruin/powered/syndicate_lava_base/virology) +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/ruin/powered/syndicate_lava_base/medbay) "lj" = ( /obj/effect/turf_decal/siding/wood/corner, /obj/structure/cable{ @@ -3181,9 +3254,8 @@ /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/main) "lM" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/cargo) "lN" = ( @@ -3215,7 +3287,7 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /obj/machinery/airalarm/syndicate{ @@ -3227,7 +3299,7 @@ /area/ruin/powered/syndicate_lava_base/dormitories) "lT" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = list(150) + req_access = list("syndicate") }, /obj/item/storage/box/donkpockets{ pixel_x = 2 @@ -3308,7 +3380,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/bar) "lZ" = ( @@ -3336,16 +3413,16 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23; - req_access = list(150) - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/machinery/power/apc/syndicate{ + name = "Crew Quarters APC"; + pixel_y = 23 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/dormitories) "mc" = ( @@ -3361,7 +3438,7 @@ name = "syndicate commander's gloves" }, /obj/structure/closet/crate/secure/gear{ - req_access_txt = "150" + req_access = list("syndicate") }, /turf/open/floor/plating/lavaland_baseturf, /area/ruin/powered/syndicate_lava_base/engineering) @@ -3456,9 +3533,7 @@ /area/ruin/powered/syndicate_lava_base/engineering) "mr" = ( /obj/structure/fans/tiny, -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/structure/cable{ icon_state = "4-8" }, @@ -3469,6 +3544,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/testlab) "ms" = ( @@ -3544,8 +3620,7 @@ /area/lavaland/surface/outdoors) "mN" = ( /obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "150" + name = "Experimentation Lab" }, /obj/structure/cable{ icon_state = "1-2" @@ -3556,7 +3631,11 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/testlab) "mS" = ( @@ -3565,7 +3644,7 @@ /obj/item/circuitboard/machine/clonescanner, /obj/structure/closet/crate/secure/medical{ desc = "A crate with a lock on it, painted in the scheme of the station's doctors. This one is marked to contain prototype circuitry and clearly hasn't been touched in years."; - req_access_txt = "151" + req_access = list("syndicate_leader") }, /obj/item/paper{ info = "You have been assigned to test an old cloner system provided to us by one of our research stations. Your monkeys should make excellent DNA sources. Do not clone too many crew, and be prepared to treat genetic defects and cellular damage." @@ -3651,7 +3730,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel/grimy, /area/ruin/powered/syndicate_lava_base/dormitories) "np" = ( @@ -3731,6 +3815,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 + }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/arrivals) "ny" = ( @@ -3774,8 +3861,8 @@ name = "Vault Bolt Control"; normaldoorcontrol = 1; pixel_y = 24; - req_access_txt = "150"; - specialfunctions = 4 + req_access = list("syndicate"); + specialfunctions=4 }, /obj/effect/decal/cleanable/dirt, /obj/structure/table/reinforced, @@ -3836,7 +3923,7 @@ id = "lavalandsyndi_arrivals"; name = "Arrivals Blast Door Control"; pixel_y = -26; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/decal/cleanable/dirt, @@ -3867,7 +3954,7 @@ id = "lavalandsyndi_medsci"; name = "Medical Bay Shutters"; pixel_y = 24; - req_access_txt = "150" + req_access = list("syndicate") }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/medbay) @@ -4006,18 +4093,17 @@ /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/arrivals) "oo" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/arrivals) "op" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, /obj/machinery/airalarm/syndicate{ @@ -4027,13 +4113,12 @@ /turf/open/floor/plasteel/grimy, /area/ruin/powered/syndicate_lava_base/dormitories) "ou" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/arrivals) "ov" = ( @@ -4080,11 +4165,11 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23; - req_access = list(150) - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/syndicate{ + name = "Arrival Dock APC"; + pixel_y = 23 + }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/arrivals) "oE" = ( @@ -4103,12 +4188,11 @@ /turf/open/floor/engine/vacuum, /area/ruin/powered/syndicate_lava_base/engineering) "oI" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/bar) "oJ" = ( @@ -4124,13 +4208,8 @@ /turf/open/floor/plasteel, /area/ruin/powered/syndicate_lava_base/bar) "oK" = ( -/obj/machinery/door/firedoor/window{ - desc = "A second window that slides in when the original window is broken, designed to protect against hull breaches. Truly a work of genius by Cybersun engineers." - }, /obj/machinery/smartfridge/chemistry/virology/preloaded, -/obj/structure/window/reinforced/spawner/east, -/obj/structure/window/reinforced/spawner, -/turf/open/floor/plating, +/turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/powered/syndicate_lava_base/virology) "oP" = ( /obj/structure/table/reinforced, @@ -4138,7 +4217,7 @@ department = "Unidentified"; desc = "Used to send black pages to Nanotrasen stations."; name = "Syndicate Fax Machine"; - req_one_access = list(150) + req_access = list("syndicate") }, /obj/item/paper{ info = "You have been entrusted with the Nuclear Authentication Disk of Space Station 12. Keep it secure until Nanotrasen finishes repairs."; @@ -4150,7 +4229,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/dormitories) "oV" = ( @@ -4177,25 +4259,34 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/main) "pz" = ( -/obj/machinery/door/firedoor/heavy, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/main) "pK" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 +/obj/machinery/door/airlock/vault{ + id_tag = "syndie_lavaland_vault"; + name = "Vault Access" }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/airalarm/syndicate{ - pixel_y = 24 +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/ruin/powered/syndicate_lava_base/arrivals) +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/mineral/plastitanium, +/area/ruin/powered/syndicate_lava_base/vault) "qh" = ( /obj/effect/turf_decal/siding/red{ dir = 10 @@ -4229,7 +4320,7 @@ /area/ruin/powered/syndicate_lava_base/telecomms) "qG" = ( /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, /turf/open/floor/grass, @@ -4251,7 +4342,10 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/dormitories) "rc" = ( @@ -4265,7 +4359,7 @@ id = "lavalandsyndi"; name = "Syndicate Experimentation Lockdown Control"; pixel_y = -26; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/effect/turf_decal/siding/purple, /turf/open/floor/mineral/plastitanium, @@ -4276,7 +4370,7 @@ id = "lavalandsyndi"; name = "Syndicate Experimentation Lockdown Control"; pixel_y = 26; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/effect/turf_decal/siding/purple/corner{ dir = 1 @@ -4290,12 +4384,14 @@ id = "syndielavaland_disposals" }, /obj/machinery/door/window/brigdoor/westleft{ - name = "Disposals Conveyor"; - req_access_txt = "150" + name = "Disposals Conveyor" }, /obj/structure/sign/warning/deathsposal{ pixel_x = 32 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 8 + }, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/cargo) "rK" = ( @@ -4320,7 +4416,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, /obj/effect/decal/cleanable/dirt, @@ -4383,13 +4479,12 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/main) "tS" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/bar) "tU" = ( @@ -4401,8 +4496,7 @@ /area/ruin/powered/syndicate_lava_base/medbay) "tZ" = ( /obj/machinery/door/window/brigdoor{ - name = "Isolation Pen"; - req_access_txt = "150" + name = "Isolation Pen" }, /obj/machinery/light{ dir = 1; @@ -4412,6 +4506,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/virology) "ua" = ( @@ -4432,7 +4527,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, /obj/structure/disposalpipe/segment{ @@ -4490,8 +4585,7 @@ /area/ruin/powered/syndicate_lava_base/main) "uT" = ( /obj/machinery/door/window/northleft{ - name = "Bar"; - req_access_txt = "150" + name = "Bar" }, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -4507,6 +4601,9 @@ /obj/machinery/light_switch{ pixel_x = 24 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 1 + }, /turf/open/floor/plasteel, /area/ruin/powered/syndicate_lava_base/bar) "uX" = ( @@ -4647,8 +4744,7 @@ /area/ruin/powered/syndicate_lava_base/bar) "wL" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay"; - req_access_txt = "150" + name = "Cargo Bay" }, /obj/structure/cable{ icon_state = "4-8" @@ -4659,10 +4755,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) "xd" = ( @@ -4853,7 +4955,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /obj/structure/disposalpipe/segment{ @@ -4902,7 +5004,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/main) "Ay" = ( @@ -4910,7 +5017,7 @@ id = "lavalandsyndi_cargo"; name = "Cargo Bay Blast Door Control"; pixel_x = 26; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -5034,10 +5141,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/power/apc/auto_name/east{ - pixel_x = 24; - req_access = list(150) - }, /obj/structure/cable{ icon_state = "0-8" }, @@ -5049,6 +5152,10 @@ name = "emergency backup red phone safe" }, /obj/item/phone/real/syndicate_ruin, +/obj/machinery/power/apc/syndicate{ + name = "Vault APC"; + pixel_x = 25 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/vault) "Cm" = ( @@ -5057,14 +5164,16 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/main) "Cr" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base/arrivals) "Cv" = ( @@ -5154,7 +5263,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 10 }, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/bar) "Ed" = ( @@ -5361,7 +5473,7 @@ id = "lavalandsyndi_cargo"; name = "Cargo Bay Blast Door Control"; pixel_x = 26; - req_access_txt = "150" + req_access = list("syndicate") }, /turf/open/floor/plasteel/dark, /area/ruin/powered/syndicate_lava_base/cargo) @@ -5375,16 +5487,13 @@ /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/chemistry) "Gv" = ( -/obj/machinery/turretid{ +/obj/machinery/turretid/syndicate{ ailock = 1; control_area = "/area/ruin/powered/syndicate_lava_base/main"; dir = 1; - icon_state = "control_kill"; lethal = 1; name = "Base turret controls"; - pixel_y = 30; - req_access = null; - req_access_txt = "150" + pixel_y = 30 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -5432,8 +5541,7 @@ /area/ruin/powered/syndicate_lava_base/main) "Hi" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Telecommunications"; - req_access_txt = "150" + name = "Telecommunications" }, /obj/structure/cable{ icon_state = "4-8" @@ -5444,10 +5552,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/telecomms) "Hn" = ( @@ -5543,14 +5657,18 @@ "IC" = ( /obj/machinery/door/airlock/vault{ id_tag = "syndie_lavaland_vault"; - name = "Vault Access"; - req_access_txt = "150" + name = "Vault Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/vault) "IJ" = ( @@ -5659,13 +5777,17 @@ /obj/machinery/door/airlock/medical/glass{ name = "Medbay" }, -/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/medbay) "JV" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /obj/machinery/airalarm/syndicate{ @@ -5829,7 +5951,7 @@ dir = 1 }, /obj/structure/closet/crate/secure/gear{ - req_access_txt = "150" + req_access = list("syndicate") }, /obj/item/clothing/gloves/combat, /obj/item/clothing/gloves/combat, @@ -5949,8 +6071,7 @@ /area/ruin/powered/syndicate_lava_base/virology) "Om" = ( /obj/machinery/door/airlock/research{ - name = "Chemistry"; - req_access_txt = "150" + name = "Chemistry" }, /obj/structure/cable{ icon_state = "4-8" @@ -5961,10 +6082,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/ruin/powered/syndicate_lava_base/chemistry) "Ou" = ( @@ -6069,10 +6196,6 @@ /area/ruin/powered/syndicate_lava_base/engineering) "Qg" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23; - req_access = list(150) - }, /obj/effect/turf_decal/siding/red{ dir = 9 }, @@ -6084,6 +6207,10 @@ icon_state = "0-2"; pixel_y = 1 }, +/obj/machinery/power/apc/syndicate{ + name = "Telecommunications Division APC"; + pixel_y = 23 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/telecomms) "Ql" = ( @@ -6114,7 +6241,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 5 }, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/bar) "QQ" = ( @@ -6179,15 +6309,15 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/auto_name/east{ - pixel_x = 24; - req_access = list(150) - }, /obj/structure/table/reinforced, /obj/item/taperecorder, /obj/effect/turf_decal/siding/purple{ dir = 4 }, +/obj/machinery/power/apc/syndicate{ + name = "Experimentation Division APC"; + pixel_x = 25 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/testlab) "RE" = ( @@ -6214,10 +6344,13 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, -/obj/machinery/door/firedoor/heavy, /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base/dormitories) "RR" = ( @@ -6490,7 +6623,7 @@ /area/ruin/powered/syndicate_lava_base/main) "VH" = ( /obj/machinery/vending/toyliberationstation{ - req_access_txt = "150" + req_access = list("syndicate") }, /obj/effect/turf_decal/siding/brown{ dir = 10 @@ -6505,8 +6638,7 @@ dir = 4 }, /obj/machinery/door/window/eastright{ - name = "Kitchen"; - req_access_txt = "150" + name = "Kitchen" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -6514,6 +6646,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 4 + }, /turf/open/floor/plasteel/cafeteria, /area/ruin/powered/syndicate_lava_base/bar) "Wf" = ( @@ -6550,10 +6685,6 @@ /obj/effect/turf_decal/siding/yellow/corner{ dir = 4 }, -/obj/machinery/power/apc/auto_name/east{ - pixel_x = 24; - req_access = list(150) - }, /obj/structure/cable, /obj/structure/cable{ icon_state = "1-2" @@ -6563,6 +6694,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/machinery/power/apc/syndicate{ + name = "Cargo Division APC"; + pixel_x = 25 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base/main) "WP" = ( @@ -7715,7 +7850,7 @@ kQ kQ ip cO -JE +lh kQ kQ pz @@ -7723,7 +7858,7 @@ Ao eh eh eh -lh +eh eh eh kU @@ -8114,7 +8249,7 @@ it dE IC TA -IC +pK Ib jo hz @@ -8183,7 +8318,7 @@ hz mb iW hz -pK +nt nW on ab diff --git a/_maps/RandomRuins/LavaRuins/miningbase.dmm b/_maps/RandomRuins/LavaRuins/miningbase.dmm index 07f81b825a05..4ced6517874b 100644 --- a/_maps/RandomRuins/LavaRuins/miningbase.dmm +++ b/_maps/RandomRuins/LavaRuins/miningbase.dmm @@ -68,8 +68,7 @@ /area/mine/storage) "aX" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Infirmary"; - req_one_access_txt = "54;63" + name = "Infirmary" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -86,6 +85,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white/side{ dir = 4 }, @@ -139,7 +141,7 @@ "bx" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/secure_closet/contraband/armory{ - req_access = list(63) + req_access = list("sec_basic") }, /turf/open/floor/plasteel, /area/mine/living_quarters) @@ -863,8 +865,7 @@ /area/mine/living_quarters) "iz" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -872,6 +873,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/mine/living_quarters) "iC" = ( @@ -1325,13 +1327,13 @@ /area/mine/break_room) "px" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Station Maintenance"; - req_access_txt = "48" + name = "Mining Station Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark, /area/mine/maintenance) "py" = ( @@ -1388,14 +1390,14 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva_secondary) "qh" = ( @@ -1457,13 +1459,13 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/siding/wideplating{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva_secondary) "qR" = ( @@ -2174,8 +2176,7 @@ /area/mine/break_room) "BC" = ( /obj/machinery/door/airlock/mining{ - name = "Mining Station Storage"; - req_access_txt = "48" + name = "Mining Station Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -2192,6 +2193,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/production) "BM" = ( @@ -2540,9 +2542,11 @@ dir = 1 }, /obj/machinery/door/airlock/medical/glass{ - name = "Infirmary"; - req_one_access_txt = "54;63" + name = "Infirmary" }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white, /area/mine/infirmary) "Gi" = ( @@ -2590,12 +2594,12 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva) "GT" = ( @@ -2722,28 +2726,30 @@ /area/mine/maintenance) "Je" = ( /obj/machinery/door/airlock/mining{ - name = "Mining Station Storage"; - req_access_txt = "48" + name = "Mining Station Storage" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark/side, /area/mine/maintenance) "Ji" = ( -/obj/machinery/door/window/eastleft{ - req_access_txt = "48" - }, -/obj/machinery/door/window/westleft{ - req_access_txt = "48" - }, +/obj/machinery/door/window/eastleft, +/obj/machinery/door/window/westleft, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/supply/mining_station{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/all/supply/mining_station{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/mine/maintenance) "Jt" = ( @@ -2762,6 +2768,9 @@ /obj/machinery/door/airlock/medical{ name = "Recovery Room" }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white/side{ dir = 4 }, @@ -2784,8 +2793,7 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -2794,6 +2802,7 @@ dir = 8 }, /obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plating, /area/mine/storage) "Ke" = ( @@ -3161,19 +3170,18 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/effect/turf_decal/siding/wideplating, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva) "PS" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Station Maintenance"; - req_access_txt = "48" + name = "Mining Station Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -3190,6 +3198,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark/side{ dir = 8 }, @@ -3212,8 +3221,7 @@ /area/mine/maintenance) "Qv" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mining Station EVA"; - req_access_txt = "54" + name = "Mining Station EVA" }, /obj/structure/cable{ icon_state = "1-2" @@ -3227,6 +3235,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva) "QE" = ( @@ -3315,6 +3324,9 @@ dir = 4 }, /obj/machinery/door/airlock/medical, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white, /area/mine/infirmary) "RR" = ( @@ -3414,8 +3426,7 @@ /area/mine/break_room) "Tf" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Mining Station Atmospherics"; - req_access_txt = "48" + name = "Mining Station Atmospherics" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -3423,6 +3434,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark/side{ dir = 8 }, @@ -3443,7 +3455,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/door/airlock/engineering/glass, +/obj/machinery/door/airlock/engineering/glass{ + name = "Vacant Room" + }, /turf/open/floor/plasteel, /area/mine/vacant) "TG" = ( diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index 8b2b1af62a6e..0e1d61200f03 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -387,12 +387,12 @@ /area/ruin/space/derelict/bridge/ai_upload) "bh" = ( /obj/machinery/door/airlock/engineering{ - name = "Starboard Solar Access"; - req_access_txt = "10" + name = "Starboard Solar Access" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plasteel, /area/ruin/space/derelict/solar_control) "bi" = ( @@ -910,19 +910,19 @@ /area/ruin/space/derelict/bridge/access) "cV" = ( /obj/machinery/door/airlock/command{ - name = "E.V.A."; - req_access_txt = "18" + name = "E.V.A." }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/command, /turf/open/floor/plasteel, /area/ruin/space/derelict/bridge/access) "cW" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Secure Storage"; - req_access_txt = "10" + name = "Engineering Secure Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plasteel, /area/ruin/space/derelict/bridge/access) "cX" = ( @@ -946,9 +946,9 @@ /area/ruin/space/derelict/gravity_generator) "da" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Access"; - req_access_txt = "10" + name = "Engineering Access" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plasteel, /area/ruin/space/derelict/gravity_generator) "db" = ( @@ -1113,8 +1113,7 @@ /area/ruin/space/derelict/singularity_engine) "dC" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Access"; - req_access_txt = "10" + name = "Engineering Access" }, /obj/structure/cable{ icon_state = "1-2" @@ -1122,6 +1121,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plating/airless, /area/ruin/space/derelict/gravity_generator) "dD" = ( @@ -1225,12 +1225,12 @@ /area/ruin/space/derelict/singularity_engine) "dT" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Access"; - req_access_txt = "10" + name = "Engineering Access" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plasteel, /area/ruin/space/derelict/gravity_generator) "dU" = ( @@ -1412,8 +1412,10 @@ /area/ruin/space/derelict/singularity_engine) "eB" = ( /obj/machinery/door/window/eastleft{ - name = "Heads of Staff"; - req_access_txt = "19" + name = "Heads of Staff" + }, +/obj/effect/mapping_helpers/windoor/access/all/ruins/command{ + dir = 4 }, /turf/open/floor/plasteel, /area/ruin/space/derelict/bridge/access) @@ -1642,10 +1644,10 @@ "fp" = ( /obj/machinery/door/window{ dir = 2; - name = "Captain's Quarters"; - req_access_txt = "20" + name = "Captain's Quarters" }, /obj/structure/grille, +/obj/effect/mapping_helpers/windoor/access/all/ruins/command, /turf/open/floor/plating/airless, /area/ruin/space/derelict/bridge) "fq" = ( @@ -1813,9 +1815,9 @@ /area/ruin/space/derelict/singularity_engine) "fR" = ( /obj/machinery/door/airlock/maintenance{ - name = "Tech Storage"; - req_access_txt = "23" + name = "Tech Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/bridge/access) "fS" = ( @@ -2217,9 +2219,9 @@ /area/ruin/space/derelict/medical/chapel) "hu" = ( /obj/machinery/door/airlock/medical{ - name = "Morgue"; - req_access_txt = "6" + name = "Morgue" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/medical, /turf/open/floor/plasteel/dark, /area/ruin/space/derelict/medical/chapel) "hv" = ( @@ -2277,9 +2279,9 @@ /area/ruin/space/derelict/medical/chapel) "hG" = ( /obj/machinery/door/morgue{ - name = "coffin storage"; - req_access_txt = "22" + name = "coffin storage" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/dark, /area/ruin/space/derelict/medical/chapel) "hH" = ( @@ -2585,10 +2587,12 @@ id = "derelict_gun" }, /obj/machinery/door/window{ - dir = 4; - req_access_txt = "25" + dir = 4 }, /obj/structure/closet/crate/coffin, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general{ + dir = 4 + }, /turf/open/floor/plating, /area/ruin/space/derelict/medical/chapel) "iL" = ( @@ -2696,9 +2700,9 @@ /area/ruin/space/derelict/medical) "ja" = ( /obj/machinery/door/airlock/public/glass{ - name = "Med-Sci"; - req_access_txt = "9" + name = "Med-Sci" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/science, /turf/open/floor/plating/airless, /area/ruin/space/derelict/medical) "jb" = ( @@ -2930,9 +2934,9 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/research{ - name = "Toxins Research"; - req_access_txt = "7" + name = "Toxins Research" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/science, /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/hallway/primary) "jR" = ( @@ -3043,9 +3047,9 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/research{ - name = "Toxins Research"; - req_access_txt = "7" + name = "Toxins Research" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/science, /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/arrival) "ki" = ( @@ -3070,6 +3074,7 @@ /obj/machinery/door/airlock/command{ name = "Teleporter Room" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/command, /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/medical/chapel) "km" = ( @@ -3226,12 +3231,12 @@ /area/ruin/space/derelict/hallway/primary) "kR" = ( /obj/machinery/door/airlock/security{ - name = "Security"; - req_access_txt = "1" + name = "Security" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/security, /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/hallway/primary) "kS" = ( @@ -3302,9 +3307,9 @@ /area/ruin/space/derelict/hallway/primary) "lh" = ( /obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Access"; - req_access_txt = "24" + name = "Atmospherics Access" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/primary) "li" = ( @@ -3488,9 +3493,9 @@ /area/ruin/space/derelict/atmospherics) "lP" = ( /obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Access"; - req_access_txt = "24" + name = "Atmospherics Access" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plating/airless, /area/ruin/space/derelict/atmospherics) "lQ" = ( @@ -3789,9 +3794,9 @@ /area/ruin/space/derelict/hallway/secondary) "mW" = ( /obj/machinery/door/airlock/maintenance{ - name = "Aux Storage"; - req_access_txt = "23" + name = "Aux Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/secondary) "mX" = ( @@ -4000,9 +4005,9 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/engineering{ - name = "Aft Solar Access"; - req_access_txt = "10" + name = "Aft Solar Access" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/se_solar) "nD" = ( @@ -4057,9 +4062,9 @@ icon_state = "1-8" }, /obj/machinery/door/airlock/engineering{ - name = "Aft Solar Access"; - req_access_txt = "10" + name = "Aft Solar Access" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/se_solar) "nM" = ( @@ -4475,10 +4480,10 @@ /area/ruin/space/derelict/singularity_engine) "RF" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Access"; - req_access_txt = "10" + name = "Engineering Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plasteel, /area/ruin/space/derelict/gravity_generator) "Sv" = ( diff --git a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm index 3bf27aeb68a6..2093355551c3 100644 --- a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm +++ b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm @@ -181,9 +181,9 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/highsecurity{ - name = "Bio Containment"; - req_one_access_txt = "47" + name = "Bio Containment" }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/dark/side, /area/ruin/space/has_grav/abandonedzoo) "aE" = ( diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm index f5b99d72b918..c6eac51cbe7d 100644 --- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm +++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm @@ -503,8 +503,7 @@ "by" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "innerbrig"; - name = "Security Checkpoint"; - req_access_txt = "63" + name = "Security Checkpoint" }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -516,6 +515,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/derelictoutpost) "bz" = ( @@ -588,6 +588,11 @@ icon_state = "smooth"; name = "gelatinous wall" }, +/obj/structure/alien/resin/wall{ + color = "#8EC127"; + desc = "Thick material shaped into a wall. Eugh."; + name = "gelatinous wall" + }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost) "bG" = ( @@ -978,13 +983,13 @@ /area/ruin/space/has_grav/derelictoutpost/powerstorage) "cr" = ( /obj/machinery/door/airlock/engineering{ - name = "Power Storage"; - req_access_txt = "10" + name = "Power Storage" }, -/obj/structure/barricade/wooden, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/structure/barricade/wooden, /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost/powerstorage) "cs" = ( @@ -1783,17 +1788,16 @@ }, /area/ruin/space/has_grav/derelictoutpost) "dO" = ( -/obj/structure/alien/resin/membrane{ - color = "#4BAE56"; - desc = "A strange combination of thin, gelatinous material."; - icon_state = "smooth"; - name = "gelatinous membrane" - }, /obj/effect/decal/cleanable/blood/old{ dir = 8; icon_state = "trails_1"; name = "dried blood trail" }, +/obj/structure/alien/resin/membrane{ + color = "#4BAE56"; + desc = "A strange combination of thin, gelatinous material."; + name = "gelatinous membrane" + }, /turf/open/floor/plating{ icon_state = "wall_thermite"; name = "melted wall" @@ -1833,6 +1837,11 @@ icon_state = "smooth"; name = "gelatinous membrane" }, +/obj/structure/alien/resin/wall{ + color = "#8EC127"; + desc = "Thick material shaped into a wall. Eugh."; + name = "gelatinous wall" + }, /turf/open/floor/plating/asteroid, /area/ruin/space/has_grav/derelictoutpost) "dS" = ( @@ -1940,7 +1949,6 @@ /obj/structure/alien/resin/membrane{ color = "#4BAE56"; desc = "A strange combination of thin, gelatinous material."; - icon_state = "smooth"; name = "gelatinous membrane" }, /turf/open/floor/plating/asteroid/airless, @@ -2005,7 +2013,6 @@ /obj/structure/alien/resin/wall{ color = "#8EC127"; desc = "Thick material shaped into a wall. Eugh."; - icon_state = "smooth"; name = "gelatinous wall" }, /turf/open/floor/plating/asteroid, @@ -2188,6 +2195,20 @@ /obj/machinery/door/airlock/maintenance, /turf/open/floor/plating, /area/ruin/space/has_grav/derelictoutpost/cargobay) +"rI" = ( +/obj/structure/alien/resin/wall{ + color = "#8EC127"; + desc = "Thick material shaped into a wall. Eugh."; + icon_state = "smooth"; + name = "gelatinous wall" + }, +/obj/structure/alien/resin/wall{ + color = "#8EC127"; + desc = "Thick material shaped into a wall. Eugh."; + name = "gelatinous wall" + }, +/turf/open/floor/plating/asteroid, +/area/ruin/unpowered/no_grav) "uV" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -2195,6 +2216,20 @@ }, /turf/open/floor/plating, /area/ruin/space/has_grav/derelictoutpost/powerstorage) +"Ks" = ( +/obj/structure/alien/resin/wall{ + color = "#8EC127"; + desc = "Thick material shaped into a wall. Eugh."; + icon_state = "smooth"; + name = "gelatinous wall" + }, +/obj/structure/alien/resin/wall{ + color = "#8EC127"; + desc = "Thick material shaped into a wall. Eugh."; + name = "gelatinous wall" + }, +/turf/open/floor/plating/asteroid, +/area/ruin/space/has_grav/derelictoutpost) "LB" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -3164,8 +3199,8 @@ aZ dO aZ en -en -en +rI +rI ad ad aa @@ -3201,8 +3236,8 @@ dP cR cR cR -cm -cm +Ks +Ks aa aa aa @@ -3238,9 +3273,9 @@ eg cR cR cR -cm -cm -cm +Ks +Ks +Ks aa aa aa @@ -3276,7 +3311,7 @@ ev dD cR cR -cm +Ks aa aa aa @@ -3343,10 +3378,10 @@ cC bl cC dD -cm -cm -cm -cm +Ks +Ks +Ks +Ks cR dR aa @@ -3379,12 +3414,12 @@ bF bF bl cR -cm +Ks cR cR cR cR -cm +Ks aa aa aa @@ -3415,12 +3450,12 @@ bl bF bl bl -cm +Ks dt -cm -cm -cm -cm +Ks +Ks +Ks +Ks aa aa aa @@ -3451,9 +3486,9 @@ bl bF dk cR -cm +Ks cR -cm +Ks aa aa aa @@ -3486,8 +3521,8 @@ bF bl bF bl -cm -cm +Ks +Ks eg dR aa @@ -3516,13 +3551,13 @@ bX cl cD cR -cm +Ks dm -cm +Ks dD -cm -cm -cm +Ks +Ks +Ks cR bl dR @@ -3552,7 +3587,7 @@ aZ aZ cE cR -cm +Ks dn du cR @@ -3561,7 +3596,7 @@ cR cR cR ev -cm +Ks aa aa aa @@ -3585,19 +3620,19 @@ ad aC aC aC -cm +Ks cF cS cZ do cR -cm -cm +Ks +Ks dR dR dR -cm -cm +Ks +Ks aa aa aa @@ -3621,13 +3656,13 @@ ad ad ad aC -cm -cm -cm -cm -cm -cm -cm +Ks +Ks +Ks +Ks +Ks +Ks +Ks aa ad ad diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm index d5d5cfa4580a..db8e8a74a620 100644 --- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm +++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm @@ -461,10 +461,9 @@ /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter3) "gc" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter3) "gd" = ( @@ -623,10 +622,9 @@ /area/shuttle/caravan/freighter2) "hs" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter2) "ht" = ( @@ -1202,12 +1200,11 @@ /turf/closed/wall/mineral/plastitanium, /area/ruin/unpowered) "vE" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter3) "vN" = ( @@ -1233,12 +1230,11 @@ /area/shuttle/caravan/freighter2) "GL" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter2) "JZ" = ( diff --git a/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm b/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm index 3adef24b4e1d..1cca56bea561 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm @@ -44,13 +44,10 @@ "k" = ( /obj/structure/closet/secure_closet{ name = "clown locker"; - req_access_txt = "46" + req_access = list("theatre") }, /obj/item/clothing/shoes/clown_shoes/banana_shoes, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/mineral/bananium/airless, /area/ruin/unpowered) "l" = ( diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index 886d8e1f10c3..4551aae96d27 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -13,8 +13,7 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4; - icon_state = "vent_map_on-1" + dir = 4 }, /turf/open/floor/plasteel/freezer, /area/ruin/space/has_grav/deepstorage/kitchen) @@ -308,8 +307,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4; - icon_state = "vent_map_on-1" + dir = 4 }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage) @@ -322,21 +320,21 @@ /area/ruin/space/has_grav/deepstorage) "aO" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Recycling Room"; - req_access_txt = "200" + name = "Recycling Room" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage/crusher) "aP" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Recycling Room"; - req_access_txt = "200" + name = "Recycling Room" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage/crusher) "aQ" = ( @@ -497,8 +495,7 @@ "bh" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8; - icon_state = "vent_map_on-1" + dir = 8 }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage/storage) @@ -567,8 +564,7 @@ pixel_x = 24 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8; - icon_state = "vent_map_on-1" + dir = 8 }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage/hydroponics) @@ -654,12 +650,12 @@ /area/ruin/space/has_grav/deepstorage/hydroponics) "bC" = ( /obj/machinery/door/airlock/highsecurity{ - name = "General Storage"; - req_access_txt = "200" + name = "General Storage" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage/storage) "bD" = ( @@ -1010,8 +1006,7 @@ /area/ruin/space/has_grav/deepstorage/storage) "cl" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Provisions Storage"; - req_access_txt = "200" + name = "Provisions Storage" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -1023,6 +1018,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage/storage) "cm" = ( @@ -1203,8 +1199,7 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4; - icon_state = "vent_map_on-1" + dir = 4 }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage) @@ -1292,9 +1287,9 @@ /area/ruin/space/has_grav/deepstorage/storage) "cP" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Secure Storage"; - req_access_txt = "200" + name = "Secure Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/deepstorage/armory) "cQ" = ( @@ -1735,8 +1730,7 @@ /area/ruin/space/has_grav/deepstorage) "dM" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Secure Storage"; - req_access_txt = "200" + name = "Secure Storage" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -1747,6 +1741,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/deepstorage/armory) "dN" = ( @@ -1790,8 +1785,7 @@ /area/ruin/space/has_grav/deepstorage/armory) "dQ" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Airlock Control"; - req_access_txt = "200" + name = "Airlock Control" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1799,6 +1793,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage/airlock) "dR" = ( @@ -1894,23 +1889,23 @@ /area/ruin/space/has_grav/deepstorage) "dZ" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Atmospherics and Power Storage"; - req_access_txt = "200" + name = "Atmospherics and Power Storage" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage/power) "ea" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Atmospherics and Power Storage"; - req_access_txt = "200" + name = "Atmospherics and Power Storage" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage/power) "eb" = ( @@ -1954,8 +1949,7 @@ /area/ruin/space/has_grav/deepstorage/dorm) "eg" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1; - icon_state = "vent_map_on-1" + dir = 1 }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/deepstorage/armory) @@ -2010,16 +2004,15 @@ /obj/structure/chair/stool, /obj/machinery/light/small, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4; - icon_state = "vent_map_on-1" + dir = 4 }, /turf/open/floor/wood, /area/ruin/space/has_grav/deepstorage/dorm) "en" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Canister Storage"; - req_access_txt = "200" + name = "Canister Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage) "eo" = ( @@ -2159,20 +2152,20 @@ name = "exterior blast door access"; pixel_x = -24; pixel_y = -8; - req_access_txt = "200" + req_access = list("ruins_general") }, /obj/machinery/button/door{ id = "bunkerinterior"; name = "interior blast door access"; pixel_x = -24; - req_access_txt = "200" + req_access = list("ruins_general") }, /obj/machinery/button/door{ id = "bunkershutter"; name = "hallway shutter toggle"; pixel_x = -24; pixel_y = 8; - req_access_txt = "200" + req_access = list("ruins_general") }, /obj/machinery/computer/security/telescreen{ dir = 1; @@ -2200,8 +2193,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4; - icon_state = "vent_map_on-1" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -2592,8 +2584,7 @@ /obj/machinery/light, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1; - icon_state = "vent_map_on-1" + dir = 1 }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage/airlock) @@ -2624,7 +2615,6 @@ "fz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on/layer2{ dir = 8; - icon_state = "vent_map_siphon_on-1"; id_tag = "o2_out_bunker"; name = "oxygen out" }, @@ -2787,8 +2777,7 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1; - icon_state = "vent_map_on-1" + dir = 1 }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/deepstorage/dorm) @@ -2834,7 +2823,6 @@ "gf" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on/layer2{ dir = 8; - icon_state = "vent_map_siphon_on-1"; id_tag = "n2_out_bunker"; name = "nitrogen out" }, @@ -2943,10 +2931,10 @@ "gz" = ( /obj/machinery/door/airlock/highsecurity{ desc = "Nothing to see here, folks, just an inconspicuous airlock. Now go away!"; - name = "Inconspicuous Airlock"; - req_access_txt = "200" + name = "Inconspicuous Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage) "gC" = ( @@ -3013,12 +3001,12 @@ /area/ruin/space/has_grav/deepstorage/power) "gL" = ( /obj/machinery/door/airlock/highsecurity{ - name = "RTG Observation"; - req_access_txt = "200" + name = "RTG Observation" }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage/power) "gN" = ( @@ -3028,13 +3016,13 @@ "gQ" = ( /obj/machinery/door/airlock/highsecurity{ desc = "Nothing to see here, folks, just an inconspicuous airlock. Now go away!"; - name = "Inconspicuous Airlock"; - req_access_txt = "200" + name = "Inconspicuous Airlock" }, /obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage) "gR" = ( @@ -3064,9 +3052,9 @@ /area/ruin/space/has_grav/deepstorage/power) "gY" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Telecomms"; - req_access_txt = "200" + name = "Telecomms" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage/power) "gZ" = ( diff --git a/_maps/RandomRuins/SpaceRuins/gameroom.dmm b/_maps/RandomRuins/SpaceRuins/gameroom.dmm index e146bce6fedc..7eafae0e9cc8 100644 --- a/_maps/RandomRuins/SpaceRuins/gameroom.dmm +++ b/_maps/RandomRuins/SpaceRuins/gameroom.dmm @@ -251,7 +251,7 @@ name = "Secure Snack Storage Lockdown"; pixel_x = 23; pixel_y = -21; - req_access_txt = "200" + req_access = list("ruins_general") }, /turf/open/floor/carpet, /area/ruin/space/has_grav/powered/gaming) @@ -594,7 +594,6 @@ /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; pixel_x = -32; - req_access_txt = "0"; use_power = 0 }, /turf/open/floor/carpet, @@ -687,8 +686,7 @@ "EO" = ( /obj/machinery/door/airlock/vault{ id_tag = "snack_vault"; - name = "Secure Snack Storage"; - req_access_txt = "200" + name = "Secure Snack Storage" }, /obj/machinery/door/poddoor/preopen{ id = "snack_vault"; @@ -701,6 +699,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/powered/gaming) "Gt" = ( @@ -918,7 +917,7 @@ name = "Secure Snack Storage Lockdown"; pixel_x = -22; pixel_y = -21; - req_access_txt = "200" + req_access = list("ruins_general") }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/powered/gaming) diff --git a/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm b/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm index 8cbb2290e82b..6424c3e13e95 100644 --- a/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm +++ b/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm @@ -145,10 +145,10 @@ /area/ruin/space/has_grav/hilbertresearchfacility) "z" = ( /obj/machinery/door/airlock/vault{ - name = "secured door"; - req_access = 207 + name = "secured door" }, /obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/access/all/ruins/generic3, /turf/open/floor/plasteel/grimy{ icon_state = "engine" }, @@ -187,10 +187,9 @@ /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/hilbertresearchfacility) "I" = ( -/obj/machinery/door/airlock/highsecurity{ - req_access = 207 - }, +/obj/machinery/door/airlock/highsecurity, /obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/access/all/ruins/generic3, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/hilbertresearchfacility) "J" = ( diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 8b64f833c5f9..c1a7bc2efc3f 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -32,6 +32,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/plasteel/stairs/goon/white_stairs_alone{ dir = 1 }, @@ -45,7 +46,7 @@ dir = 4 }, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, /turf/open/floor/plasteel/dark, @@ -65,8 +66,7 @@ /area/ruin/space/has_grav/listeningstation/quarters) "ai" = ( /obj/machinery/door/airlock/grunge{ - name = "Bathroom"; - req_access_txt = "150" + name = "Bathroom" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -75,6 +75,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/listeningstation/quarters) "aj" = ( @@ -234,8 +235,7 @@ "aO" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - id_tag = "syndie_listeningpost_external_engi"; - req_access_txt = "150" + id_tag = "syndie_listeningpost_external_engi" }, /obj/structure/cable{ icon_state = "1-2" @@ -243,6 +243,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/sand/plating, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/engineering) "aP" = ( @@ -261,9 +262,7 @@ /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) "aT" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/maintenance_hatch, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -279,6 +278,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/engineering) "aU" = ( @@ -310,6 +310,7 @@ "aX" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/wood, /area/ruin/space/has_grav/listeningstation/quarters) "aY" = ( @@ -336,7 +337,7 @@ id = "lpost_privacy_left"; name = "Privacy Shutters"; pixel_y = 23; - req_access_txt = "150" + req_access = list("syndicate") }, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) @@ -436,10 +437,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/power/apc/auto_name/west{ - pixel_x = -25; - req_access = list(150) - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -447,6 +444,10 @@ icon_state = "0-2" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/syndicate{ + name = "Maintenance APC"; + pixel_x = -25 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/engineering) "by" = ( @@ -481,8 +482,9 @@ name = "Airlock Emergency Bolts"; normaldoorcontrol = 1; pixel_y = -24; - req_access_txt = "150"; - specialfunctions = 4 + req_access = list("syndicate"); + specialfunctions = 4; + pixel_x = -3 }, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/engineering) @@ -802,6 +804,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/plasteel/stairs/goon/stairs_alone{ dir = 1 }, @@ -875,6 +878,9 @@ /area/ruin/space/has_grav/listeningstation/quarters) "hp" = ( /obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/stairs/goon/white_stairs_alone, /area/ruin/space/has_grav/listeningstation/quarters) "hr" = ( @@ -885,6 +891,9 @@ dir = 1 }, /obj/item/kirbyplants, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) "hv" = ( @@ -902,10 +911,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23; - req_access = list(150) - }, /obj/structure/cable{ icon_state = "0-4" }, @@ -917,6 +922,10 @@ /obj/item/stock_parts/cell/bluespace, /obj/item/stock_parts/cell/bluespace, /obj/item/storage/part_replacer/bluespace, +/obj/machinery/power/apc/syndicate{ + pixel_y = 23; + name = "Warehouse APC" + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/warehouse) "hW" = ( @@ -931,9 +940,12 @@ dir = 10 }, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) "il" = ( @@ -948,7 +960,7 @@ id = "lpost_warehouse"; name = "Warehouse Shutters"; pixel_y = -24; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/effect/turf_decal/delivery, /obj/structure/closet/crate/critter, @@ -1014,6 +1026,9 @@ /obj/structure/closet/wardrobe/black{ anchored = 1 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) "iz" = ( @@ -1068,8 +1083,7 @@ /area/ruin/space/has_grav/listeningstation/hallway) "iO" = ( /obj/structure/closet/secure_closet/medical1{ - req_access = null; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 @@ -1083,7 +1097,7 @@ id = "lpost_privacy_right"; name = "Privacy Shutters"; pixel_y = 23; - req_access_txt = "150" + req_access = list("syndicate") }, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) @@ -1099,14 +1113,10 @@ /area/ruin/space/has_grav/listeningstation/telecomms) "jn" = ( /obj/machinery/door/window/northright{ - name = "Document Storage"; - req_access_txt = "150" + name = "Document Storage" }, /obj/item/paper/monitorkey, /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /obj/item/paper/fluff/ruins/listeningstation/odd_report, /obj/item/paper/fluff/ruins/listeningstation/receipt, /obj/item/paper/fluff/ruins/listeningstation/reports/april, @@ -1125,6 +1135,9 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/telecomms) "jo" = ( @@ -1144,9 +1157,6 @@ /obj/structure/flora/tree/jungle/small, /turf/open/floor/plating/asteroid, /area/ruin/space/has_grav/listeningstation/quarters) -"jw" = ( -/turf/closed/wall/rust, -/area/ruin/space/has_grav/listeningstation) "jB" = ( /obj/effect/baseturf_helper/asteroid/airless, /turf/closed/wall/explosive, @@ -1227,20 +1237,18 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - id_tag = "syndie_listeningpost_external"; - req_access_txt = "150" + id_tag = "syndie_listeningpost_external" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/airlock) "kR" = ( -/obj/structure/closet/syndicate{ - req_access_txt = "150" - }, +/obj/structure/closet/syndicate, /obj/effect/decal/cleanable/dirt, /obj/item/ammo_box/a357, /obj/item/crowbar/red, @@ -1320,10 +1328,6 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/hallway) "ms" = ( -/obj/machinery/power/apc/auto_name/west{ - pixel_x = -25; - req_access = list(150) - }, /obj/structure/cable{ icon_state = "0-4" }, @@ -1331,6 +1335,10 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, +/obj/machinery/power/apc/syndicate{ + name = "Telecommunications APC"; + pixel_x = -25 + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/telecomms) "na" = ( @@ -1446,6 +1454,7 @@ /area/ruin/space/has_grav/listeningstation/quarters) "rO" = ( /obj/machinery/oven, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/wood, /area/ruin/space/has_grav/listeningstation/quarters) "rP" = ( @@ -1459,6 +1468,9 @@ /obj/structure/sign/poster/contraband/random{ pixel_x = 32 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/stairs/goon/stairs_alone, /area/ruin/space/has_grav/listeningstation/quarters) "rW" = ( @@ -1556,11 +1568,11 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/auto_name/north{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/syndicate{ pixel_y = 23; - req_access = list(150) + name = "Crew Quarters APC" }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/quarters) "tz" = ( @@ -1572,6 +1584,7 @@ "tF" = ( /obj/structure/table/reinforced, /obj/machinery/reagentgrinder/kitchen, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/wood, /area/ruin/space/has_grav/listeningstation/quarters) "tG" = ( @@ -1593,8 +1606,7 @@ /area/ruin/space/has_grav/listeningstation/quarters) "tK" = ( /obj/machinery/door/airlock/grunge{ - name = "Cabin"; - req_access_txt = "150" + name = "Cabin" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -1605,6 +1617,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) "tO" = ( @@ -1651,9 +1664,8 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/hallway) "um" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/quarters) "uy" = ( @@ -1680,7 +1692,7 @@ /obj/machinery/advanced_airlock_controller{ dir = 0; pixel_x = 24; - req_access = list(150) + req_access = list("syndicate") }, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/engineering) @@ -1790,9 +1802,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/telecomms) "we" = ( -/obj/structure/closet/syndicate{ - req_access_txt = "150" - }, +/obj/structure/closet/syndicate, /obj/item/ammo_box/magazine/m10mm, /obj/item/crowbar/red, /obj/item/clothing/head/HoS/beret/syndicate, @@ -1822,6 +1832,9 @@ faction = list("Syndicate"); name = "Cayenne II" }, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) "wp" = ( @@ -1907,19 +1920,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/listeningstation/hallway) -"yI" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23; - req_access = list(150) - }, -/turf/open/floor/plating/asteroid/airless, -/area/ruin/space/has_grav/listeningstation) "yN" = ( /turf/closed/wall/r_wall, /area/ruin/space/has_grav/listeningstation/telecomms) @@ -1952,6 +1952,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/wood/broken/six, /area/ruin/space/has_grav/listeningstation/quarters) "zg" = ( @@ -2053,7 +2054,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/mineral/ore_redemption{ - req_access = list(150) + req_access = list("syndicate") }, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/quarters) @@ -2072,7 +2073,7 @@ pixel_y = 23 }, /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = list(150) + req_access = list("syndicate") }, /obj/item/reagent_containers/food/condiment/enzyme, /obj/item/reagent_containers/food/snacks/meat/slab, @@ -2080,12 +2081,12 @@ /obj/item/reagent_containers/food/snacks/meat/slab, /obj/item/reagent_containers/food/snacks/meat/slab, /obj/item/reagent_containers/food/snacks/meat/slab, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/wood, /area/ruin/space/has_grav/listeningstation/quarters) "Da" = ( /obj/machinery/door/airlock/grunge{ - name = "Shower"; - req_access_txt = "150" + name = "Shower" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -2094,6 +2095,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/listeningstation/quarters) "Dk" = ( @@ -2337,6 +2339,7 @@ "IC" = ( /obj/machinery/griddle, /obj/item/reagent_containers/glass/mixbowl, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/wood, /area/ruin/space/has_grav/listeningstation/quarters) "IU" = ( @@ -2361,7 +2364,8 @@ id = "lpost_warehouse"; name = "Warehouse Shutters"; pixel_x = -24; - req_access_txt = "150" + req_access = list("syndicate"); + pixel_y = 6 }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/airlock) @@ -2381,10 +2385,6 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) "JQ" = ( -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23; - req_access = list(150) - }, /obj/structure/cable{ icon_state = "0-4" }, @@ -2393,6 +2393,10 @@ dir = 1 }, /obj/item/kirbyplants/random, +/obj/machinery/power/apc/syndicate{ + pixel_y = 23; + name = "Central Hallway APC" + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/hallway) "JS" = ( @@ -2441,7 +2445,7 @@ department = "Unidentified"; desc = "Used to send black pages to Nanotrasen stations."; name = "Syndicate Fax Machine"; - req_one_access = list(150) + req_access = list("syndicate") }, /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, @@ -2714,6 +2718,12 @@ /obj/item/kirbyplants/random, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/hallway) +"OQ" = ( +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, +/turf/open/floor/plasteel/grimy, +/area/ruin/space/has_grav/listeningstation/quarters) "OV" = ( /obj/machinery/light/small{ brightness = 3; @@ -2734,10 +2744,6 @@ /turf/open/floor/plating/asteroid, /area/ruin/space/has_grav/listeningstation) "OZ" = ( -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23; - req_access = list(150) - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, @@ -2751,6 +2757,10 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/power/apc/syndicate{ + pixel_y = 23; + name = "Dock APC" + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/airlock) "Pa" = ( @@ -2835,12 +2845,12 @@ "Qq" = ( /obj/structure/table/reinforced, /obj/machinery/microwave, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/wood, /area/ruin/space/has_grav/listeningstation/quarters) "QE" = ( /obj/machinery/door/window/northleft{ - name = "Telecommunications"; - req_access_txt = "150" + name = "Telecommunications" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -2849,6 +2859,9 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/telecomms) "QO" = ( @@ -2881,11 +2894,11 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/warehouse) "Ri" = ( +/obj/structure/fans/tiny, /obj/machinery/door/airlock/hatch{ - name = "Telecommunications"; - req_access_txt = "150" + name = "Telecommunications" }, -/obj/structure/holosign/barrier/atmos, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/telecomms) "RB" = ( @@ -2899,14 +2912,14 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - id_tag = "syndie_listeningpost_external_engi"; - req_access_txt = "150" + id_tag = "syndie_listeningpost_external_engi" }, /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/turf_decal/sand/plating, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/engineering) "Si" = ( @@ -2942,8 +2955,7 @@ /area/ruin/space/has_grav/listeningstation/airlock) "Su" = ( /obj/machinery/door/airlock/grunge{ - name = "Cabin"; - req_access_txt = "150" + name = "Cabin" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -2954,6 +2966,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) "SG" = ( @@ -2978,7 +2991,7 @@ /obj/machinery/advanced_airlock_controller{ dir = 0; pixel_x = 24; - req_access = list(150) + req_access = list("syndicate") }, /obj/machinery/light/small{ brightness = 3; @@ -3030,11 +3043,11 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/window/survival_pod{ - name = "Showcase and Self-Destruct Access"; - req_access_txt = "150" + name = "Showcase and Self-Destruct Access" }, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/tile/red/fourcorners, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/hallway) "TO" = ( @@ -3064,8 +3077,8 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/hallway) "UC" = ( -/obj/effect/spawner/structure/window/reinforced/shutter, -/turf/open/floor/plasteel/grimy, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/quarters) "UF" = ( /obj/machinery/vending/boozeomat/syndicate_access, @@ -3097,25 +3110,27 @@ /obj/structure/table/reinforced, /obj/item/storage/box/donkpockets, /obj/item/storage/box/donkpockets, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/wood, /area/ruin/space/has_grav/listeningstation/quarters) "Vu" = ( /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/wood, /area/ruin/space/has_grav/listeningstation/quarters) "VE" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/airlock/external{ - id_tag = "syndie_listeningpost_external"; - req_access_txt = "150" + id_tag = "syndie_listeningpost_external" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/airlock) "VH" = ( @@ -3135,7 +3150,7 @@ name = "Airlock Emergency Bolts"; normaldoorcontrol = 1; pixel_x = 24; - req_access_txt = "150"; + req_access = list("syndicate"); specialfunctions = 4 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -3224,9 +3239,9 @@ dir = 4 }, /obj/machinery/door/airlock/highsecurity{ - name = "Telecommunications"; - req_access_txt = "150" + name = "Telecommunications" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation/telecomms) "Xl" = ( @@ -3271,6 +3286,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) "XE" = ( @@ -3287,14 +3305,13 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/maintenance_hatch, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation/quarters) "XI" = ( @@ -3371,6 +3388,9 @@ dir = 1 }, /obj/item/kirbyplants, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation/quarters) "YH" = ( @@ -3845,7 +3865,7 @@ sb kz aY pp -aV +OQ af wj cR @@ -3883,9 +3903,9 @@ aN zV NN Nn -tg -aV +UC aV +OQ tg iO ua @@ -4564,8 +4584,8 @@ Mw NO NO NO -jw -yI +NO +lq NO NO NO diff --git a/_maps/RandomRuins/SpaceRuins/mechtransport.dmm b/_maps/RandomRuins/SpaceRuins/mechtransport.dmm index 5bc1da717495..96e887c1dc4b 100644 --- a/_maps/RandomRuins/SpaceRuins/mechtransport.dmm +++ b/_maps/RandomRuins/SpaceRuins/mechtransport.dmm @@ -60,9 +60,9 @@ /area/ruin/space/has_grav/powered/mechtransport) "p" = ( /obj/machinery/door/airlock/hatch{ - name = "Cockpit"; - req_access_txt = "101" + name = "Cockpit" }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/mineral/titanium, /area/ruin/space/has_grav/powered/mechtransport) "r" = ( diff --git a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm index 9af5ce7cbb6c..7728da275271 100644 --- a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm +++ b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm @@ -85,16 +85,16 @@ /area/ruin/space/has_grav/powered/cat_man) "aq" = ( /obj/machinery/door/airlock/maintenance_hatch{ - name = "Misc Supplies"; - req_access_txt = "201" + name = "Misc Supplies" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "ar" = ( /obj/machinery/door/airlock/maintenance_hatch{ - name = "Custodial Supplies"; - req_access_txt = "201" + name = "Custodial Supplies" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "as" = ( @@ -162,10 +162,10 @@ name = "kitty protection door" }, /obj/machinery/door/window{ - name = "kitty door"; - req_access_txt = "200" + name = "kitty door" }, /obj/machinery/atmospherics/pipe/simple/green/hidden, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "aB" = ( @@ -293,12 +293,14 @@ name = "kitty protection door" }, /obj/machinery/door/window/westleft{ - name = "kitty door"; - req_access_txt = "200" + name = "kitty door" }, /obj/machinery/atmospherics/pipe/simple/green/hidden{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general{ + dir = 8 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "aR" = ( @@ -619,10 +621,12 @@ name = "kitty protection door" }, /obj/machinery/door/window/northleft{ - name = "kitty door"; - req_access_txt = "200" + name = "kitty door" }, /obj/machinery/atmospherics/pipe/simple/green/hidden, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general{ + dir = 1 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "bJ" = ( @@ -754,10 +758,9 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "bY" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "201" - }, +/obj/machinery/door/airlock/maintenance_hatch, /obj/machinery/atmospherics/pipe/simple/green/hidden, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "bZ" = ( @@ -780,10 +783,10 @@ /area/ruin/space/has_grav/powered/cat_man) "cc" = ( /obj/machinery/door/airlock{ - name = "Limb Storage"; - req_access_txt = "200" + name = "Limb Storage" }, /obj/machinery/atmospherics/pipe/simple/dark/hidden, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/freezer, /area/ruin/space/has_grav/powered/cat_man) "cd" = ( @@ -810,9 +813,9 @@ /area/ruin/space/has_grav/powered/cat_man) "cg" = ( /obj/machinery/door/airlock/maintenance_hatch{ - name = "Portable Atmos Equipment"; - req_access_txt = "201" + name = "Portable Atmos Equipment" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/powered/cat_man) "ch" = ( diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index b6ab5b15bcb6..414bb6cb0c74 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -2362,7 +2362,7 @@ /obj/item/assembly/flash/handheld, /obj/item/storage/box/firingpins, /obj/structure/closet/crate/secure/weapon{ - req_access_txt = "203" + req_access = list("ruins_security") }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/deltacorridor) @@ -4587,8 +4587,7 @@ "qc" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/highsecurity{ - name = "Prototype Laboratory"; - req_access_txt = "200" + name = "Prototype Laboratory" }, /obj/structure/cable{ icon_state = "1-2" @@ -4597,20 +4596,21 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/white/side, /area/ruin/space/has_grav/ancientstation/proto) "qd" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/highsecurity{ - name = "Prototype Laboratory"; - req_access_txt = "200" + name = "Prototype Laboratory" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/white/side, /area/ruin/space/has_grav/ancientstation/proto) "qe" = ( @@ -8835,7 +8835,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/secure/engineering{ name = "plasma tank crate"; - req_access_txt = "204" + req_access = list("ruins_engineering") }, /obj/item/tank/internals/plasma/full, /obj/item/tank/internals/plasma/full, diff --git a/_maps/RandomRuins/SpaceRuins/spacebar.dmm b/_maps/RandomRuins/SpaceRuins/spacebar.dmm index de7e58f48f39..94150c29e15c 100644 --- a/_maps/RandomRuins/SpaceRuins/spacebar.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacebar.dmm @@ -85,8 +85,7 @@ "aU" = ( /obj/structure/disposalpipe/segment, /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = null; - req_access_txt = "25" + req_access = list("bar") }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/powered/spacebar) @@ -265,9 +264,9 @@ dir = 4 }, /obj/machinery/door/airlock/grunge{ - name = "Storage"; - req_access_txt = "25" + name = "Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plasteel, /area/ruin/space/has_grav/powered/spacebar) "jk" = ( @@ -385,8 +384,7 @@ pixel_y = 32 }, /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = null; - req_access_txt = "25" + req_access = list("bar") }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/powered/spacebar) @@ -455,9 +453,9 @@ dir = 1 }, /obj/machinery/door/airlock/grunge{ - name = "Bedroom"; - req_access_txt = "25" + name = "Bedroom" }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plasteel, /area/ruin/space/has_grav/powered/spacebar) "qR" = ( @@ -641,9 +639,9 @@ dir = 1 }, /obj/machinery/door/airlock/grunge{ - name = "Backroom"; - req_access_txt = "25" + name = "Backroom" }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plasteel, /area/ruin/space/has_grav/powered/spacebar) "xY" = ( @@ -708,9 +706,9 @@ dir = 4 }, /obj/machinery/door/airlock/grunge{ - name = "Backroom"; - req_access_txt = "25" + name = "Backroom" }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/wood, /area/ruin/space/has_grav/powered/spacebar) "BT" = ( @@ -828,8 +826,7 @@ /area/ruin/space/has_grav/powered/spacebar) "Gk" = ( /obj/structure/closet/secure_closet/freezer/meat{ - req_access = null; - req_access_txt = "25" + req_access = list("bar") }, /obj/structure/window{ dir = 4 @@ -852,9 +849,7 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/powered/spacebar) "GH" = ( -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, +/obj/structure/closet/secure_closet/bar, /obj/item/gun/ballistic/revolver/russian, /obj/item/storage/box/dishdrive, /obj/effect/decal/cleanable/dirt, @@ -1034,7 +1029,7 @@ /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; pixel_x = -32; - req_access_txt = "0"; + req_access = null; use_power = 0 }, /turf/open/floor/plasteel, @@ -1091,9 +1086,9 @@ dir = 1 }, /obj/machinery/door/airlock/grunge{ - name = "Solars"; - req_access_txt = "25" + name = "Solars" }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/spacebar) "NQ" = ( @@ -1106,9 +1101,9 @@ dir = 1 }, /obj/machinery/door/airlock/grunge{ - name = "Kitchen"; - req_access_txt = "25" + name = "Kitchen" }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/powered/spacebar) "Ow" = ( @@ -1119,7 +1114,8 @@ id = "barshutters"; name = "Bar Shutters Control"; pixel_x = 25; - pixel_y = 24 + pixel_y = 24; + req_access = list("bar") }, /turf/open/floor/wood, /area/ruin/space/has_grav/powered/spacebar) @@ -1268,9 +1264,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/door/airlock/external{ - req_access_txt = "25" - }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/spacebar) "TU" = ( @@ -1399,12 +1394,11 @@ /turf/template_noop, /area/template_noop) "YY" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "25" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/spacebar) "Zg" = ( diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index cb07ee717dae..c92b1235a4a5 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -877,8 +877,7 @@ /area/ruin/space/has_grav/hotel/guestroom/room_6) "cs" = ( /obj/machinery/door/airlock/maintenance{ - name = "Hotel Maintenance"; - req_access_txt = "201" + name = "Hotel Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -889,6 +888,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel) "ct" = ( @@ -1250,6 +1250,7 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel/workroom) "dk" = ( @@ -1836,9 +1837,9 @@ /area/ruin/space/has_grav/hotel) "eN" = ( /obj/machinery/door/airlock/maintenance{ - name = "Hotel Maintenance"; - req_access_txt = "201" + name = "Hotel Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel) "eO" = ( @@ -1969,9 +1970,9 @@ /area/ruin/space/has_grav/hotel/bar) "fj" = ( /obj/machinery/door/airlock/maintenance{ - name = "Hotel Maintenance"; - req_access_txt = "200,201" + name = "Hotel Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel/bar) "fk" = ( @@ -2068,8 +2069,7 @@ /area/ruin/space/has_grav/hotel) "fs" = ( /obj/machinery/door/airlock/maintenance{ - name = "Hotel Maintenance"; - req_access_txt = "201" + name = "Hotel Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -2080,6 +2080,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel) "ft" = ( @@ -2158,7 +2159,7 @@ /area/ruin/space/has_grav/hotel/bar) "fE" = ( /obj/machinery/vending/boozeomat{ - req_access_txt = "200" + req_access = list("ruins_general") }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -2307,9 +2308,9 @@ /area/ruin/space/has_grav/hotel/bar) "fT" = ( /obj/machinery/door/airlock/freezer{ - name = "Freezer"; - req_access_txt = "200" + name = "Freezer" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/freezer, /area/ruin/space/has_grav/hotel/bar) "fU" = ( @@ -2498,9 +2499,9 @@ /area/ruin/space/has_grav/hotel/bar) "gs" = ( /obj/machinery/door/airlock/grunge{ - name = "Hotel Staff Room"; - req_access_txt = "200" + name = "Hotel Staff Room" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/workroom) "gt" = ( @@ -2571,7 +2572,7 @@ /area/ruin/space/has_grav/hotel/bar) "gC" = ( /obj/structure/closet/secure_closet/freezer/meat{ - req_access_txt = "200" + req_access = list("ruins_general") }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/hotel/bar) @@ -2658,7 +2659,7 @@ /obj/item/reagent_containers/food/condiment/milk, /obj/item/reagent_containers/food/condiment/milk, /obj/structure/closet/secure_closet/freezer/fridge{ - req_access_txt = "200" + req_access = list("ruins_general") }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/hotel/bar) @@ -2833,8 +2834,7 @@ /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = null; - req_access_txt = "200" + req_access = list("ruins_general") }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/hotel/bar) @@ -3011,11 +3011,11 @@ /area/ruin/space/has_grav/hotel/workroom) "hI" = ( /obj/machinery/door/airlock/maintenance{ - name = "Hotel Maintenance"; - req_access_txt = "200,201" + name = "Hotel Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel) "hJ" = ( @@ -3105,7 +3105,7 @@ /area/ruin/space/has_grav/hotel/custodial) "hT" = ( /obj/machinery/vending/dinnerware{ - req_access_txt = "200" + req_access = list("ruins_general") }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/hotel/bar) @@ -3191,14 +3191,14 @@ /area/ruin/space/has_grav/hotel/custodial) "ib" = ( /obj/machinery/door/airlock/engineering{ - name = "Power Storage"; - req_access_txt = "200,201" + name = "Power Storage" }, /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel) "ic" = ( @@ -3212,11 +3212,11 @@ /area/ruin/space/has_grav/hotel) "id" = ( /obj/machinery/door/airlock/security/glass{ - name = "Hotel Security Checkpoint"; - req_access_txt = "203" + name = "Hotel Security Checkpoint" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/ruins/security, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel) "ie" = ( @@ -3391,8 +3391,7 @@ /area/ruin/space/has_grav/hotel/power) "iw" = ( /obj/machinery/door/airlock{ - name = "Custodial Closet"; - req_access_txt = "200,201" + name = "Custodial Closet" }, /obj/structure/cable{ icon_state = "4-8" @@ -3403,6 +3402,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel) "ix" = ( @@ -3430,9 +3430,9 @@ /area/ruin/space/has_grav/hotel/bar) "iA" = ( /obj/machinery/door/airlock{ - name = "Theatre"; - req_access_txt = "200" + name = "Theatre" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/hotel/bar) "iB" = ( @@ -3445,8 +3445,7 @@ /area/ruin/space/has_grav/hotel) "iD" = ( /obj/machinery/door/airlock/maintenance{ - name = "Hotel Maintenance"; - req_access_txt = "201" + name = "Hotel Maintenance" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -3454,6 +3453,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel) "iE" = ( @@ -3985,8 +3985,7 @@ dir = 4; icon_state = "rightsecure"; name = "Cell Door"; - req_access = null; - req_access_txt = "203" + req_access = null }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -3998,6 +3997,9 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/ruins/security{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel/security) "kC" = ( @@ -4057,10 +4059,10 @@ /area/ruin/space/has_grav/hotel/power) "kI" = ( /obj/machinery/door/airlock/engineering{ - name = "Air Supply"; - req_access_txt = "200,201" + name = "Air Supply" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/power) "kK" = ( @@ -4336,8 +4338,7 @@ /area/ruin/space/has_grav/hotel/security) "lF" = ( /obj/machinery/door/airlock/security/glass{ - name = "Hotel Security Checkpoint"; - req_access_txt = "203" + name = "Hotel Security Checkpoint" }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -4349,6 +4350,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/security, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/security) "lG" = ( @@ -4475,8 +4477,7 @@ /area/ruin/space/has_grav/hotel/security) "lT" = ( /obj/structure/closet/secure_closet/security{ - req_access = null; - req_access_txt = "203" + req_access = list("ruins_security") }, /obj/item/gun/energy/laser/scatter/shotty, /obj/item/clothing/head/helmet/justice, @@ -4880,12 +4881,12 @@ /area/ruin/space/has_grav/hotel/workroom) "mQ" = ( /obj/machinery/door/airlock/grunge{ - name = "Hotel Staff Room"; - req_access_txt = "200" + name = "Hotel Staff Room" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/workroom) "mR" = ( @@ -5035,8 +5036,10 @@ dir = 4; icon_state = "right"; layer = 3; - name = "Hotel Bar Access"; - req_access_txt = "200,201" + name = "Hotel Bar Access" + }, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general{ + dir = 4 }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel/bar) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm b/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm index 4a0b85973bbf..eaeb7a4c2ecf 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm @@ -49,8 +49,7 @@ "dl" = ( /obj/machinery/door/window{ dir = 8; - name = "Mass Driver"; - req_access_txt = "22" + name = "Mass Driver" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -58,6 +57,9 @@ /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/chapel/main) "du" = ( @@ -140,13 +142,13 @@ /area/chapel/main) "gS" = ( /obj/machinery/door/airlock/public/glass{ - name = "Chapel Office"; - req_access_txt = "22" + name = "Chapel Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/office) "hp" = ( @@ -241,8 +243,7 @@ /area/chapel/main) "mP" = ( /obj/machinery/door/airlock{ - name = "Crematorium"; - req_access_txt = "27" + name = "Crematorium" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -259,6 +260,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plasteel/dark, /area/chapel/office) "nb" = ( @@ -492,8 +494,10 @@ "Gl" = ( /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ - name = "Coffin Storage"; - req_access_txt = "22" + name = "Coffin Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -563,8 +567,7 @@ /area/chapel/main) "ML" = ( /obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_access_txt = "27" + name = "Crematorium Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -575,12 +578,13 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plating, /area/template_noop) "Ny" = ( /obj/machinery/door/morgue{ name = "Confession Booth (Chaplain)"; - req_access_txt = "22" + req_access = list("chapel_office") }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -628,8 +632,7 @@ /area/chapel/main) "PO" = ( /obj/machinery/door/airlock/maintenance{ - name = "Chapel Maintenance"; - req_access_txt = "12" + name = "Chapel Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -649,14 +652,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/template_noop) "Qh" = ( /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ dir = 8; - name = "Coffin Storage"; - req_access_txt = "22" + name = "Coffin Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -855,7 +861,8 @@ icon_state = "airlock_control_standby"; id = "chapelgun"; name = "Mass Driver Controller"; - pixel_x = 24 + pixel_x = 24; + req_access = list("chapel_office") }, /turf/open/floor/plasteel/dark, /area/chapel/main) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm b/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm index 10cbe925b764..c53d5b8e1275 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm @@ -154,8 +154,7 @@ /area/chapel/main) "gJ" = ( /obj/machinery/door/airlock/maintenance{ - name = "Chapel Maintenance"; - req_access_txt = "12" + name = "Chapel Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -166,6 +165,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/template_noop) "gL" = ( @@ -237,8 +237,7 @@ "kK" = ( /obj/machinery/door/window{ dir = 8; - name = "Mass Driver"; - req_access_txt = "22" + name = "Mass Driver" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -246,6 +245,9 @@ /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/chapel/office) "kU" = ( @@ -276,9 +278,9 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_access_txt = "27" + name = "Crematorium Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plating, /area/template_noop) "mq" = ( @@ -509,7 +511,7 @@ "Dj" = ( /obj/machinery/door/morgue{ name = "Confession Booth (Chaplain)"; - req_access_txt = "22" + req_access = list("chapel_office") }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -590,7 +592,8 @@ icon_state = "airlock_control_standby"; id = "chapelgun"; name = "Mass Driver Controller"; - pixel_y = 30 + pixel_y = 30; + req_access = list("chapel_office") }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -717,9 +720,9 @@ /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/public/glass{ - name = "Chapel Office"; - req_access_txt = "22" + name = "Chapel Office" }, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/office) "Kc" = ( @@ -737,8 +740,10 @@ /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ dir = 8; - name = "Coffin Storage"; - req_access_txt = "22" + name = "Coffin Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -868,8 +873,10 @@ "Sq" = ( /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ - name = "Coffin Storage"; - req_access_txt = "22" + name = "Coffin Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -1075,8 +1082,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock{ - name = "Crematorium"; - req_access_txt = "27" + name = "Crematorium" }, /obj/structure/cable{ icon_state = "1-2" @@ -1087,6 +1093,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plasteel/dark, /area/chapel/office) "Zw" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/clerk_box.dmm b/_maps/RandomRuins/StationRuins/BoxStation/clerk_box.dmm index c5a532e712eb..2fe3f6b3788d 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/clerk_box.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/clerk_box.dmm @@ -21,9 +21,7 @@ /turf/open/floor/plasteel, /area/clerk) "c" = ( -/obj/machinery/door/window/southleft{ - req_access_txt = "36" - }, +/obj/machinery/door/window/southleft, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -36,6 +34,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/windoor/access/all/service/clerk, /turf/open/floor/plasteel, /area/clerk) "d" = ( @@ -76,13 +75,15 @@ id = "giftshop"; name = "Gift Shop Internal Shutters"; pixel_x = 26; - pixel_y = 24 + pixel_y = 24; + req_access = list("clerk") }, /obj/machinery/button/door{ id = "giftshop_ext"; name = "Gift Shop External Shutters"; pixel_x = 40; - pixel_y = 24 + pixel_y = 24; + req_access = list("clerk") }, /obj/structure/cable{ icon_state = "1-8" @@ -330,8 +331,7 @@ /area/clerk) "A" = ( /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -349,6 +349,7 @@ /obj/effect/turf_decal/tile/green/opposingcorners{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel, /area/clerk) "B" = ( @@ -531,8 +532,7 @@ /area/clerk) "Q" = ( /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -547,6 +547,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel, /area/clerk) "R" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/clerk_gamble.dmm b/_maps/RandomRuins/StationRuins/BoxStation/clerk_gamble.dmm index b91ff372dca7..dd32626a0a13 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/clerk_gamble.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/clerk_gamble.dmm @@ -267,8 +267,7 @@ /area/clerk) "R" = ( /obj/machinery/door/airlock{ - name = "Gambling Hall"; - req_access_txt = "36" + name = "Gambling Hall" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -279,6 +278,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/wood, /area/clerk) "S" = ( @@ -294,11 +294,11 @@ dir = 1 }, /obj/machinery/door/airlock{ - name = "Gambling Hall"; - req_access_txt = "36" + name = "Gambling Hall" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/wood, /area/clerk) "U" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/clerk_meta.dmm b/_maps/RandomRuins/StationRuins/BoxStation/clerk_meta.dmm index 57f8bd2beadc..f131a69a7c3e 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/clerk_meta.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/clerk_meta.dmm @@ -198,8 +198,7 @@ /area/clerk) "A" = ( /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -217,6 +216,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel/dark, /area/clerk) "B" = ( @@ -313,8 +313,7 @@ /area/clerk) "O" = ( /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -328,6 +327,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/wood, /area/clerk) "P" = ( @@ -368,14 +368,14 @@ }, /obj/effect/turf_decal/tile/yellow/opposingcorners, /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel/dark, /area/clerk) "T" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/clerk_pod.dmm b/_maps/RandomRuins/StationRuins/BoxStation/clerk_pod.dmm index c442cdade155..fc85b217db80 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/clerk_pod.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/clerk_pod.dmm @@ -245,8 +245,7 @@ dir = 4 }, /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 8 @@ -409,8 +408,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 4 @@ -442,8 +440,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 8 diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_reactor.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_reactor.dmm index e9fffc883d07..f482b6c81a5f 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/engine_reactor.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/engine_reactor.dmm @@ -94,12 +94,12 @@ dir = 8 }, /obj/machinery/door/airlock/engineering{ - name = "AI Satellite Access"; - req_access_txt = "10" + name = "AI Satellite Access" }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 9 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "cz" = ( @@ -211,12 +211,12 @@ dir = 8 }, /obj/machinery/door/airlock/engineering/glass{ - name = "Reactor Clean Room"; - req_access_txt = "10" + name = "Reactor Clean Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "hV" = ( @@ -256,11 +256,11 @@ "iB" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "iV" = ( @@ -669,8 +669,7 @@ dir = 4 }, /obj/machinery/door/airlock/engineering/glass{ - name = "Reactor Clean Room"; - req_access_txt = "10" + name = "Reactor Clean Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -687,6 +686,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "vl" = ( @@ -822,7 +822,7 @@ /obj/machinery/button/door{ id = "reactorcore"; name = "Core Access"; - req_access_txt = "10" + req_access = list("engineering") }, /turf/open/floor/plasteel/dark, /area/engine/engineering) @@ -917,10 +917,10 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "CI" = ( @@ -993,8 +993,7 @@ /area/engine/engineering) "FU" = ( /obj/machinery/door/airlock/engineering{ - name = "Reactor Core"; - req_one_access_txt = "10;24" + name = "Reactor Core" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -1009,6 +1008,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "Gc" = ( @@ -1124,8 +1124,7 @@ dir = 8 }, /obj/machinery/door/airlock/engineering/glass{ - name = "Control Room"; - req_access_txt = "10" + name = "Control Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -1142,6 +1141,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "Jj" = ( @@ -1196,7 +1196,7 @@ /obj/machinery/button/door{ id = "reactorvent"; name = "Core Vent"; - req_access_txt = "10" + req_access = list("engineering") }, /turf/open/floor/plasteel/dark, /area/engine/engineering) @@ -1219,8 +1219,7 @@ dir = 4 }, /obj/machinery/door/airlock/engineering/glass{ - name = "Control Room"; - req_access_txt = "10" + name = "Control Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -1231,6 +1230,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "KS" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_singulo_tesla.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_singulo_tesla.dmm index c0a9844406c7..c032af42fe80 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/engine_singulo_tesla.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/engine_singulo_tesla.dmm @@ -247,7 +247,7 @@ name = "Radiation Shutters Control"; pixel_x = 24; pixel_y = 0; - req_access_txt = "10" + req_access = list("engineering") }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -337,7 +337,7 @@ name = "Radiation Shutters Control"; pixel_x = 24; pixel_y = 0; - req_access_txt = "10" + req_access = list("engineering") }, /turf/open/floor/engine, /area/engine/engineering) @@ -352,7 +352,7 @@ name = "Radiation Shutters Control"; pixel_x = -24; pixel_y = 0; - req_access_txt = "10" + req_access = list("engineering") }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -459,7 +459,7 @@ icon_state = "1-4" }, /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/engine/engineering) "iX" = ( /obj/machinery/camera/emp_proof{ c_tag = "Engineering Singularity Northwest"; @@ -538,7 +538,7 @@ icon_state = "1-8" }, /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/engine/engineering) "mP" = ( /obj/item/weldingtool, /turf/open/space/basic, @@ -601,7 +601,7 @@ name = "Radiation Shutters Control"; pixel_x = -24; pixel_y = 0; - req_access_txt = "10" + req_access = list("engineering") }, /mob/living/simple_animal/opossum/poppy, /turf/open/floor/engine, @@ -688,9 +688,9 @@ /area/engine/engineering) "xH" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating/airless, /area/engine/engineering) "xO" = ( @@ -711,8 +711,7 @@ /area/engine/engineering) "zz" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -720,6 +719,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "Aa" = ( @@ -843,9 +843,9 @@ dir = 4 }, /obj/machinery/door/airlock/engineering{ - name = "AI Satellite Access"; - req_access_txt = "10" + name = "AI Satellite Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "Hf" = ( @@ -882,8 +882,7 @@ "Jk" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -894,6 +893,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "Jy" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_sm.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_sm.dmm index 79e358d186b4..9afd6153b126 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/engine_sm.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/engine_sm.dmm @@ -14,13 +14,13 @@ /area/engine/engineering) "ae" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine Room"; - req_access_txt = "10" + name = "Supermatter Engine Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/engineering) "af" = ( @@ -196,7 +196,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = -24; - req_access_txt = "10" + req_access = list("engineering") }, /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 1 @@ -301,14 +301,14 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; - name = "Supermatter Chamber"; - req_access_txt = "10" + name = "Supermatter Chamber" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/supermatter) "bj" = ( @@ -424,13 +424,13 @@ /area/engine/engineering) "bA" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine Room"; - req_access_txt = "10" + name = "Supermatter Engine Room" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "bD" = ( @@ -466,12 +466,12 @@ "bH" = ( /obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; - name = "Supermatter Chamber"; - req_access_txt = "10" + name = "Supermatter Chamber" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/supermatter) "bI" = ( @@ -1462,10 +1462,10 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "kP" = ( @@ -1485,11 +1485,11 @@ "la" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "li" = ( @@ -1630,8 +1630,7 @@ /area/engine/engineering) "wi" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine Room"; - req_access_txt = "10" + name = "Supermatter Engine Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -1648,6 +1647,7 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/engineering) "wn" = ( @@ -1771,9 +1771,9 @@ dir = 8 }, /obj/machinery/door/airlock/engineering{ - name = "AI Satellite Access"; - req_access_txt = "10" + name = "AI Satellite Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "Fa" = ( @@ -1856,8 +1856,7 @@ /area/engine/engineering) "JV" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine Room"; - req_access_txt = "10" + name = "Supermatter Engine Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -1874,12 +1873,12 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/engineering) "JY" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Laser Room"; - req_access_txt = "10" + name = "Laser Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor/border_only{ @@ -1889,6 +1888,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/engineering) "Kg" = ( @@ -1974,8 +1974,7 @@ /area/engine/engineering) "Pt" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Laser Room"; - req_access_txt = "10" + name = "Laser Room" }, /obj/structure/cable{ icon_state = "1-2" @@ -1988,6 +1987,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/engineering) "Pu" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm index cb8108cb54b1..1cef0cf201db 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm @@ -179,7 +179,7 @@ name = "Hot Chamber Vent"; pixel_x = -26; pixel_y = 8; - req_access_txt = "10" + req_access = list("engineering") }, /mob/living/simple_animal/opossum/poppy, /obj/structure/chair/office/dark{ @@ -321,10 +321,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/engineering/glass{ - name = "TEG Room"; - req_access_txt = "10" + name = "TEG Room" }, /obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "iX" = ( @@ -332,10 +332,10 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "kp" = ( @@ -375,11 +375,11 @@ "la" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "lw" = ( @@ -807,7 +807,7 @@ id = "teghot"; name = "Hot Chamber Vent"; pixel_x = 26; - req_access_txt = "10" + req_access = list("engineering") }, /obj/structure/lattice/catwalk, /turf/template_noop, @@ -1019,9 +1019,9 @@ dir = 8 }, /obj/machinery/door/airlock/engineering{ - name = "AI Satellite Access"; - req_access_txt = "10" + name = "AI Satellite Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "FG" = ( @@ -1137,7 +1137,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /obj/machinery/light{ @@ -1184,8 +1184,7 @@ /area/engine/engineering) "Lt" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "TEG Room"; - req_access_txt = "10" + name = "TEG Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -1320,9 +1319,9 @@ dir = 8 }, /obj/machinery/door/airlock/engineering/glass{ - name = "TEG Room"; - req_access_txt = "10" + name = "TEG Room" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/engineering) "Ov" = ( @@ -1743,9 +1742,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/engineering/glass{ - name = "TEG Room"; - req_access_txt = "10" + name = "TEG Room" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/engineering) "ZP" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer1.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer1.dmm index b348c1d3697c..12650283d4c9 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer1.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer1.dmm @@ -69,7 +69,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "executionflash"; @@ -251,9 +251,9 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/template_noop) "H" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer10.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer10.dmm index d5c0f7cef2b3..ec3aa48b0e11 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer10.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer10.dmm @@ -243,7 +243,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "executionflash"; diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer2.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer2.dmm index 0c1cbad69eb3..db31622f556d 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer2.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer2.dmm @@ -15,9 +15,9 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/showroomfloor, /area/template_noop) "c" = ( @@ -115,7 +115,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "executionflash"; diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer3.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer3.dmm index 81ad6e9e9166..190116f5e32a 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer3.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer3.dmm @@ -74,7 +74,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "executionflash"; @@ -95,7 +95,7 @@ name = "Vent to Space"; pixel_x = 25; pixel_y = -15; - req_access_txt = "2" + req_access = list("brig") }, /obj/effect/mapping_helpers/teleport_anchor, /turf/open/floor/plasteel/dark, @@ -182,12 +182,12 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/template_noop) "v" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer4.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer4.dmm index 68b75aea2a11..03b9b60cc9d0 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer4.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer4.dmm @@ -128,7 +128,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "executionflash"; @@ -329,12 +329,12 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/template_noop) "N" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer5.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer5.dmm index 9f20fe50a9f1..e891100f18fa 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer5.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer5.dmm @@ -108,7 +108,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "executionflash"; @@ -269,9 +269,9 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/template_noop) "H" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer6.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer6.dmm index a7fe4762e3c4..9a3be45751f6 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer6.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer6.dmm @@ -276,9 +276,9 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/template_noop) "K" = ( @@ -362,7 +362,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "executionflash"; @@ -383,7 +383,7 @@ name = "Crush"; pixel_x = 25; pixel_y = -15; - req_access_txt = "2" + req_access = list("brig") }, /turf/open/floor/plasteel/dark, /area/template_noop) diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer7.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer7.dmm index 1c1032ea4d13..a4baa2b1d045 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer7.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer7.dmm @@ -173,7 +173,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "executionflash"; @@ -199,7 +199,7 @@ name = "Vent to Space"; pixel_x = 25; pixel_y = -15; - req_access_txt = "2" + req_access = list("brig") }, /obj/effect/mapping_helpers/teleport_anchor, /turf/open/floor/plasteel/dark, @@ -246,8 +246,7 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 1 @@ -255,6 +254,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/engine, /area/template_noop) "A" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer8.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer8.dmm index 8ee200c7d112..3a063c2891ca 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer8.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer8.dmm @@ -91,7 +91,7 @@ name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "executionflash"; @@ -382,9 +382,9 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/template_noop) "X" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/transfer9.dmm b/_maps/RandomRuins/StationRuins/BoxStation/transfer9.dmm index 0bc1d803c183..9ad3d682ab5f 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/transfer9.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/transfer9.dmm @@ -58,9 +58,9 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/template_noop) "j" = ( @@ -90,20 +90,12 @@ /turf/open/floor/plasteel/showroomfloor, /area/template_noop) "o" = ( -/obj/structure/chair{ - dir = 1 - }, /obj/machinery/button/door{ id = "executionfireblast"; name = "Transfer Area Lockdown"; pixel_x = 25; pixel_y = -5; - req_access_txt = "2" - }, -/obj/machinery/button/flasher{ - id = "executionflash"; - pixel_x = 24; - pixel_y = 5 + req_access = list("brig") }, /obj/structure/cable{ icon_state = "1-8" @@ -262,6 +254,9 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/template_noop) "G" = ( diff --git a/_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm b/_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm index 8a9272a49a69..7d66016f2935 100644 --- a/_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm +++ b/_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm @@ -105,9 +105,11 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "bV" = ( @@ -129,8 +131,7 @@ /area/ai_monitored/turret_protected/ai) "cn" = ( /obj/machinery/door/airlock/hatch{ - name = "MiniSat Teleporter Room"; - req_one_access_txt = "17;65" + name = "MiniSat Teleporter Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -140,6 +141,8 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "cJ" = ( @@ -635,9 +638,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "lm" = ( @@ -704,8 +709,7 @@ /area/ai_monitored/storage/satellite) "lN" = ( /obj/machinery/door/airlock/maintenance_hatch{ - name = "MiniSat Maintenance"; - req_access_txt = "65" + name = "MiniSat Maintenance" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -716,6 +720,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plating, /area/ai_monitored/storage/satellite) "mb" = ( @@ -902,8 +907,7 @@ "pP" = ( /obj/machinery/door/airlock/highsecurity{ id_tag = "ai_core_airlock_exterior"; - name = "AI Core"; - req_access_txt = "16" + name = "AI Core" }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -921,6 +925,7 @@ /obj/structure/ethernet_cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "pQ" = ( @@ -1259,8 +1264,7 @@ /area/tcommsat/server) "xf" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Server Room"; - req_access_txt = "61" + name = "Server Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -1280,6 +1284,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/tcommsat/computer) "xn" = ( @@ -1419,8 +1424,7 @@ /area/ai_monitored/turret_protected/ai) "zk" = ( /obj/machinery/door/airlock/hatch{ - name = "MiniSat Monitoring Room"; - req_access_txt = "65" + name = "MiniSat Monitoring Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -1433,6 +1437,7 @@ /obj/structure/ethernet_cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "zp" = ( @@ -1672,13 +1677,15 @@ idInterior = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 25; - pixel_y = 7 + pixel_y = 7; + req_access = list("ai_master") }, /obj/machinery/doorButtons/access_button{ idDoor = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 23; - pixel_y = -7 + pixel_y = -7; + req_access = list("ai_master") }, /obj/machinery/camera{ c_tag = "MiniSat Antechamber"; @@ -1847,8 +1854,7 @@ /area/ai_monitored/turret_protected/aisat_interior) "Hw" = ( /obj/machinery/door/airlock/hatch{ - name = "Telecomms Control Room"; - req_access_txt = "61" + name = "Telecomms Control Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -1859,6 +1865,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/tcommsat/computer) "HD" = ( @@ -1977,13 +1984,15 @@ /area/ai_monitored/storage/satellite) "Kt" = ( /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_one_access_txt = "65;61" + name = "MiniSat External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "KM" = ( @@ -2033,8 +2042,7 @@ /area/ai_monitored/turret_protected/aisat_interior) "Lm" = ( /obj/machinery/door/airlock/hatch{ - name = "MiniSat Antechamber"; - req_access_txt = "65" + name = "MiniSat Antechamber" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -2049,6 +2057,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/aisat_interior) "Lt" = ( @@ -2261,9 +2270,6 @@ /turf/closed/wall, /area/tcommsat/computer) "Pe" = ( -/obj/machinery/door/airlock/public{ - id_tag = "ai_core_airlock_interior" - }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -2277,6 +2283,11 @@ /obj/structure/ethernet_cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/highsecurity{ + id_tag = "ai_core_airlock_exterior"; + name = "AI Core" + }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "Pg" = ( @@ -2579,7 +2590,8 @@ idDoor = "ai_core_airlock_exterior"; idSelf = "ai_core_airlock_control"; pixel_x = -23; - pixel_y = 7 + pixel_y = 7; + req_access = list("ai_master") }, /obj/machinery/light, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -2685,13 +2697,13 @@ /area/solar/port/aft) "Vc" = ( /obj/machinery/door/airlock/maintenance_hatch{ - name = "MiniSat Maintenance"; - req_access_txt = "65" + name = "MiniSat Maintenance" }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plating, /area/ai_monitored/storage/satellite) "Vm" = ( @@ -2723,7 +2735,8 @@ idDoor = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = -23; - pixel_y = 7 + pixel_y = 7; + req_access = list("ai_master") }, /turf/open/floor/circuit/telecomms/server, /area/ai_monitored/turret_protected/ai) @@ -2754,8 +2767,7 @@ /area/ai_monitored/turret_protected/aisat_interior) "WY" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Server Room"; - req_access_txt = "61" + name = "Server Room" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 @@ -2772,6 +2784,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/tcommsat/server) "Xc" = ( @@ -2820,7 +2833,8 @@ idDoor = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 23; - pixel_y = -7 + pixel_y = -7; + req_access = list("ai_master") }, /obj/machinery/light{ dir = 1 @@ -2850,9 +2864,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_one_access_txt = "65;61" + name = "MiniSat External Access" }, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "Yo" = ( diff --git a/_maps/RandomRuins/StationRuins/MetaStation/meta_reactor.dmm b/_maps/RandomRuins/StationRuins/MetaStation/meta_reactor.dmm index 22f56df63a59..f0a362e44d99 100644 --- a/_maps/RandomRuins/StationRuins/MetaStation/meta_reactor.dmm +++ b/_maps/RandomRuins/StationRuins/MetaStation/meta_reactor.dmm @@ -634,13 +634,13 @@ dir = 8 }, /obj/machinery/door/airlock/engineering/glass{ - name = "Reactor Control Room"; - req_access_txt = "10" + name = "Reactor Control Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = 2; diry = -2 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "rz" = ( @@ -918,8 +918,7 @@ /area/engine/engineering) "AO" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Reactor Control Room"; - req_access_txt = "10" + name = "Reactor Control Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -934,6 +933,7 @@ dirx = 2; diry = 2 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "AZ" = ( @@ -1066,13 +1066,13 @@ id = "reactorcore"; name = "Core Access"; pixel_y = -2; - req_access_txt = "10" + req_access = list("engineering") }, /obj/machinery/button/door{ id = "reactorvent"; name = "Core Vent"; pixel_y = 8; - req_access_txt = "10" + req_access = list("engineering") }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1550,9 +1550,9 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/machinery/door/airlock/engineering{ - name = "Reactor Maintenance"; - req_access_txt = "10" + name = "Reactor Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "Sl" = ( @@ -1686,9 +1686,9 @@ dir = 8 }, /obj/machinery/door/airlock/engineering{ - name = "Reactor Maintenance"; - req_access_txt = "10" + name = "Reactor Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "Wq" = ( @@ -1707,8 +1707,7 @@ /area/engine/engineering) "WC" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Reactor Control Room"; - req_access_txt = "10" + name = "Reactor Control Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -1723,6 +1722,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "XZ" = ( @@ -1786,8 +1786,7 @@ /area/engine/engineering) "Zt" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Reactor Control Room"; - req_access_txt = "10" + name = "Reactor Control Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -1799,6 +1798,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "ZC" = ( diff --git a/_maps/RandomRuins/StationRuins/MetaStation/meta_singulo_tesla.dmm b/_maps/RandomRuins/StationRuins/MetaStation/meta_singulo_tesla.dmm index 9796b0371329..2e56c58c2b4e 100644 --- a/_maps/RandomRuins/StationRuins/MetaStation/meta_singulo_tesla.dmm +++ b/_maps/RandomRuins/StationRuins/MetaStation/meta_singulo_tesla.dmm @@ -143,6 +143,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "eZ" = ( @@ -277,7 +278,7 @@ name = "Radiation Shutters Control"; pixel_x = 0; pixel_y = -24; - req_access_txt = "10" + req_access = list("engineering") }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -357,6 +358,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "rF" = ( @@ -438,7 +440,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = -24; - req_access_txt = "10" + req_access = list("engineering") }, /turf/open/floor/engine, /area/engine/engineering) @@ -453,7 +455,7 @@ icon_state = "2-8" }, /turf/open/floor/plating/snowed/smoothed, -/area/icemoon/top_layer/outdoors) +/area/engine/engineering) "vB" = ( /obj/structure/particle_accelerator/end_cap{ dir = 4 @@ -469,20 +471,6 @@ "vP" = ( /turf/closed/wall/r_wall, /area/engine/engineering) -"wr" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/button/door{ - dir = 4; - id = "engsm"; - name = "Radiation Shutters Control"; - pixel_x = 24; - pixel_y = 0; - req_access_txt = "10" - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "wu" = ( /obj/structure/grille, /obj/structure/cable/orange{ @@ -498,9 +486,9 @@ /area/engine/engineering) "xa" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating/airless, /area/engine/engineering) "yo" = ( @@ -583,7 +571,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = 24; - req_access_txt = "10" + req_access = list("engineering") }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -666,7 +654,7 @@ icon_state = "1-8" }, /turf/open/floor/plating/snowed/smoothed, -/area/icemoon/top_layer/outdoors) +/area/engine/engineering) "JC" = ( /obj/effect/turf_decal/stripes{ dir = 8 @@ -684,17 +672,6 @@ /obj/item/clothing/gloves/color/yellow, /turf/open/floor/plasteel, /area/engine/engineering) -"Ks" = ( -/obj/machinery/button/door{ - dir = 8; - id = "engsm"; - name = "Radiation Shutters Control"; - pixel_x = -24; - pixel_y = 0; - req_access_txt = "10" - }, -/turf/open/floor/engine, -/area/engine/engineering) "KT" = ( /obj/structure/cable/orange{ icon_state = "1-8" @@ -758,7 +735,7 @@ name = "Radiation Shutters Control"; pixel_x = 0; pixel_y = 24; - req_access_txt = "10" + req_access = list("engineering") }, /turf/open/floor/engine, /area/engine/engineering) @@ -790,6 +767,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating/airless, /area/engine/engineering) "PS" = ( @@ -1040,7 +1018,7 @@ aO Lj ul Lj -wr +Lj Lj zG Lj @@ -1092,7 +1070,7 @@ Ik vP cR oj -Ks +oj oj cR vP diff --git a/_maps/RandomRuins/StationRuins/MetaStation/meta_sm.dmm b/_maps/RandomRuins/StationRuins/MetaStation/meta_sm.dmm index 9738ab3466f6..996291c07dd2 100644 --- a/_maps/RandomRuins/StationRuins/MetaStation/meta_sm.dmm +++ b/_maps/RandomRuins/StationRuins/MetaStation/meta_sm.dmm @@ -262,8 +262,7 @@ /area/engine/engineering) "jg" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Laser Room"; - req_access_txt = "10" + name = "Laser Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -277,6 +276,7 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "jj" = ( @@ -584,8 +584,7 @@ /area/engine/engineering) "qj" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine"; - req_access_txt = "10" + name = "Supermatter Engine" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -596,6 +595,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "qm" = ( @@ -783,8 +783,7 @@ /area/engine/engineering) "vl" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Laser Room"; - req_access_txt = "10" + name = "Laser Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -798,6 +797,7 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "vq" = ( @@ -1044,8 +1044,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine"; - req_access_txt = "10" + name = "Supermatter Engine" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -1053,6 +1052,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "Cs" = ( @@ -1282,14 +1282,14 @@ /area/engine/engineering) "Jp" = ( /obj/machinery/door/airlock/engineering{ - name = "Supermatter Engine"; - req_access_txt = "10" + name = "Supermatter Engine" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "Jq" = ( @@ -1380,8 +1380,7 @@ /area/engine/engineering) "Ne" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine"; - req_access_txt = "10" + name = "Supermatter Engine" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -1392,6 +1391,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "Ny" = ( @@ -1429,12 +1429,12 @@ "Ov" = ( /obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; - name = "Supermatter Chamber"; - req_access_txt = "10" + name = "Supermatter Chamber" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/supermatter) "OD" = ( @@ -1442,8 +1442,7 @@ /area/template_noop) "OR" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine"; - req_access_txt = "10" + name = "Supermatter Engine" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -1457,6 +1456,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "Pm" = ( @@ -1468,8 +1468,7 @@ "Pz" = ( /obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; - name = "Supermatter Chamber"; - req_access_txt = "10" + name = "Supermatter Chamber" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -1480,6 +1479,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/supermatter) "PA" = ( @@ -1507,7 +1507,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_x = 24; - req_access_txt = "10" + req_access = list("engineering") }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -1591,13 +1591,13 @@ "RX" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine"; - req_access_txt = "10" + name = "Supermatter Engine" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "SM" = ( diff --git a/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm b/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm index b61308f19584..bb9a7bb6b2db 100644 --- a/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm +++ b/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm @@ -137,12 +137,12 @@ /area/engine/engineering) "fh" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "fm" = ( @@ -200,7 +200,7 @@ id = "teghot"; name = "Hot Chamber Vent"; pixel_y = 22; - req_access_txt = "10" + req_access = list("engineering") }, /obj/structure/lattice/catwalk, /turf/open/floor/plating/asteroid/snow/icemoon/top_layer, @@ -254,8 +254,7 @@ /area/engine/engineering) "hO" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine"; - req_access_txt = "10" + name = "Supermatter Engine" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -266,6 +265,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "ib" = ( @@ -282,8 +282,7 @@ /area/engine/engineering) "ij" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine"; - req_access_txt = "10" + name = "Supermatter Engine" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -294,6 +293,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "iq" = ( @@ -408,8 +408,7 @@ /area/engine/engineering) "oc" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -417,12 +416,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "oJ" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -430,6 +429,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "oN" = ( @@ -891,7 +891,7 @@ name = "Hot Chamber Vent"; pixel_x = -7; pixel_y = -24; - req_access_txt = "10" + req_access = list("engineering") }, /obj/machinery/button/ignition{ id = "teghotburn"; @@ -1058,14 +1058,14 @@ /area/engine/engineering) "Ns" = ( /obj/machinery/door/airlock/engineering{ - name = "Supermatter Engine"; - req_access_txt = "10" + name = "Supermatter Engine" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "NH" = ( @@ -1147,8 +1147,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine"; - req_access_txt = "10" + name = "Supermatter Engine" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -1156,6 +1155,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "QQ" = ( @@ -1479,8 +1479,7 @@ /area/engine/engineering) "Yy" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -1491,6 +1490,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "Yz" = ( diff --git a/_maps/RandomRuins/StationRuins/maint/10x10/10x10_snakefighter.dmm b/_maps/RandomRuins/StationRuins/maint/10x10/10x10_snakefighter.dmm index 9fa1693ba7c8..ebb3a172c1e0 100644 --- a/_maps/RandomRuins/StationRuins/maint/10x10/10x10_snakefighter.dmm +++ b/_maps/RandomRuins/StationRuins/maint/10x10/10x10_snakefighter.dmm @@ -237,24 +237,24 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/research/glass{ - name = "Research Pit"; - req_access_txt = "12" + name = "Research Pit" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/template_noop) "U" = ( /obj/machinery/door/airlock/research/glass{ - name = "Research Pit"; - req_access_txt = "12" + name = "Research Pit" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/template_noop) "V" = ( diff --git a/_maps/RandomRuins/StationRuins/maint/10x5/10x5_deltaclutter1.dmm b/_maps/RandomRuins/StationRuins/maint/10x5/10x5_deltaclutter1.dmm index b3f4fb526834..4f7ab27057e5 100644 --- a/_maps/RandomRuins/StationRuins/maint/10x5/10x5_deltaclutter1.dmm +++ b/_maps/RandomRuins/StationRuins/maint/10x5/10x5_deltaclutter1.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "b" = ( /obj/structure/table/wood, -/obj/item/clothing/under/waiter, +/obj/item/clothing/under/suit/waiter, /obj/item/clothing/accessory/waistcoat, /turf/open/floor/plasteel/dark, /area/template_noop) diff --git a/_maps/RandomRuins/StationRuins/maint/5x3/5x3_magicroom.dmm b/_maps/RandomRuins/StationRuins/maint/5x3/5x3_magicroom.dmm index 02af2ad0c7b2..23b8da7530ca 100644 --- a/_maps/RandomRuins/StationRuins/maint/5x3/5x3_magicroom.dmm +++ b/_maps/RandomRuins/StationRuins/maint/5x3/5x3_magicroom.dmm @@ -44,7 +44,7 @@ /area/template_noop) "Y" = ( /obj/machinery/vending/autodrobe{ - req_access_txt = "0" + req_access = null }, /turf/open/floor/carpet/black, /area/template_noop) diff --git a/_maps/RandomZLevels/Cabin.dmm b/_maps/RandomZLevels/Cabin.dmm index 61398771ada7..b127ff490f1d 100644 --- a/_maps/RandomZLevels/Cabin.dmm +++ b/_maps/RandomZLevels/Cabin.dmm @@ -356,7 +356,7 @@ /area/awaymission/cabin) "bl" = ( /obj/machinery/vending/autodrobe{ - req_access_txt = "0" + req_access = null }, /turf/open/floor/wood, /area/awaymission/cabin) @@ -495,9 +495,7 @@ /turf/open/floor/wood, /area/awaymission/cabin) "bN" = ( -/obj/machinery/vending/boozeomat{ - req_access_txt = "0" - }, +/obj/machinery/vending/boozeomat, /turf/open/floor/wood, /area/awaymission/cabin) "bO" = ( diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm index 7dbc8d496eb8..a6d9a20629ba 100644 --- a/_maps/RandomZLevels/TheBeach.dmm +++ b/_maps/RandomZLevels/TheBeach.dmm @@ -847,7 +847,7 @@ /area/awaymission/beach) "cr" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = list(25) + req_access = list("bar") }, /obj/item/storage/fancy/egg_box, /obj/item/reagent_containers/food/condiment/milk, diff --git a/_maps/RandomZLevels/VR/netmin_hub.dmm b/_maps/RandomZLevels/VR/netmin_hub.dmm index c07991846b99..ff6b12e1c074 100644 --- a/_maps/RandomZLevels/VR/netmin_hub.dmm +++ b/_maps/RandomZLevels/VR/netmin_hub.dmm @@ -2772,7 +2772,6 @@ }, /obj/machinery/door/airlock/highsecurity{ name = "????"; - req_access_txt = "0" }, /turf/open/floor/plasteel/dark, /area/awaymission/vr/combat_robot_factory) @@ -3451,8 +3450,7 @@ /area/awaymission/vr/scientist_raid) "Cn" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_one_access_txt = "0" + name = "Engineering" }, /turf/open/floor/plasteel, /area/awaymission/vr/abandoned_mine) @@ -5111,9 +5109,9 @@ /area/awaymission/vr/abandoned_mine) "PN" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Armory"; - req_access_txt = "200" + name = "Armory" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/dark, /area/awaymission/vr/combat_robot_factory) "PO" = ( @@ -6008,7 +6006,6 @@ "Wf" = ( /obj/machinery/door/airlock/highsecurity{ name = "Storage"; - req_access_txt = "0" }, /turf/open/floor/plasteel/dark, /area/awaymission/vr/scientist_raid) diff --git a/_maps/RandomZLevels/VR/snowdin_VR.dmm b/_maps/RandomZLevels/VR/snowdin_VR.dmm index 8a7547f10ea6..1c08baef6e92 100644 --- a/_maps/RandomZLevels/VR/snowdin_VR.dmm +++ b/_maps/RandomZLevels/VR/snowdin_VR.dmm @@ -845,9 +845,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/dorm) "cp" = ( @@ -1631,9 +1630,8 @@ pixel_x = 5; pixel_y = 5 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post) "dM" = ( @@ -1651,10 +1649,10 @@ /area/awaymission/snowdin/post/messhall) "dQ" = ( /obj/machinery/door/airlock/public/glass{ - name = "Kitchen"; - req_access_txt = "35" + name = "Kitchen" }, /obj/structure/barricade/wooden/crude, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/kitchen) "dR" = ( @@ -1823,7 +1821,7 @@ }, /turf/open/floor/plating, /area/awaymission/snowdin/post) -"ek" = ( +"ek" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -1838,11 +1836,10 @@ /turf/open/floor/plating, /area/awaymission/snowdin/post) "em" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/syndicate{ dir = 2; name = "Gateway APC"; pixel_y = -23; - req_access = 150 }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -1913,9 +1910,7 @@ /turf/open/floor/plasteel, /area/awaymission/snowdin/post/messhall) "et" = ( -/obj/machinery/vending/boozeomat{ - req_access_txt = "0" - }, +/obj/machinery/vending/boozeomat, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -2287,11 +2282,11 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/public/glass{ - name = "Kitchen"; - req_access_txt = "35" + name = "Kitchen" }, /obj/machinery/door/firedoor, /obj/structure/barricade/wooden/crude, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/kitchen) "fk" = ( @@ -2500,7 +2495,6 @@ /area/awaymission/snowdin/post) "fF" = ( /obj/structure/closet, -/obj/item/clothing/under/assistantformal, /obj/item/clothing/suit/hooded/wintercoat, /obj/item/clothing/shoes/winterboots, /obj/effect/turf_decal/bot, @@ -3127,9 +3121,9 @@ pixel_y = 5 }, /obj/machinery/door/airlock/maintenance{ - name = "Misc Storage"; - req_access_txt = "12" + name = "Misc Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/dorm) "hc" = ( @@ -3478,8 +3472,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "45" + name = "Medbay Storage" }, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -3487,6 +3480,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /turf/open/floor/plasteel/white, /area/awaymission/snowdin/post) "hP" = ( @@ -3499,9 +3493,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post) "hQ" = ( @@ -3598,9 +3591,8 @@ /turf/closed/wall, /area/awaymission/snowdin/post/garage) "if" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/garage) "ig" = ( @@ -5369,10 +5361,10 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel/cafeteria, /area/awaymission/snowdin/post/messhall) "lF" = ( @@ -5768,10 +5760,10 @@ /area/awaymission/snowdin/post/messhall) "mq" = ( /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel/cafeteria, /area/awaymission/snowdin/post/messhall) "mr" = ( @@ -5943,10 +5935,10 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_access_txt = "32" + name = "Engineering" }, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plasteel/cafeteria, /area/awaymission/snowdin/post/messhall) "mQ" = ( @@ -6335,8 +6327,7 @@ }, /obj/machinery/door/airlock/security{ name = "Security Checkpoint"; - req_access = null; - req_access_txt = "1" + req_access = null }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -6348,6 +6339,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/secpost) "nH" = ( @@ -6477,9 +6469,9 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/hydro) "nY" = ( @@ -6515,7 +6507,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access_txt = "201" + req_access = list("security") }, /obj/item/restraints/handcuffs, /obj/item/assembly/flash, @@ -7226,9 +7218,9 @@ /area/awaymission/snowdin/post/secpost) "pJ" = ( /obj/machinery/door/airlock/vault{ - name = "Armory"; - req_access_txt = "3" + name = "Armory" }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel/dark, /area/awaymission/snowdin/post/secpost) "pK" = ( @@ -7583,9 +7575,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/engineering) "qD" = ( @@ -7749,7 +7740,7 @@ name = "Turbine Access Console"; pixel_x = -8; pixel_y = -26; - req_access_txt = "32" + req_access = list("construction") }, /obj/machinery/button/ignition/indestructible{ id = "snowdin_turbine_ignitor"; @@ -7953,10 +7944,10 @@ frequency = 1449; heat_proof = 1; id_tag = "snowdin_turbine_exterior"; - name = "Turbine Exterior Airlock"; - req_access_txt = "32" + name = "Turbine Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/engine, /area/awaymission/snowdin/post/engineering) "rr" = ( @@ -8245,12 +8236,12 @@ frequency = 1449; heat_proof = 1; id_tag = "snowdin_turbine_interior"; - name = "Turbine Interior Airlock"; - req_access_txt = "32" + name = "Turbine Interior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/engine, /area/awaymission/snowdin/post/engineering) "si" = ( @@ -8319,12 +8310,12 @@ /area/awaymission/snowdin/post/cavern2) "su" = ( /obj/machinery/door/airlock/maintenance{ - name = "SMES Storage"; - req_access_txt = "32" + name = "SMES Storage" }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern2) "sv" = ( @@ -8523,9 +8514,9 @@ /area/awaymission/snowdin/cave/cavern) "sQ" = ( /obj/machinery/door/airlock/maintenance{ - name = "Misc Storage"; - req_access_txt = "12" + name = "Misc Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern2) "sR" = ( @@ -8966,12 +8957,12 @@ /area/awaymission/snowdin/post/cavern1) "us" = ( /obj/machinery/door/airlock/maintenance{ - name = "SMES Storage"; - req_access_txt = "32" + name = "SMES Storage" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern1) "ut" = ( @@ -9052,9 +9043,9 @@ /area/awaymission/snowdin/outside) "uD" = ( /obj/machinery/door/airlock/maintenance{ - name = "Misc Storage"; - req_access_txt = "12" + name = "Misc Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern1) "uE" = ( @@ -9934,12 +9925,12 @@ /area/awaymission/snowdin/cave/mountain) "wR" = ( /obj/machinery/door/airlock/maintenance{ - name = "SMES Storage"; - req_access_txt = "32" + name = "SMES Storage" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) "wS" = ( @@ -10255,8 +10246,7 @@ /area/awaymission/snowdin/post/mining_dock) "xH" = ( /obj/machinery/door/airlock/vault{ - name = "Relic Storage"; - req_access_txt = "3" + name = "Relic Storage" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -10268,6 +10258,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/mining_dock) "xI" = ( @@ -11618,9 +11609,8 @@ /turf/open/floor/plating/snowed/cavern, /area/awaymission/snowdin/cave/cavern) "Bj" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/awaymission/snowdin/post/minipost) "Bk" = ( @@ -12614,8 +12604,7 @@ /area/awaymission/snowdin/cave) "DG" = ( /obj/machinery/door/airlock/external{ - name = "Ready Room"; - req_access_txt = "150" + name = "Ready Room" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -12627,6 +12616,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/awaymission/snowdin/cave) "DH" = ( @@ -12639,9 +12629,8 @@ /turf/open/floor/plating, /area/awaymission/snowdin/cave) "DJ" = ( -/obj/machinery/door/airlock/hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/hatch, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/mineral/plastitanium, /area/awaymission/snowdin/cave) "DK" = ( @@ -14083,9 +14072,9 @@ /area/awaymission/snowdin/post/mining_dock) "Hy" = ( /obj/machinery/door/airlock/research/glass{ - name = "Mech Lab"; - req_access_txt = "29" + name = "Mech Lab" }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/mining_main/mechbay) "Hz" = ( @@ -14288,12 +14277,12 @@ /area/awaymission/snowdin/post/mining_main/robotics) "Ic" = ( /obj/machinery/door/airlock/research{ - name = "Robotics Lab"; - req_access_txt = "29" + name = "Robotics Lab" }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel/white, /area/awaymission/snowdin/post/mining_main/robotics) "Id" = ( @@ -14481,9 +14470,8 @@ /turf/open/floor/plasteel, /area/awaymission/snowdin/post/mining_dock) "IE" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main/mechbay) "IF" = ( @@ -14550,12 +14538,11 @@ /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) "IN" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) "IO" = ( @@ -14676,12 +14663,12 @@ /area/awaymission/snowdin/post/mining_dock) "Jb" = ( /obj/machinery/door/airlock/maintenance{ - name = "SMES Storage"; - req_access_txt = "32" + name = "SMES Storage" }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) "Jc" = ( @@ -14739,9 +14726,9 @@ /area/awaymission/snowdin/cave/cavern) "Jj" = ( /obj/machinery/door/airlock/maintenance{ - name = "Misc Storage"; - req_access_txt = "12" + name = "Misc Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main) "Jk" = ( @@ -14753,8 +14740,7 @@ /area/awaymission/snowdin/post/mining_dock) "Jl" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mining Dock"; - req_access_txt = "48" + name = "Mining Dock" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -14766,6 +14752,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/mining_dock) "Jm" = ( @@ -14805,8 +14792,7 @@ /area/awaymission/snowdin/cave/cavern) "Jr" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mining Dock"; - req_access_txt = "48" + name = "Mining Dock" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -14818,6 +14804,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/mining_main) "Js" = ( @@ -15098,9 +15085,9 @@ /area/awaymission/snowdin/post/mining_dock) "JZ" = ( /obj/machinery/door/airlock/maintenance{ - name = "Misc Storage"; - req_access_txt = "12" + name = "Misc Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) "Ka" = ( @@ -15410,9 +15397,9 @@ /area/awaymission/snowdin/post/mining_main) "KK" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_access_txt = "32" + name = "Engineering" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main) "KL" = ( @@ -15580,8 +15567,7 @@ /area/awaymission/snowdin/post/garage) "OF" = ( /obj/machinery/door/airlock/external{ - name = "Ready Room"; - req_access_txt = "150" + name = "Ready Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -15596,12 +15582,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/awaymission/snowdin/cave) "PR" = ( /obj/machinery/door/airlock/external{ - name = "Ready Room"; - req_access_txt = "150" + name = "Ready Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/tile/neutral{ @@ -15614,6 +15600,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/awaymission/snowdin/cave) "Qd" = ( diff --git a/_maps/RandomZLevels/VR/syndicate_trainer.dmm b/_maps/RandomZLevels/VR/syndicate_trainer.dmm index 0bb1e92c6c5c..c05dddb97fd0 100644 --- a/_maps/RandomZLevels/VR/syndicate_trainer.dmm +++ b/_maps/RandomZLevels/VR/syndicate_trainer.dmm @@ -542,7 +542,7 @@ dir = 4; icon_state = "right"; name = "Security Desk"; - req_access_txt = "103" + req_access = list("cent_specops") }, /turf/open/floor/mineral/titanium/yellow, /area/awaymission/centcomAway/hangar) @@ -695,9 +695,9 @@ /area/awaymission/centcomAway/cafe) "et" = ( /obj/machinery/door/airlock/hatch{ - name = "Cockpit"; - req_access_txt = "109" + name = "Cockpit" }, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, /turf/open/floor/mineral/titanium, /area/awaymission/centcomAway/hangar) "eu" = ( @@ -793,9 +793,9 @@ /area/awaymission/centcomAway/general) "eT" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Access"; - req_access_txt = "10" + name = "Engineering Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/indestructible, /area/awaymission/centcomAway/general) "eU" = ( @@ -940,9 +940,9 @@ /area/awaymission/centcomAway/courtroom) "fG" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_access_txt = "32" + name = "Engineering" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/indestructible, /area/awaymission/centcomAway/general) "fH" = ( @@ -1006,9 +1006,9 @@ /area/awaymission/centcomAway/courtroom) "fU" = ( /obj/machinery/door/airlock/public/glass{ - name = "Med-Sci"; - req_access_txt = "9" + name = "Med-Sci" }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/indestructible, /area/awaymission/centcomAway/general) "fV" = ( @@ -1126,9 +1126,9 @@ /area/awaymission/centcomAway/hangar) "gF" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" + name = "Bridge" }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/indestructible, /area/awaymission/centcomAway/general) "gG" = ( @@ -1307,7 +1307,7 @@ name = "Hangar Bay Blast Doors"; pixel_x = -28; pixel_y = 7; - req_access_txt = "2" + req_access = list("brig") }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1715,7 +1715,7 @@ name = "Hangar Bay Shutters"; pixel_x = -28; pixel_y = 7; - req_access_txt = "2" + req_access = list("brig") }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -2092,9 +2092,7 @@ /turf/open/indestructible, /area/awaymission/centcomAway/thunderdome) "me" = ( -/obj/machinery/vending/boozeomat{ - req_access_txt = "" - }, +/obj/machinery/vending/boozeomat, /turf/closed/indestructible/riveted, /area/awaymission/centcomAway/cafe) "mg" = ( diff --git a/_maps/RandomZLevels/VR/vrhub.dmm b/_maps/RandomZLevels/VR/vrhub.dmm index 66a9cfb6b0c4..d0c023da1053 100644 --- a/_maps/RandomZLevels/VR/vrhub.dmm +++ b/_maps/RandomZLevels/VR/vrhub.dmm @@ -1453,12 +1453,6 @@ }, /turf/open/floor/plasteel, /area/awaymission/vr/syndicate) -"sy" = ( -/obj/machinery/vending/boozeomat{ - req_access_txt = "" - }, -/turf/closed/indestructible/riveted, -/area/awaymission/vr/syndicate) "sG" = ( /obj/structure/closet/emcloset, /turf/open/floor/mineral/titanium/blue, @@ -1600,9 +1594,9 @@ /area/awaymission/vr/hub) "vs" = ( /obj/machinery/door/airlock{ - name = "Bar Storage"; - req_access_txt = "25" + name = "Bar Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/indestructible, /area/awaymission/vr/hub) "vE" = ( @@ -1967,9 +1961,9 @@ /area/awaymission/vr/hub) "BL" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_access_txt = "32" + name = "Engineering" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/indestructible, /area/awaymission/vr/syndicate) "BO" = ( @@ -2193,7 +2187,7 @@ name = "Hangar Bay Blast Doors"; pixel_x = -28; pixel_y = 7; - req_access_txt = "2" + req_access = list("brig") }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -2397,9 +2391,9 @@ /area/awaymission/vr/syndicate) "Jb" = ( /obj/machinery/door/airlock/hatch{ - name = "Cockpit"; - req_access_txt = "109" + name = "Cockpit" }, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, /turf/open/floor/mineral/titanium, /area/awaymission/vr/syndicate) "Jc" = ( @@ -2540,9 +2534,7 @@ /turf/open/indestructible/necropolis, /area/awaymission/vr/megafauna_arena/arena) "Mi" = ( -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, +/obj/structure/closet/secure_closet/bar, /turf/open/indestructible, /area/awaymission/vr/hub) "Mu" = ( @@ -2550,6 +2542,10 @@ /obj/structure/chair, /turf/open/indestructible, /area/awaymission/vr/syndicate) +"My" = ( +/obj/machinery/vending/boozeomat, +/turf/closed/indestructible/riveted, +/area/awaymission/vr/syndicate) "MG" = ( /obj/structure/closet/crate, /obj/effect/turf_decal/stripes/line{ @@ -2903,7 +2899,7 @@ name = "Hangar Bay Shutters"; pixel_x = -28; pixel_y = 7; - req_access_txt = "2" + req_access = list("brig") }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -3008,9 +3004,9 @@ /area/awaymission/vr/syndicate) "To" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Access"; - req_access_txt = "10" + name = "Engineering Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/indestructible, /area/awaymission/vr/syndicate) "Tx" = ( @@ -3034,9 +3030,9 @@ /area/awaymission/vr/hub) "TD" = ( /obj/machinery/door/airlock/public/glass{ - name = "Med-Sci"; - req_access_txt = "9" + name = "Med-Sci" }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/indestructible, /area/awaymission/vr/syndicate) "TF" = ( @@ -3140,7 +3136,7 @@ dir = 4; icon_state = "right"; name = "Security Desk"; - req_access_txt = "103" + req_access = list("cent_specops") }, /turf/open/floor/mineral/titanium/yellow, /area/awaymission/vr/syndicate) @@ -3222,9 +3218,9 @@ /area/awaymission/vr/syndicate) "XE" = ( /obj/machinery/door/airlock{ - name = "Bar Access"; - req_access_txt = "25" + name = "Bar Access" }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/indestructible, /area/awaymission/vr/hub) "XG" = ( @@ -3253,9 +3249,9 @@ /area/awaymission/vr/syndicate) "XP" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" + name = "Bridge" }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/indestructible, /area/awaymission/vr/syndicate) "XQ" = ( @@ -56840,7 +56836,7 @@ gz gz gz xA -sy +My xA xA yx @@ -56848,7 +56844,7 @@ yY yx xA xA -sy +My xA gz gz diff --git a/_maps/RandomZLevels/challenge.dmm b/_maps/RandomZLevels/challenge.dmm index 515f813eedec..84d0739d8731 100644 --- a/_maps/RandomZLevels/challenge.dmm +++ b/_maps/RandomZLevels/challenge.dmm @@ -3,9 +3,7 @@ /turf/open/space, /area/space) "ab" = ( -/turf/closed/indestructible{ - icon_state = "iron0" - }, +/turf/closed/indestructible, /area/awaymission/challenge/start) "ac" = ( /obj/structure/girder, @@ -120,9 +118,7 @@ /turf/open/floor/plasteel/airless, /area/awaymission/challenge/start) "aA" = ( -/turf/closed/indestructible{ - icon_state = "iron0" - }, +/turf/closed/indestructible, /area/awaymission/challenge/main) "aB" = ( /obj/structure/girder, @@ -556,9 +552,7 @@ /turf/open/floor/plating/airless, /area/awaymission/challenge/main) "bP" = ( -/turf/closed/indestructible{ - icon_state = "iron0" - }, +/turf/closed/indestructible, /area/awaymission/challenge/end) "bQ" = ( /obj/item/gun/ballistic/revolver/russian, @@ -662,9 +656,9 @@ "cf" = ( /obj/machinery/door/airlock/centcom{ name = "Airlock"; - opacity = 1; - req_access_txt = "109" + opacity = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, /turf/open/floor/plating, /area/awaymission/challenge/end) "cg" = ( @@ -771,9 +765,9 @@ "cx" = ( /obj/machinery/door/airlock/centcom{ name = "Security"; - opacity = 1; - req_access_txt = "109" + opacity = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, /turf/open/floor/plasteel/dark, /area/awaymission/challenge/end) "cy" = ( @@ -792,16 +786,14 @@ /area/space/nearstation) "cA" = ( /obj/structure/sign/warning/securearea, -/turf/closed/indestructible{ - icon_state = "iron0" - }, +/turf/closed/indestructible, /area/awaymission/challenge/end) "cB" = ( /obj/machinery/door/airlock/centcom{ name = "Administrator"; - opacity = 1; - req_access_txt = "109" + opacity = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, /turf/open/floor/plasteel/dark, /area/awaymission/challenge/end) "cC" = ( @@ -1091,9 +1083,9 @@ "dk" = ( /obj/machinery/door/airlock/centcom{ name = "Gateway Access"; - opacity = 1; - req_access_txt = "109" + opacity = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, /turf/open/floor/plasteel/dark, /area/awaymission/challenge/end) "dl" = ( diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index f1256a899029..5151a735e793 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -536,15 +536,13 @@ }, /area/awaymission/moonoutpost19/syndicate) "bo" = ( -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = null; - req_access_txt = "150" - }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 + }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -604,8 +602,7 @@ "bs" = ( /obj/machinery/door/window{ dir = 1; - name = "Gateway Access"; - req_access_txt = "150" + name = "Gateway Access" }, /obj/structure/cable{ icon_state = "1-2" @@ -613,6 +610,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 1 + }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -733,13 +733,11 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/airalarm{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/syndicate{ dir = 8; - pixel_x = 24; - req_access = null; - req_access_txt = "150" + pixel_x = 24 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -857,9 +855,9 @@ }, /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/highsecurity{ - name = "Gateway"; - req_access_txt = "150" + name = "Gateway" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -914,14 +912,12 @@ /area/awaymission/moonoutpost19/syndicate) "bU" = ( /obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = null; - req_access_txt = "150" - }, /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 + }, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -1020,10 +1016,8 @@ }, /area/awaymission/moonoutpost19/syndicate) "cd" = ( -/obj/machinery/airalarm/unlocked{ - pixel_y = 24; - req_access = null; - req_access_txt = "150" +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /turf/open/floor/plasteel{ dir = 8; @@ -1256,9 +1250,9 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/engineering{ - name = "Power Maintenance"; - req_access_txt = "150" + name = "Power Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -1411,9 +1405,8 @@ locked = 1; name = "Worn-out APC"; pixel_y = -23; - req_access = null; - req_access_txt = "150"; - start_charge = 0 + start_charge = 0; + req_access = list("syndicate") }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -1511,12 +1504,6 @@ }, /area/awaymission/moonoutpost19/syndicate) "cS" = ( -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24; - req_access = null; - req_access_txt = "150" - }, /obj/machinery/light/broken{ dir = 4 }, @@ -1524,6 +1511,10 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/machinery/airalarm/syndicate{ + dir = 8; + pixel_x = 24 + }, /turf/open/floor/plasteel{ heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; @@ -1691,13 +1682,11 @@ /area/awaymission/moonoutpost19/syndicate) "dh" = ( /obj/structure/chair/wood/normal, -/obj/machinery/airalarm{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/syndicate{ dir = 4; - pixel_x = -24; - req_access = null; - req_access_txt = "150" + pixel_x = -24 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/wood{ heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" @@ -1721,11 +1710,9 @@ }, /area/awaymission/moonoutpost19/syndicate) "dk" = ( -/obj/machinery/airalarm{ +/obj/machinery/airalarm/syndicate{ dir = 8; - pixel_x = 24; - req_access = null; - req_access_txt = "150" + pixel_x = 24 }, /turf/open/floor/wood{ heat_capacity = 1e+006 @@ -1799,7 +1786,7 @@ /area/awaymission/moonoutpost19/syndicate) "dr" = ( /obj/structure/closet/secure_closet/personal/cabinet{ - req_access_txt = "150" + req_access = list("syndicate") }, /obj/item/ammo_box/magazine/m10mm{ icon_state = "9x19p-8" @@ -1824,7 +1811,7 @@ "dt" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/item/stack/spacecash/c50, /turf/open/floor/wood{ @@ -1837,10 +1824,10 @@ density = 0; icon_state = "open"; opacity = 0; - req_access_txt = "150"; set_obj_flags = "EMAGGED" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating{ heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" @@ -1994,12 +1981,12 @@ density = 0; icon_state = "open"; opacity = 0; - req_access_txt = "150"; set_obj_flags = "EMAGGED" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating{ heat_capacity = 1e+006; icon_plating = "asteroidplating"; @@ -2396,7 +2383,7 @@ name = "Containment Chamber Blast Doors"; pixel_x = 4; pixel_y = -2; - req_access_txt = "201" + req_access = list("ruins_maintenance") }, /obj/machinery/button/ignition{ id = "awayxenobio"; @@ -2534,14 +2521,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "201" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/decal/cleanable/blood/tracks{ desc = "Your instincts say you shouldn't be following these."; dir = 8; icon_state = "ltrails_1" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -2767,9 +2753,9 @@ icon_state = "open"; name = "Xenobiology Lab"; opacity = 0; - req_access_txt = "201"; set_obj_flags = "EMAGGED" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -2988,7 +2974,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access_txt = "201" + req_access = list("ruins_maintenance") }, /obj/item/clothing/suit/armor/vest, /obj/item/reagent_containers/spray/pepper, @@ -3158,9 +3144,9 @@ /area/awaymission/moonoutpost19/research) "gk" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Post"; - req_access_txt = "201" + name = "Security Post" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -3182,7 +3168,7 @@ icon_state = "1-2" }, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 28 }, /obj/structure/alien/weeds, @@ -3506,7 +3492,7 @@ id = "Awaybiohazard"; name = "Biohazard Shutter Control"; pixel_x = -25; - req_access_txt = "201" + req_access = list("ruins_maintenance") }, /obj/machinery/light/small{ dir = 8 @@ -3756,7 +3742,7 @@ /area/awaymission/moonoutpost19/hive) "hm" = ( /obj/machinery/vending/medical{ - req_access_txt = "201" + req_access = list("ruins_maintenance") }, /turf/open/floor/plasteel/white/side{ dir = 2; @@ -3799,7 +3785,7 @@ icon_state = "rd"; locked = 1; name = "research director's locker"; - req_access_txt = "201" + req_access = list("ruins_maintenance") }, /obj/item/storage/backpack/satchel/tox, /obj/item/clothing/gloves/color/latex, @@ -3913,7 +3899,7 @@ /obj/structure/table, /obj/item/storage/firstaid/fire, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 28 }, /turf/open/floor/plasteel/white/side{ @@ -3940,9 +3926,9 @@ icon_state = "open"; name = "Research Director's Office"; opacity = 0; - req_access_txt = "201"; set_obj_flags = "EMAGGED" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -3976,9 +3962,9 @@ /area/awaymission/moonoutpost19/research) "hG" = ( /obj/machinery/door/airlock/research/glass{ - name = "Research Storage"; - req_access_txt = "201" + name = "Research Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -4207,10 +4193,10 @@ /area/awaymission/moonoutpost19/research) "ie" = ( /obj/machinery/door/airlock/medical{ - name = "Research Division"; - req_access_txt = "201" + name = "Research Division" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -4315,13 +4301,13 @@ id = "Awaybiohazard"; name = "Biohazard Shutter Control"; pixel_y = 8; - req_access_txt = "201" + req_access = list("ruins_maintenance") }, /obj/machinery/button/door{ id = "AwayRD"; name = "Privacy Shutter Control"; pixel_y = -2; - req_access_txt = "201" + req_access = list("ruins_maintenance") }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -4637,9 +4623,7 @@ /turf/closed/wall/rust, /area/awaymission/moonoutpost19/arrivals) "iU" = ( -/obj/machinery/vending/boozeomat{ - req_access_txt = "0" - }, +/obj/machinery/vending/boozeomat, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -5563,7 +5547,7 @@ /area/awaymission/moonoutpost19/arrivals) "kO" = ( /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 24 }, /obj/effect/decal/cleanable/dirt, @@ -5630,7 +5614,7 @@ "kU" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "201" + req_access = list("ruins_maintenance") }, /obj/item/clothing/under/suit/navy, /turf/open/floor/carpet{ @@ -5860,7 +5844,7 @@ /area/awaymission/moonoutpost19/arrivals) "ls" = ( /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 24 }, /obj/effect/decal/cleanable/dirt, @@ -5890,9 +5874,9 @@ /area/awaymission/moonoutpost19/arrivals) "lu" = ( /obj/machinery/door/airlock{ - name = "Kitchen Cold Room"; - req_access_txt = "201" + name = "Kitchen Cold Room" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel/showroomfloor{ heat_capacity = 1e+006 }, @@ -5920,7 +5904,7 @@ name = "Kitchen Crate" }, /obj/item/storage/box/mousetraps, -/obj/item/clothing/under/waiter, +/obj/item/clothing/under/suit/waiter, /turf/open/floor/plasteel/showroomfloor{ heat_capacity = 1e+006; initial_temperature = 273.15 @@ -6038,9 +6022,9 @@ "lQ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ - name = "Kitchen"; - req_access_txt = "201" + name = "Kitchen" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel/dark, /area/awaymission/moonoutpost19/arrivals) "lR" = ( @@ -6183,7 +6167,7 @@ icon_state = "secure"; locked = 0; name = "kitchen Cabinet"; - req_access_txt = "201" + req_access = list("ruins_maintenance") }, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, @@ -6198,7 +6182,7 @@ /obj/structure/closet/secure_closet/freezer{ locked = 0; name = "meat fridge"; - req_access_txt = "201" + req_access = list("ruins_maintenance") }, /obj/item/reagent_containers/food/snacks/meat/slab/monkey, /obj/item/reagent_containers/food/snacks/meat/slab/monkey, @@ -6213,7 +6197,7 @@ /obj/structure/closet/secure_closet/freezer{ locked = 0; name = "refrigerator"; - req_access_txt = "201" + req_access = list("ruins_maintenance") }, /obj/item/reagent_containers/food/condiment/milk, /obj/item/reagent_containers/food/condiment/milk, @@ -6561,9 +6545,9 @@ "nb" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "201" + req_access = list("ruins_maintenance") }, -/obj/item/clothing/under/assistantformal, +/obj/item/clothing/under/rank/civilian/assistantformal, /turf/open/floor/carpet{ heat_capacity = 1e+006 }, @@ -6760,9 +6744,8 @@ }, /area/awaymission/moonoutpost19/arrivals) "nz" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "201" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -6971,7 +6954,7 @@ "nT" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "201" + req_access = list("ruins_maintenance") }, /obj/item/clothing/under/suit/burgundy, /turf/open/floor/carpet{ @@ -7097,7 +7080,7 @@ icon_state = "science"; locked = 0; name = "scientist's locker"; - req_access_txt = "201" + req_access = list("ruins_maintenance") }, /obj/item/clothing/suit/toggle/labcoat, /turf/open/floor/plasteel{ @@ -7110,7 +7093,7 @@ icon_state = "science"; locked = 1; name = "scientist's locker"; - req_access_txt = "201" + req_access = list("ruins_maintenance") }, /obj/item/clothing/suit/toggle/labcoat, /obj/item/tank/internals/air, @@ -7138,12 +7121,12 @@ /area/awaymission/moonoutpost19/arrivals) "Mm" = ( /obj/machinery/door/airlock/medical{ - name = "Research Division"; - req_access_txt = "201" + name = "Research Division" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index 7b17864b8c0a..7e64c0f17c69 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -228,12 +228,6 @@ "aO" = ( /turf/open/floor/plating, /area/awaymission/research/interior/maint) -"aP" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "12" - }, -/turf/open/floor/plating, -/area/awaymission/research/interior/maint) "aQ" = ( /obj/effect/turf_decal/tile/yellow, /turf/open/floor/plasteel/white, @@ -548,9 +542,8 @@ /turf/open/floor/plasteel/white, /area/awaymission/research/interior/engineering) "bx" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/awaymission/research/interior/maint) "by" = ( @@ -922,14 +915,14 @@ /area/awaymission/research/interior) "cq" = ( /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/white, /area/awaymission/research/interior/engineering) "cr" = ( @@ -943,8 +936,7 @@ /area/awaymission/research/interior) "cs" = ( /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/tile/yellow{ @@ -953,6 +945,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/white, /area/awaymission/research/interior/engineering) "ct" = ( @@ -987,10 +980,9 @@ /turf/closed/wall/r_wall, /area/awaymission/research/interior/genetics) "cy" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Genetics Maintenance"; - req_access_txt = "9" - }, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/awaymission/research/interior/maint) "cz" = ( @@ -1189,9 +1181,9 @@ }, /obj/machinery/door/airlock/highsecurity{ aiDisabledIdScanner = 1; - name = "Gateway Access"; - req_access_txt = "205" + name = "Gateway Access" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/awaymission/research/interior/gateway) "cS" = ( @@ -1289,19 +1281,18 @@ /area/awaymission/research/interior/maint) "cZ" = ( /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "da" = ( /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -1309,6 +1300,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "db" = ( @@ -1878,18 +1870,18 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/highsecurity{ aiDisabledIdScanner = 1; - name = "Secure Storage C"; - req_access_txt = "205" + name = "Secure Storage C" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/awaymission/research/interior/secure) "dX" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/highsecurity{ aiDisabledIdScanner = 1; - name = "Secure Storage D"; - req_access_txt = "205" + name = "Secure Storage D" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/awaymission/research/interior/secure) "dY" = ( @@ -2060,16 +2052,6 @@ "es" = ( /turf/open/floor/plating, /area/awaymission/research/interior) -"et" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "12" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plating, -/area/awaymission/research/interior/maint) "eu" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -2197,12 +2179,8 @@ /turf/open/floor/plating, /area/awaymission/research/interior/maint) "eH" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "12" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/research/interior/maint) "eI" = ( @@ -2280,8 +2258,7 @@ /area/awaymission/research/interior/maint) "eQ" = ( /obj/machinery/door/window/northright{ - name = "Cell Door"; - req_access_txt = "63" + name = "Cell Door" }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -2289,6 +2266,9 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/security/basic{ + dir = 1 + }, /turf/open/floor/plasteel, /area/awaymission/research/interior/security) "eR" = ( @@ -2301,8 +2281,7 @@ "eS" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -2310,6 +2289,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/awaymission/research/interior/security) "eT" = ( @@ -2706,13 +2686,13 @@ /area/awaymission/research/interior/cryo) "fK" = ( /obj/machinery/door/airlock/research{ - name = "Cryogenetics Research"; - req_access_txt = "9" + name = "Cryogenetics Research" }, /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/awaymission/research/interior/cryo) "fL" = ( @@ -2724,8 +2704,7 @@ /area/awaymission/research/interior) "fM" = ( /obj/machinery/door/airlock/research{ - name = "Cryogenetics Research"; - req_access_txt = "9" + name = "Cryogenetics Research" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -2734,6 +2713,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "fN" = ( @@ -2796,13 +2776,13 @@ "fS" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "fT" = ( @@ -2966,12 +2946,12 @@ "gg" = ( /obj/machinery/door/airlock/highsecurity{ aiDisabledIdScanner = 1; - name = "Power Storage"; - req_access_txt = "205" + name = "Power Storage" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/awaymission/research/interior/secure) "gh" = ( @@ -3000,12 +2980,12 @@ }, /obj/machinery/door/airlock/highsecurity{ aiDisabledIdScanner = 0; - name = "Vault Storage"; - req_access_txt = "205" + name = "Vault Storage" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/awaymission/research/interior/secure) "gm" = ( @@ -3017,8 +2997,7 @@ /area/awaymission/research/interior/secure) "gn" = ( /obj/machinery/door/airlock/research{ - name = "Secure Storage"; - req_access_txt = "9,63" + name = "Secure Storage" }, /obj/structure/cable{ icon_state = "4-8" @@ -3026,6 +3005,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/awaymission/research/interior/secure) "go" = ( @@ -3046,8 +3027,7 @@ /area/awaymission/research/interior) "gq" = ( /obj/machinery/door/airlock/research{ - name = "Cryogenetics Research"; - req_access_txt = "9" + name = "Cryogenetics Research" }, /obj/structure/cable{ icon_state = "4-8" @@ -3055,6 +3035,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plating, /area/awaymission/research/interior) "gr" = ( @@ -3097,8 +3078,7 @@ /area/awaymission/research/interior) "gt" = ( /obj/machinery/door/airlock/research{ - name = "Cryogenetics Research"; - req_access_txt = "9" + name = "Cryogenetics Research" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -3113,6 +3093,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/awaymission/research/interior/cryo) "gu" = ( @@ -3575,8 +3556,7 @@ "hb" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -3584,6 +3564,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "hc" = ( @@ -3879,13 +3860,13 @@ /area/awaymission/research/interior/maint) "hE" = ( /obj/machinery/door/window/southright{ - name = "Cell Door"; - req_access_txt = "63" + name = "Cell Door" }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/security/basic, /turf/open/floor/plasteel, /area/awaymission/research/interior/security) "hF" = ( @@ -3918,18 +3899,18 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/highsecurity{ aiDisabledIdScanner = 1; - name = "Secure Storage A"; - req_access_txt = "205" + name = "Secure Storage A" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/awaymission/research/interior/secure) "hJ" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/highsecurity{ aiDisabledIdScanner = 1; - name = "Secure Storage B"; - req_access_txt = "205" + name = "Secure Storage B" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/awaymission/research/interior/secure) "hK" = ( @@ -4351,16 +4332,6 @@ }, /turf/open/floor/plating, /area/awaymission/research/interior/maint) -"iv" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Security Maintenance"; - req_access_txt = "63" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/awaymission/research/interior/maint) "iw" = ( /obj/machinery/power/apc/highcap/five_k{ dir = 4; @@ -4576,15 +4547,6 @@ }, /turf/open/floor/plasteel, /area/awaymission/research/interior/maint) -"iT" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "12" - }, -/turf/open/floor/plating, -/area/awaymission/research/interior/maint) "iU" = ( /obj/structure/cable{ icon_state = "4-8" @@ -5222,7 +5184,7 @@ icon_state = "0-2" }, /turf/open/floor/plating, -/area/awaymission/research/interior/dorm) +/area/awaymission/research/interior/maint) "kq" = ( /obj/machinery/door/airlock{ id_tag = "Dorm1"; @@ -5580,9 +5542,6 @@ dir = 8 }, /area/awaymission/research/interior/dorm) -"ln" = ( -/turf/open/floor/plasteel, -/area/space/nearstation) "lo" = ( /obj/structure/table/wood, /obj/structure/bedsheetbin, @@ -5897,7 +5856,7 @@ icon_state = "0-8" }, /turf/open/floor/plating, -/area/awaymission/research/interior/escapepods) +/area/awaymission/research/interior/maint) "ma" = ( /turf/closed/wall/r_wall, /area/awaymission/research/interior/escapepods) @@ -6371,8 +6330,7 @@ /area/awaymission/research/interior) "va" = ( /obj/machinery/door/airlock/research{ - name = "Cryogenetics Research"; - req_access_txt = "9" + name = "Cryogenetics Research" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -6381,6 +6339,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "wM" = ( @@ -6406,12 +6365,8 @@ /turf/open/floor/plating, /area/awaymission/research/interior/escapepods) "zn" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "12" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, @@ -6419,8 +6374,7 @@ /area/awaymission/research/interior/maint) "Bx" = ( /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -6429,12 +6383,12 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "Do" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -6443,8 +6397,7 @@ "Km" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -6453,6 +6406,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "Qd" = ( @@ -6473,8 +6427,7 @@ "Qz" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -6485,12 +6438,12 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "TD" = ( /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -6501,6 +6454,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "TE" = ( @@ -6515,8 +6469,7 @@ "Uu" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -6525,12 +6478,12 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "UA" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -6539,8 +6492,7 @@ "WR" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -6551,6 +6503,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/white, /area/awaymission/research/interior) "XE" = ( @@ -37265,7 +37218,7 @@ ad aH cm dZ -et +cy fa fC gs @@ -39077,7 +39030,7 @@ cK dt cK cK -cy +eH cd id cd @@ -39088,7 +39041,7 @@ iX iX iX iX -aP +eH iX iX iX @@ -40631,7 +40584,7 @@ kr jn jF jF -ln +jF jF lL jk @@ -42164,7 +42117,7 @@ iK iN iM id -iT +eH iX iX iX @@ -42905,7 +42858,7 @@ ar ar ar ar -aP +eH ar ar ar @@ -43207,7 +43160,7 @@ lN lU lU lY -aP +eH cd mb mi @@ -43449,7 +43402,7 @@ id id id id -iT +eH iX jp jG @@ -43466,7 +43419,7 @@ iX iX iX cd -aP +eH mi mn mn @@ -43969,7 +43922,7 @@ jq jH kd iD -iT +eH iD iD iD @@ -44997,7 +44950,7 @@ js jJ ke cp -iT +eH iD iD iD @@ -45007,7 +44960,7 @@ iD iD iD iD -aP +eH iD mp mx @@ -46261,11 +46214,11 @@ aH aO aO aO -aP +eH fT gG hc -aP +eH cm bD cw @@ -49371,7 +49324,7 @@ jh lg lt kh -aP +eH cd aH ad @@ -50639,7 +50592,7 @@ hH hR hR ik -iv +eH cw aH ad diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 72be40fc2578..a927029d8d06 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -856,9 +856,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/dorm) "cp" = ( @@ -1641,9 +1640,8 @@ pixel_x = 5; pixel_y = 5 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post) "dM" = ( @@ -1661,10 +1659,10 @@ /area/awaymission/snowdin/post/messhall) "dQ" = ( /obj/machinery/door/airlock/public/glass{ - name = "Kitchen"; - req_access_txt = "35" + name = "Kitchen" }, /obj/structure/barricade/wooden/crude, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/kitchen) "dR" = ( @@ -1849,11 +1847,10 @@ /turf/open/floor/plating, /area/awaymission/snowdin/post) "em" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/syndicate{ dir = 2; name = "Gateway APC"; - pixel_y = -23; - req_access = 150 + pixel_y = -23 }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -1924,9 +1921,7 @@ /turf/open/floor/plasteel, /area/awaymission/snowdin/post/messhall) "et" = ( -/obj/machinery/vending/boozeomat{ - req_access_txt = "0" - }, +/obj/machinery/vending/boozeomat, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -2298,11 +2293,11 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/public/glass{ - name = "Kitchen"; - req_access_txt = "35" + name = "Kitchen" }, /obj/machinery/door/firedoor, /obj/structure/barricade/wooden/crude, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/kitchen) "fk" = ( @@ -3158,9 +3153,9 @@ pixel_y = 5 }, /obj/machinery/door/airlock/maintenance{ - name = "Misc Storage"; - req_access_txt = "12" + name = "Misc Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/dorm) "hc" = ( @@ -3497,8 +3492,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "45" + name = "Medbay Storage" }, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -3506,6 +3500,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /turf/open/floor/plasteel/white, /area/awaymission/snowdin/post) "hP" = ( @@ -3518,9 +3513,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post) "hQ" = ( @@ -3613,9 +3607,8 @@ /turf/closed/wall, /area/awaymission/snowdin/post/garage) "if" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/garage) "ig" = ( @@ -5431,10 +5424,10 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel/cafeteria, /area/awaymission/snowdin/post/messhall) "lF" = ( @@ -5830,10 +5823,10 @@ /area/awaymission/snowdin/post/messhall) "mq" = ( /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel/cafeteria, /area/awaymission/snowdin/post/messhall) "mr" = ( @@ -6013,10 +6006,10 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_access_txt = "32" + name = "Engineering" }, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plasteel/cafeteria, /area/awaymission/snowdin/post/messhall) "mQ" = ( @@ -6405,8 +6398,7 @@ }, /obj/machinery/door/airlock/security{ name = "Security Checkpoint"; - req_access = null; - req_access_txt = "1" + req_access = null }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -6418,6 +6410,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/secpost) "nH" = ( @@ -6547,9 +6540,9 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/hydro) "nY" = ( @@ -6585,7 +6578,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access_txt = "201" + req_access = list("ruins_general") }, /obj/item/restraints/handcuffs, /obj/item/assembly/flash, @@ -7296,9 +7289,9 @@ /area/awaymission/snowdin/post/secpost) "pJ" = ( /obj/machinery/door/airlock/vault{ - name = "Armory"; - req_access_txt = "3" + name = "Armory" }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel/dark, /area/awaymission/snowdin/post/secpost) "pK" = ( @@ -7657,9 +7650,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/engineering) "qD" = ( @@ -7823,7 +7815,7 @@ name = "Turbine Access Console"; pixel_x = -8; pixel_y = -26; - req_access_txt = "32" + req_access = list("ruins_general") }, /obj/machinery/button/ignition{ id = "snowdin_turbine_ignitor"; @@ -8036,10 +8028,10 @@ frequency = 1449; heat_proof = 1; id_tag = "snowdin_turbine_exterior"; - name = "Turbine Exterior Airlock"; - req_access_txt = "32" + name = "Turbine Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/engine, /area/awaymission/snowdin/post/engineering) "rr" = ( @@ -8360,12 +8352,12 @@ frequency = 1449; heat_proof = 1; id_tag = "snowdin_turbine_interior"; - name = "Turbine Interior Airlock"; - req_access_txt = "32" + name = "Turbine Interior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/engine, /area/awaymission/snowdin/post/engineering) "sh" = ( @@ -8446,12 +8438,12 @@ /area/awaymission/snowdin/post/cavern2) "su" = ( /obj/machinery/door/airlock/maintenance{ - name = "SMES Storage"; - req_access_txt = "32" + name = "SMES Storage" }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern2) "sv" = ( @@ -8650,9 +8642,9 @@ /area/awaymission/snowdin/cave/cavern) "sQ" = ( /obj/machinery/door/airlock/maintenance{ - name = "Misc Storage"; - req_access_txt = "12" + name = "Misc Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern2) "sR" = ( @@ -9093,12 +9085,12 @@ /area/awaymission/snowdin/post/cavern1) "us" = ( /obj/machinery/door/airlock/maintenance{ - name = "SMES Storage"; - req_access_txt = "32" + name = "SMES Storage" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern1) "ut" = ( @@ -9179,9 +9171,9 @@ /area/awaymission/snowdin/outside) "uD" = ( /obj/machinery/door/airlock/maintenance{ - name = "Misc Storage"; - req_access_txt = "12" + name = "Misc Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern1) "uE" = ( @@ -10061,12 +10053,12 @@ /area/awaymission/snowdin/cave/mountain) "wR" = ( /obj/machinery/door/airlock/maintenance{ - name = "SMES Storage"; - req_access_txt = "32" + name = "SMES Storage" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) "wS" = ( @@ -10382,8 +10374,7 @@ /area/awaymission/snowdin/post/mining_dock) "xH" = ( /obj/machinery/door/airlock/vault{ - name = "Relic Storage"; - req_access_txt = "3" + name = "Relic Storage" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -10395,6 +10386,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/mining_dock) "xI" = ( @@ -11761,9 +11753,8 @@ /turf/open/floor/plating/snowed/cavern, /area/awaymission/snowdin/cave/cavern) "Bj" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/minipost) "Bk" = ( @@ -12755,8 +12746,7 @@ /area/awaymission/snowdin/cave) "DG" = ( /obj/machinery/door/airlock/external{ - name = "Ready Room"; - req_access_txt = "150" + name = "Ready Room" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -12768,6 +12758,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/awaymission/snowdin/cave) "DH" = ( @@ -12780,9 +12771,8 @@ /turf/open/floor/plating, /area/awaymission/snowdin/cave) "DJ" = ( -/obj/machinery/door/airlock/hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/hatch, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/mineral/plastitanium/red, /area/awaymission/snowdin/cave) "DK" = ( @@ -14245,9 +14235,9 @@ /area/awaymission/snowdin/post/mining_dock) "Hy" = ( /obj/machinery/door/airlock/research/glass{ - name = "Mech Lab"; - req_access_txt = "29" + name = "Mech Lab" }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/mining_main/mechbay) "Hz" = ( @@ -14453,12 +14443,12 @@ /area/awaymission/snowdin/post/mining_main/robotics) "Ic" = ( /obj/machinery/door/airlock/research{ - name = "Robotics Lab"; - req_access_txt = "29" + name = "Robotics Lab" }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel/white, /area/awaymission/snowdin/post/mining_main/robotics) "Id" = ( @@ -14646,9 +14636,8 @@ /turf/open/floor/plasteel, /area/awaymission/snowdin/post/mining_dock) "IE" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main/mechbay) "IF" = ( @@ -14715,12 +14704,11 @@ /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) "IN" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) "IO" = ( @@ -14841,12 +14829,12 @@ /area/awaymission/snowdin/post/mining_dock) "Jb" = ( /obj/machinery/door/airlock/maintenance{ - name = "SMES Storage"; - req_access_txt = "32" + name = "SMES Storage" }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) "Jc" = ( @@ -14904,9 +14892,9 @@ /area/awaymission/snowdin/cave/cavern) "Jj" = ( /obj/machinery/door/airlock/maintenance{ - name = "Misc Storage"; - req_access_txt = "12" + name = "Misc Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main) "Jk" = ( @@ -14918,8 +14906,7 @@ /area/awaymission/snowdin/post/mining_dock) "Jl" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mining Dock"; - req_access_txt = "48" + name = "Mining Dock" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -14931,6 +14918,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/mining_dock) "Jm" = ( @@ -14970,8 +14958,7 @@ /area/awaymission/snowdin/cave/cavern) "Jr" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mining Dock"; - req_access_txt = "48" + name = "Mining Dock" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -14983,6 +14970,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/mining_main) "Js" = ( @@ -15266,9 +15254,9 @@ /area/awaymission/snowdin/post/mining_dock) "JZ" = ( /obj/machinery/door/airlock/maintenance{ - name = "Misc Storage"; - req_access_txt = "12" + name = "Misc Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) "Ka" = ( @@ -15576,9 +15564,9 @@ /area/awaymission/snowdin/post/mining_main) "KK" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_access_txt = "32" + name = "Engineering" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main) "KL" = ( @@ -15736,8 +15724,7 @@ /area/awaymission/snowdin/post/mining_dock) "OF" = ( /obj/machinery/door/airlock/external{ - name = "Ready Room"; - req_access_txt = "150" + name = "Ready Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -15752,12 +15739,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/awaymission/snowdin/cave) "PR" = ( /obj/machinery/door/airlock/external{ - name = "Ready Room"; - req_access_txt = "150" + name = "Ready Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/tile/neutral{ @@ -15770,6 +15757,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/awaymission/snowdin/cave) "SX" = ( diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index b352a8cc4672..e88279800a70 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -298,9 +298,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "201" + req_access = list("ruins_general") }, -/obj/item/clothing/under/pj/blue, /turf/open/floor/carpet{ heat_capacity = 1e+006 }, @@ -345,7 +344,7 @@ }, /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "201" + req_access = list("ruins_general") }, /obj/item/clothing/under/suit/female, /turf/open/floor/carpet{ @@ -382,7 +381,7 @@ icon_state = "hydro"; locked = 0; name = "botanist's locker"; - req_access_txt = "201" + req_access = list("ruins_general") }, /obj/item/storage/bag/plants/portaseeder, /obj/item/plant_analyzer, @@ -410,7 +409,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access_txt = "201" + req_access = list("ruins_general") }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -1022,7 +1021,7 @@ icon_state = "hydro"; locked = 0; name = "botanist's locker"; - req_access_txt = "201" + req_access = list("ruins_general") }, /obj/item/clothing/suit/apron, /obj/item/storage/bag/plants/portaseeder, @@ -1758,7 +1757,7 @@ /obj/structure/closet/secure_closet/freezer{ locked = 0; name = "meat fridge"; - req_access_txt = "201" + req_access = list("ruins_general") }, /turf/open/floor/plasteel/showroomfloor{ heat_capacity = 1e+006 @@ -1781,7 +1780,7 @@ /obj/structure/closet/secure_closet/freezer{ locked = 0; name = "refrigerator"; - req_access_txt = "201" + req_access = list("ruins_general") }, /turf/open/floor/plasteel/cafeteria{ dir = 5; @@ -1823,9 +1822,9 @@ /area/awaymission/undergroundoutpost45/central) "dR" = ( /obj/machinery/door/airlock/security{ - name = "Security Checkpoint"; - req_access_txt = "201" + name = "Security Checkpoint" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -1897,9 +1896,9 @@ dir = 4 }, /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "201" + name = "Hydroponics" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -1941,9 +1940,9 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/command{ - name = "Gateway Chamber"; - req_access_txt = "201" + name = "Gateway Chamber" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -1961,9 +1960,9 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Security Checkpoint Maintenance"; - req_access_txt = "201" + name = "Security Checkpoint Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -2045,9 +2044,9 @@ "eo" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "201" + name = "Hydroponics" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -2111,10 +2110,9 @@ }, /area/awaymission/undergroundoutpost45/caves) "ev" = ( -/obj/item/clothing/under/pj/red, /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "201" + req_access = list("ruins_general") }, /turf/open/floor/carpet{ heat_capacity = 1e+006 @@ -2142,8 +2140,10 @@ base_state = "right"; dir = 8; icon_state = "right"; - name = "Security Checkpoint"; - req_access_txt = "201" + name = "Security Checkpoint" + }, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general{ + dir = 8 }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 @@ -2285,8 +2285,10 @@ base_state = "left"; dir = 8; icon_state = "left"; - name = "Security Checkpoint"; - req_access_txt = "201" + name = "Security Checkpoint" + }, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general{ + dir = 8 }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 @@ -2326,8 +2328,10 @@ base_state = "left"; dir = 4; icon_state = "left"; - name = "Hydroponics Desk"; - req_access_txt = "201" + name = "Hydroponics Desk" + }, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general{ + dir = 4 }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 @@ -2489,8 +2493,10 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Hydroponics Desk"; - req_access_txt = "201" + name = "Hydroponics Desk" + }, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general{ + dir = 4 }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 @@ -2725,9 +2731,9 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Hydroponics Maintenance"; - req_access_txt = "201" + name = "Hydroponics Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -2871,8 +2877,10 @@ /obj/machinery/door/firedoor, /obj/machinery/door/window/eastleft{ dir = 1; - name = "Hydroponics Desk"; - req_access_txt = "201" + name = "Hydroponics Desk" + }, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general{ + dir = 1 }, /turf/open/floor/plasteel/dark{ heat_capacity = 1e+006 @@ -3051,9 +3059,9 @@ /area/awaymission/undergroundoutpost45/crew_quarters) "gi" = ( /obj/machinery/door/airlock/maintenance{ - name = "Kitchen Maintenance"; - req_access_txt = "201" + name = "Kitchen Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -3082,7 +3090,6 @@ name = "Kitchen Crate" }, /obj/item/storage/box/mousetraps, -/obj/item/clothing/under/waiter, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/showroomfloor{ heat_capacity = 1e+006 @@ -3149,9 +3156,9 @@ /area/awaymission/undergroundoutpost45/crew_quarters) "gu" = ( /obj/machinery/door/airlock{ - name = "Kitchen Cold Room"; - req_access_txt = "201" + name = "Kitchen Cold Room" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/showroomfloor{ heat_capacity = 1e+006 }, @@ -3474,7 +3481,7 @@ dir = 8 }, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -24 }, /turf/open/floor/plasteel{ @@ -3566,9 +3573,7 @@ }, /area/awaymission/undergroundoutpost45/crew_quarters) "ho" = ( -/obj/machinery/vending/boozeomat{ - req_access_txt = "0" - }, +/obj/machinery/vending/boozeomat, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -3855,8 +3860,7 @@ "hP" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ - name = "Kitchen"; - req_access_txt = "201" + name = "Kitchen" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -3865,6 +3869,7 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -4128,7 +4133,7 @@ /area/awaymission/undergroundoutpost45/crew_quarters) "ip" = ( /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -24 }, /obj/structure/disposalpipe/segment, @@ -4175,9 +4180,9 @@ icon_state = "1-2" }, /obj/machinery/door/window{ - name = "Gateway Chamber"; - req_access_txt = "201" + name = "Gateway Chamber" }, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general, /turf/open/floor/plasteel/dark{ heat_capacity = 1e+006 }, @@ -4578,7 +4583,7 @@ icon_state = "secure"; locked = 0; name = "kitchen Cabinet"; - req_access_txt = "201" + req_access = list("ruins_general") }, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, @@ -4669,9 +4674,9 @@ dir = 4 }, /obj/machinery/door/airlock/research{ - name = "Gateway Observation"; - req_access_txt = "201" + name = "Gateway Observation" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/dark{ heat_capacity = 1e+006 }, @@ -4766,14 +4771,14 @@ /area/awaymission/undergroundoutpost45/crew_quarters) "jy" = ( /obj/machinery/door/window/southright{ - name = "Bar Door"; - req_access_txt = "201" + name = "Bar Door" }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -4800,13 +4805,13 @@ dir = 8 }, /obj/machinery/door/airlock{ - name = "Kitchen"; - req_access_txt = "201" + name = "Kitchen" }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -4909,9 +4914,9 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/research{ - name = "Research Lab"; - req_access_txt = "201" + name = "Research Lab" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -5120,7 +5125,7 @@ icon_state = "rd"; locked = 1; name = "research director's locker"; - req_access_txt = "201" + req_access = list("ruins_general") }, /turf/open/floor/plasteel/cafeteria{ dir = 5; @@ -5204,9 +5209,9 @@ dir = 4 }, /obj/machinery/door/airlock/command{ - name = "Gateway EVA"; - req_access_txt = "201" + name = "Gateway EVA" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -5215,7 +5220,7 @@ /obj/item/clothing/under/suit/navy, /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "201" + req_access = list("ruins_general") }, /turf/open/floor/carpet{ heat_capacity = 1e+006 @@ -5429,9 +5434,9 @@ dir = 4 }, /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "201" + name = "Research Division Access" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -5505,12 +5510,12 @@ dir = 4 }, /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "201" + name = "Research Division Access" }, /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -5919,7 +5924,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access_txt = "201" + req_access = list("ruins_general") }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -5961,9 +5966,9 @@ dir = 4 }, /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "201" + name = "Research Division Access" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -6058,12 +6063,12 @@ dir = 4 }, /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "201" + name = "Research Division Access" }, /obj/effect/turf_decal/tile/purple{ dir = 2 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -6225,9 +6230,9 @@ /area/awaymission/undergroundoutpost45/research) "lO" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "201" + name = "Research Division Access" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -6439,9 +6444,9 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/command{ - name = "Research Director's Office"; - req_access_txt = "201" + name = "Research Director's Office" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/cafeteria{ dir = 5; heat_capacity = 1e+006 @@ -6603,7 +6608,7 @@ /obj/item/clothing/glasses/meson, /obj/structure/closet/secure_closet/engineering_personal{ locked = 0; - req_access_txt = "201" + req_access = list("ruins_general") }, /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -6758,9 +6763,9 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/maintenance{ - name = "Research Maintenance"; - req_access_txt = "201" + name = "Research Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -7943,14 +7948,14 @@ id = "UO45_biohazard"; name = "Biohazard Door Control"; pixel_y = 8; - req_access_txt = "201" + req_access = list("ruins_general") }, /obj/machinery/button/door{ desc = "A remote control-switch that controls the privacy shutters."; id = "UO45_rdprivacy"; name = "Privacy Shutter Control"; pixel_y = -2; - req_access_txt = "201" + req_access = list("ruins_general") }, /turf/open/floor/plasteel/cafeteria{ dir = 5; @@ -8007,9 +8012,9 @@ /area/awaymission/undergroundoutpost45/research) "oE" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "201" + name = "Security Office" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -8380,7 +8385,7 @@ id = "UO45_biohazard"; name = "Biohazard Door Control"; pixel_y = -24; - req_access_txt = "201" + req_access = list("ruins_general") }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red, @@ -8651,9 +8656,9 @@ /area/awaymission/undergroundoutpost45/research) "pI" = ( /obj/machinery/door/airlock/command{ - name = "Server Room"; - req_access_txt = "201" + name = "Server Room" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/dark{ heat_capacity = 1e+006 }, @@ -8662,6 +8667,7 @@ /obj/machinery/door/airlock{ name = "Private Restroom" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/freezer{ heat_capacity = 1e+006 }, @@ -8676,9 +8682,9 @@ /area/awaymission/undergroundoutpost45/research) "pM" = ( /obj/machinery/door/airlock/research/glass{ - name = "Research Storage"; - req_access_txt = "201" + name = "Research Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -8840,9 +8846,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/machinery/door/airlock/engineering/glass{ - name = "SMES Room"; - req_access_txt = "201" + name = "SMES Room" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/dark{ heat_capacity = 1e+006 }, @@ -8972,7 +8978,7 @@ /area/awaymission/undergroundoutpost45/research) "qq" = ( /obj/machinery/vending/medical{ - req_access_txt = "201" + req_access = list("ruins_general") }, /turf/open/floor/plasteel/white/side{ dir = 6; @@ -9166,8 +9172,7 @@ layer = 2.9 }, /obj/structure/closet/secure_closet/engineering_personal{ - req_access = null; - req_access_txt = "201" + req_access = list("ruins_general") }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow{ @@ -9299,9 +9304,9 @@ dir = 4 }, /obj/machinery/door/airlock/command/glass{ - name = "Server Room"; - req_access_txt = "201" + name = "Server Room" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel/dark{ heat_capacity = 1e+006 }, @@ -9587,8 +9592,7 @@ locked = 1; name = "UO45 Engineering APC"; pixel_x = -25; - req_access = null; - req_access_txt = "201"; + req_access = list("ruins_general"); start_charge = 100 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -9618,7 +9622,7 @@ name = "Engineering Lockdown"; pixel_x = 24; pixel_y = 6; - req_access_txt = "201" + req_access = list("ruins_general") }, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet, @@ -9626,7 +9630,7 @@ icon_state = "sec"; locked = 1; name = "security officer's locker"; - req_access_txt = "201" + req_access = list("ruins_general") }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -9642,9 +9646,8 @@ "rs" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "201" + req_access = list("ruins_general") }, -/obj/item/clothing/under/pj/red, /turf/open/floor/carpet{ heat_capacity = 1e+006 }, @@ -9772,9 +9775,9 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Research Maintenance"; - req_access_txt = "201" + name = "Research Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -10107,14 +10110,16 @@ base_state = "left"; dir = 4; icon_state = "left"; - name = "Engineering Reception"; - req_access_txt = "201" + name = "Engineering Reception" }, /obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, /obj/item/pen, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general{ + dir = 4 + }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -10185,7 +10190,7 @@ }, /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0; - req_access_txt = "201" + req_access = list("ruins_general") }, /turf/open/floor/carpet{ heat_capacity = 1e+006 @@ -10209,8 +10214,7 @@ icon_state = "mining"; locked = 0; name = "miner's equipment"; - req_access = null; - req_access_txt = "201" + req_access = list("ruins_general") }, /obj/item/storage/backpack/satchel/eng, /obj/item/clothing/gloves/fingerless, @@ -10559,10 +10563,12 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Engineering Reception"; - req_access_txt = "201" + name = "Engineering Reception" }, /obj/item/folder/red, +/obj/effect/mapping_helpers/windoor/access/all/ruins/general{ + dir = 4 + }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -10962,7 +10968,7 @@ name = "Privacy Shutters"; pixel_x = -24; pixel_y = 6; - req_access_txt = "201" + req_access = list("ruins_general") }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -11088,10 +11094,10 @@ dir = 4 }, /obj/machinery/door/airlock/engineering{ - name = "Engineering Maintenance"; - req_access_txt = "201" + name = "Engineering Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -11301,9 +11307,9 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/airlock/engineering{ - name = "Engineering Foyer"; - req_access_txt = "201" + name = "Engineering Foyer" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -11589,10 +11595,10 @@ /area/awaymission/undergroundoutpost45/engineering) "uF" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "201" + name = "Security Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -11603,9 +11609,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_access_txt = "201" + name = "Engineering" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -12095,9 +12101,9 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_access_txt = "201" + name = "Engineering" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -12175,9 +12181,9 @@ /area/awaymission/undergroundoutpost45/mining) "vM" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Maintenance"; - req_access_txt = "201" + name = "Mining Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -12186,9 +12192,9 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/mining/glass{ - name = "Mining Foyer"; - req_access_txt = "201" + name = "Mining Foyer" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -12200,9 +12206,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/airlock/mining/glass{ - name = "Mining Foyer"; - req_access_txt = "201" + name = "Mining Foyer" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -12273,9 +12279,7 @@ /obj/structure/sign/warning/electricshock{ pixel_y = -32 }, -/obj/machinery/vending/engivend{ - req_access_txt = "0" - }, +/obj/machinery/vending/engivend, /obj/machinery/camera{ c_tag = "Engineering Foyer"; dir = 1; @@ -12489,8 +12493,7 @@ icon_state = "1-8" }, /obj/machinery/door/airlock/command/glass{ - name = "Chief Engineer"; - req_access_txt = "201" + name = "Chief Engineer" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral{ @@ -12503,6 +12506,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -12967,8 +12971,7 @@ pixel_y = -24 }, /obj/structure/closet/secure_closet/miner{ - req_access = null; - req_access_txt = "201" + req_access = list("ruins_general") }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel{ @@ -13108,9 +13111,9 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/mining{ - name = "Processing Area"; - req_access_txt = "201" + name = "Processing Area" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -13119,13 +13122,13 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/airlock/mining{ - name = "Processing Area"; - req_access_txt = "201" + name = "Processing Area" }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -13159,7 +13162,7 @@ name = "Engineering Lockdown"; pixel_x = -6; pixel_y = -24; - req_access_txt = "201" + req_access = list("ruins_general") }, /obj/machinery/button/door{ desc = "A remote control-switch for secure storage."; @@ -13167,7 +13170,7 @@ name = "Engineering Secure Storage"; pixel_x = 6; pixel_y = -24; - req_access_txt = "201" + req_access = list("ruins_general") }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -13443,12 +13446,12 @@ dir = 4 }, /obj/machinery/door/airlock/mining/glass{ - name = "Mining EVA"; - req_access_txt = "201" + name = "Mining EVA" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -13589,11 +13592,11 @@ "xX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/external{ - name = "Mining External Airlock"; - req_access_txt = "201" + name = "Mining External Airlock" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -13664,10 +13667,10 @@ /area/awaymission/undergroundoutpost45/mining) "yf" = ( /obj/machinery/door/airlock/external{ - name = "Mining External Airlock"; - req_access_txt = "201" + name = "Mining External Airlock" }, /obj/effect/turf_decal/sand, +/obj/effect/mapping_helpers/airlock/access/all/ruins/general, /turf/open/floor/plasteel, /area/awaymission/undergroundoutpost45/mining) "yg" = ( diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_maps/map_files/AsteroidStation/AsteroidStation.dmm index df0b0f6b43c5..257e6902ce5a 100644 --- a/_maps/map_files/AsteroidStation/AsteroidStation.dmm +++ b/_maps/map_files/AsteroidStation/AsteroidStation.dmm @@ -41,15 +41,14 @@ /turf/open/floor/plating, /area/maintenance/department/electrical) "aam" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "aao" = ( @@ -223,13 +222,13 @@ dir = 4 }, /obj/machinery/door/window{ - name = "High-Risk Modules"; - req_access_txt = "20" + name = "High-Risk Modules" }, /obj/effect/spawner/lootdrop/aimodule_harmful, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 5 }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "abV" = ( @@ -447,8 +446,7 @@ /area/solar/starboard/aft) "aeg" = ( /obj/machinery/door/airlock/security{ - name = "Labor Shuttle"; - req_access_txt = "2" + name = "Labor Shuttle" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -469,6 +467,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/processing) "aej" = ( @@ -477,6 +476,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plasteel, /area/maintenance/port/fore) "aeo" = ( @@ -673,9 +673,9 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/highsecurity{ - name = "Backup SMES Access"; - req_one_access_txt = "11;32" + name = "Backup SMES Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/engine, /area/engine/engineering) "afR" = ( @@ -846,8 +846,7 @@ /area/crew_quarters/locker) "ahw" = ( /obj/machinery/door/airlock/research{ - name = "Mech Bay"; - req_one_access_txt = "29;75" + name = "Mech Bay" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -857,6 +856,7 @@ dirx = 1; diry = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/science/robotics/mechbay) "ahy" = ( @@ -898,6 +898,9 @@ network = list("ss13","prison") }, /obj/structure/closet/secure_closet/freezer/fridge/open, +/obj/effect/turf_decal/ramp_corner{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/security/prison) "aib" = ( @@ -1085,13 +1088,15 @@ "ajW" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen 5"; - req_access_txt = "55" + name = "Containment Pen 5" }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/engine, /area/science/xenobiology) "ajX" = ( @@ -1264,7 +1269,7 @@ name = "Kitchen Shutters Control"; pixel_x = 1; pixel_y = 25; - req_access_txt = "28" + req_access = list("kitchen") }, /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -1302,13 +1307,13 @@ /area/security/prison) "alR" = ( /obj/machinery/door/airlock/maintenance{ - name = "Locker Room Maintenance"; - req_access_txt = "12" + name = "Locker Room Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/crew_quarters/locker) "alS" = ( @@ -1346,8 +1351,7 @@ /area/hydroponics/garden) "ama" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -1359,6 +1363,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "amb" = ( @@ -1370,7 +1375,8 @@ dir = 1 }, /obj/effect/turf_decal/arrows/white{ - color = "#99ccff" + color = "#99ccff"; + dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 @@ -1681,6 +1687,9 @@ dir = 4 }, /obj/structure/closet/crate/coffin, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 4 + }, /turf/open/floor/wood, /area/chapel/office) "apm" = ( @@ -2093,13 +2102,15 @@ /area/maintenance/solars/port/fore) "asF" = ( /obj/machinery/door/window/eastleft{ - name = "Medical Delivery"; - req_access_txt = "5" + name = "Medical Delivery" }, /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "asG" = ( @@ -2121,13 +2132,13 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - name = "Mining Maintenance"; - req_access_txt = "48" + name = "Mining Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plating, /area/quartermaster/miningdock) "asL" = ( @@ -2150,8 +2161,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/maintenance{ - name = "Bar Maintenance"; - req_access_txt = "12" + name = "Bar Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -2160,6 +2170,7 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "ata" = ( @@ -2583,8 +2594,10 @@ }, /obj/machinery/door/window{ dir = 4; - name = "Mass Driver"; - req_access_txt = "22" + name = "Mass Driver" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 4 }, /turf/open/floor/plating, /area/chapel/office) @@ -2759,8 +2772,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/research{ - name = "Testing Lab"; - req_access_txt = "47" + name = "Testing Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -2781,6 +2793,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/misc_lab) "azo" = ( @@ -2801,9 +2814,11 @@ /turf/open/floor/plating, /area/maintenance/solars/port/fore) "azt" = ( -/obj/effect/turf_decal/stripes, -/turf/open/space/basic, -/area/space/nearstation) +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit) "azw" = ( /obj/effect/landmark/stationroom/maint/threexfive, /turf/template_noop, @@ -3077,7 +3092,12 @@ /turf/open/floor/plating, /area/maintenance/disposal) "aBC" = ( -/obj/machinery/door/window/westleft, +/obj/machinery/door/window/westleft{ + name = "Captain's Desk Door" + }, +/obj/effect/mapping_helpers/windoor/access/all/command/captain{ + dir = 8 + }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "aBD" = ( @@ -3248,8 +3268,7 @@ /area/maintenance/solars/port/aft) "aCu" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10" + name = "Engineering External Access" }, /obj/structure/cable{ icon_state = "1-2" @@ -3266,6 +3285,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "aCx" = ( @@ -3475,7 +3495,8 @@ idDoor = "ai_core_airlock_exterior"; idSelf = "ai_core_airlock_control"; pixel_x = -23; - pixel_y = 7 + pixel_y = 7; + req_access = list("ai_master") }, /obj/machinery/light_switch{ pixel_y = -23 @@ -3730,14 +3751,14 @@ /area/maintenance/port/aft) "aGa" = ( /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" + name = "Medbay Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/trimline/blue/filled/end/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/port/aft) "aGc" = ( @@ -3771,16 +3792,13 @@ /turf/open/indestructible/sound/pool/end, /area/crew_quarters/fitness) "aGy" = ( -/obj/machinery/door/morgue{ - name = "Confession Booth (Chaplain)"; - req_access_txt = "22" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/machinery/door/morgue/chaplain, /turf/open/floor/plasteel/dark, /area/chapel/main) "aGA" = ( @@ -4157,8 +4175,7 @@ /area/security/checkpoint/medical) "aJx" = ( /obj/machinery/door/airlock/engineering{ - name = "Tech Storage"; - req_access_txt = "23" + name = "Tech Storage" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -4175,6 +4192,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /turf/open/floor/plasteel, /area/storage/tech) "aJy" = ( @@ -4447,10 +4465,12 @@ "aMY" = ( /obj/machinery/door/window/eastleft{ dir = 8; - name = "Coffin Storage"; - req_access_txt = "22" + name = "Coffin Storage" }, /obj/structure/closet/crate/coffin, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 8 + }, /turf/open/floor/wood, /area/chapel/office) "aNb" = ( @@ -4502,8 +4522,7 @@ "aNO" = ( /obj/machinery/door/window/westright{ dir = 1; - name = "Security Checkpoint"; - req_access_txt = "1" + name = "Security Checkpoint" }, /obj/structure/table/reinforced, /obj/item/paper, @@ -4511,7 +4530,13 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/turf/open/floor/plasteel, +/obj/effect/mapping_helpers/windoor/access/any/security/detective{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/any/security/general{ + dir = 1 + }, +/turf/open/floor/plating, /area/security/checkpoint/auxiliary) "aNQ" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ @@ -4746,8 +4771,10 @@ "aPK" = ( /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ - name = "Coffin Storage"; - req_access_txt = "22" + name = "Coffin Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -4884,9 +4911,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit) "aRx" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable{ icon_state = "4-8" }, @@ -4905,6 +4930,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "aRz" = ( @@ -5010,8 +5036,7 @@ /area/medical/surgery) "aTb" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Lab"; - req_access_txt = "7" + name = "Toxins Lab" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -5032,6 +5057,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel/white, /area/science/mixing) "aTc" = ( @@ -5427,9 +5453,7 @@ dir = 8 }, /obj/structure/barricade/wooden, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -5977,9 +6001,7 @@ }, /obj/machinery/door/airlock/medical/glass{ closingLayer = 3.3; - name = "Medical Storage"; - normalspeed = 0; - req_access_txt = "5" + name = "Medical Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -5988,6 +6010,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/storage) "bei" = ( @@ -6067,11 +6090,11 @@ /area/medical/patients_rooms/room_b) "beX" = ( /obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "63" + name = "Security External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/processing) "bfm" = ( @@ -6225,12 +6248,12 @@ dir = 4 }, /obj/machinery/door/airlock{ - name = "Law Office"; - req_access_txt = "38" + name = "Law Office" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/lawyer, /turf/open/floor/wood, /area/lawoffice) "bhr" = ( @@ -6321,8 +6344,7 @@ "bik" = ( /obj/machinery/door/window/eastleft{ dir = 8; - name = "Ice Cream Shoppe"; - req_access_txt = "28" + name = "Ice Cream Shoppe" }, /obj/machinery/light{ dir = 1 @@ -6624,8 +6646,7 @@ /area/ai_monitored/security/armory) "bpj" = ( /obj/machinery/door/airlock/hatch{ - name = "Hardware Workshop"; - req_access_txt = "61" + name = "Hardware Workshop" }, /obj/structure/cable{ icon_state = "1-2" @@ -6636,6 +6657,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/carpet/black, /area/tcommsat/computer) "bpp" = ( @@ -6650,13 +6672,15 @@ }, /obj/machinery/door/window/northleft{ dir = 8; - name = "Containment Pen 1"; - req_access_txt = "55" + name = "Containment Pen 1" }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/engine, /area/science/xenobiology) "bpL" = ( @@ -6921,8 +6945,7 @@ /area/engine/engineering) "buN" = ( /obj/machinery/door/airlock{ - name = "Private Restroom"; - req_access_txt = "20" + name = "Private Restroom" }, /turf/open/floor/mineral/silver, /area/crew_quarters/heads/captain) @@ -6945,8 +6968,7 @@ dir = 1; icon_state = "right"; layer = 3.1; - name = "Upload Console Window"; - req_access_txt = "16" + name = "Upload Console Window" }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -6958,6 +6980,9 @@ /obj/machinery/computer/upload/ai{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 1 + }, /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai_upload) "bvo" = ( @@ -7023,8 +7048,7 @@ /area/ai_monitored/turret_protected/ai_upload) "bwR" = ( /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -7038,6 +7062,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "bwU" = ( @@ -7097,9 +7123,7 @@ /turf/open/floor/wood, /area/bridge/meeting_room) "bxQ" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -7109,6 +7133,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) "bxX" = ( @@ -7132,6 +7157,17 @@ }, /turf/open/floor/plasteel, /area/engine/atmos/storage) +"byp" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "byq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -7141,8 +7177,7 @@ /area/medical/virology) "byH" = ( /obj/machinery/door/airlock/research{ - name = "Robotics Lab"; - req_one_access_txt = "29;75" + name = "Robotics Lab" }, /obj/structure/cable{ icon_state = "4-8" @@ -7166,6 +7201,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel/white, /area/science/robotics/lab) "byL" = ( @@ -7335,9 +7371,9 @@ dir = 2 }, /obj/machinery/door/airlock/maintenance{ - name = "Disposal Access"; - req_access_txt = "12" + name = "Disposal Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/disposal) "bCM" = ( @@ -7615,13 +7651,14 @@ name = "Prison Wing Lockdown"; pixel_x = 8; pixel_y = -25; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/door{ id = "Secure Gate"; name = "Cell Shutters"; pixel_x = 8; - pixel_y = -35 + pixel_y = -35; + req_access = list("brig") }, /obj/machinery/light_switch{ pixel_x = -5; @@ -7791,7 +7828,7 @@ name = "Public Teleporter Access Control"; pixel_x = 5; pixel_y = 24; - req_access_txt = "17" + req_access = list("teleporter") }, /obj/structure/rack, /obj/item/tank/internals/oxygen, @@ -7926,8 +7963,10 @@ /obj/structure/table/optable, /obj/item/surgical_drapes, /obj/machinery/door/window/northleft{ - name = "Autopsy Desk"; - req_access_txt = "4" + name = "Autopsy Desk" + }, +/obj/effect/mapping_helpers/windoor/access/all/security/detective{ + dir = 1 }, /turf/open/floor/plasteel/dark, /area/security/detectives_office) @@ -8190,8 +8229,7 @@ /area/space/nearstation) "bRt" = ( /obj/machinery/door/airlock/command{ - name = "Captain's Office"; - req_access_txt = "20" + name = "Captain's Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -8205,6 +8243,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "bRG" = ( @@ -8461,8 +8500,7 @@ /area/medical/surgery) "bXj" = ( /obj/machinery/door/airlock/maintenance{ - name = "EVA Maintenance"; - req_access_txt = "18" + name = "EVA Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -8470,6 +8508,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plating, /area/maintenance/starboard/fore) "bXz" = ( @@ -8479,9 +8518,6 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/cable{ icon_state = "1-4" }, @@ -8554,13 +8590,13 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "bYJ" = ( @@ -8646,6 +8682,10 @@ /obj/item/kirbyplants/random, /turf/open/floor/plasteel/dark, /area/engine/engineering) +"bZX" = ( +/obj/structure/falsewall, +/turf/open/floor/plating, +/area/maintenance/port/fore) "cab" = ( /obj/machinery/conveyor_switch/oneway{ dir = 8; @@ -8762,8 +8802,7 @@ /area/hallway/secondary/entry) "cbx" = ( /obj/machinery/door/airlock/atmos{ - name = "Tanks and Filtration"; - req_access_txt = "24" + name = "Tanks and Filtration" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -8786,6 +8825,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 5 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/pumproom) "cbA" = ( @@ -8815,6 +8855,13 @@ }, /turf/open/floor/plasteel, /area/engine/atmos/storage) +"cbC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/prison) "cbF" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, @@ -8862,8 +8909,7 @@ dir = 8 }, /obj/machinery/door/airlock/hatch{ - name = "MiniSat Antechamber"; - req_access_txt = "65" + name = "MiniSat Antechamber" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -8871,6 +8917,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/aisat_interior) "cch" = ( @@ -9003,7 +9050,8 @@ idSelf = "toxins_access_control"; name = "Toxins airlock control"; pixel_x = 8; - pixel_y = 25 + pixel_y = 25; + req_access = list("toxins") }, /obj/machinery/doorButtons/access_button{ idDoor = "toxins_airlock_interior"; @@ -9011,7 +9059,8 @@ layer = 3.1; name = "Toxins airlock control"; pixel_x = 8; - pixel_y = -25 + pixel_y = -25; + req_access = list("toxins") }, /obj/machinery/atmospherics/components/binary/pump/on{ name = "Mix to Space" @@ -9214,8 +9263,7 @@ /area/security/prison) "chF" = ( /obj/machinery/door/airlock/security{ - name = "Interrogation"; - req_access_txt = "2" + name = "Interrogation" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -9229,6 +9277,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "chG" = ( @@ -9249,8 +9298,7 @@ /area/chapel/office) "chH" = ( /obj/machinery/door/airlock/command{ - name = "Head of Personnel"; - req_access_txt = "57" + name = "Head of Personnel" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -9262,6 +9310,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hop, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "chM" = ( @@ -9299,8 +9348,7 @@ /area/science/lab) "cid" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Launch Room Access"; - req_access_txt = "7" + name = "Toxins Launch Room Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -9317,6 +9365,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel/dark, /area/science/mixing) "cii" = ( @@ -9348,7 +9397,7 @@ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_x = 26; - req_access_txt = "31" + req_access = list("cargo") }, /obj/structure/closet/crate/freezer, /obj/machinery/light_switch{ @@ -9367,10 +9416,16 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) +"ciz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/security/prison) "ciE" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" + name = "Bridge" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -9391,6 +9446,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/teleporter) "ciJ" = ( @@ -9412,15 +9468,20 @@ /turf/open/floor/plasteel/dark, /area/bridge) "ciY" = ( -/obj/machinery/door/window/westright, +/obj/machinery/door/window/westright{ + name = "Bar Window" + }, /obj/structure/table/reinforced, -/obj/effect/turf_decal/sand, /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/turf/open/floor/plasteel{ - icon_state = "cafeteria" +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/all/service/bar{ + dir = 8 }, +/turf/open/floor/plating, /area/crew_quarters/kitchen) "ciZ" = ( /obj/structure/table/wood, @@ -9555,7 +9616,7 @@ name = "Psych Office Shutters Control"; pixel_x = -6; pixel_y = -25; - req_access_txt = "5" + req_access = list("psychology") }, /obj/machinery/light_switch{ pixel_x = 9; @@ -9692,9 +9753,10 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "cmU" = ( @@ -9880,8 +9942,7 @@ /area/engine/engineering) "cqM" = ( /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload Access"; - req_access_txt = "16" + name = "AI Upload Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -9900,6 +9961,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "crb" = ( @@ -10147,7 +10209,7 @@ normaldoorcontrol = 1; pixel_x = -38; pixel_y = 29; - req_access_txt = "5" + req_access = list("medical") }, /obj/machinery/button/door{ desc = "A remote control switch for the medbay foyer."; @@ -10156,7 +10218,7 @@ normaldoorcontrol = 1; pixel_x = -24; pixel_y = 29; - req_access_txt = "5" + req_access = list("medical") }, /turf/closed/wall, /area/medical/medbay/central) @@ -10430,8 +10492,7 @@ "czZ" = ( /obj/machinery/door/window/eastleft{ icon_state = "right"; - name = "Mail"; - req_access_txt = "50" + name = "Mail" }, /obj/structure/disposalpipe/segment{ dir = 6 @@ -10573,6 +10634,9 @@ /area/security/main) "cBB" = ( /obj/machinery/photocopier, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/wood, /area/lawoffice) "cBC" = ( @@ -10762,8 +10826,10 @@ /obj/effect/turf_decal/delivery, /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen 2"; - req_access_txt = "55" + name = "Containment Pen 2" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -10789,8 +10855,7 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance{ - name = "Genetics Maintenance"; - req_access_txt = "5;9;68" + name = "Cloning Lab Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -10798,6 +10863,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/medical/cloning, +/obj/effect/mapping_helpers/airlock/access/any/science/genetics, /turf/open/floor/plating, /area/medical/genetics/cloning) "cFx" = ( @@ -10990,8 +11057,7 @@ /area/crew_quarters/dorms) "cIi" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -11002,6 +11068,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/fore) "cIj" = ( @@ -11231,8 +11298,7 @@ /area/security/prison) "cNb" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Maintenance"; - req_access_txt = "12;24" + name = "Atmospherics Maintenance" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -11243,6 +11309,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cNg" = ( @@ -11260,8 +11327,7 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_exterior"; - name = "Virology Exterior Airlock"; - req_access_txt = "39" + name = "Virology Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -11270,7 +11336,7 @@ idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = -24; - req_access_txt = "39" + req_access = list("virology") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -11286,12 +11352,12 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "cNs" = ( /obj/machinery/door/airlock/command{ - name = "Captain's Quarters"; - req_access_txt = "20" + name = "Captain's Quarters" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -11299,6 +11365,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "cNx" = ( @@ -11380,7 +11447,7 @@ name = "Transfer Area Lockdown"; pixel_x = -25; pixel_y = -6; - req_access_txt = "2" + req_access = list("brig") }, /turf/open/floor/plasteel, /area/security/execution/transfer) @@ -11470,16 +11537,17 @@ "cQr" = ( /obj/machinery/quantumpad{ map_pad_id = "aitobridge"; - map_pad_link_id = "bridgetoai" + map_pad_link_id = "bridgetoai"; + name = "Bridge Transport" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "cQs" = ( /obj/effect/turf_decal/sand, /obj/machinery/door/window/southright{ - name = "Bar Door"; - req_one_access_txt = "25;28" + name = "Bar Door" }, +/obj/effect/mapping_helpers/windoor/access/all/service/bar, /turf/open/floor/plasteel, /area/crew_quarters/bar) "cQC" = ( @@ -11599,6 +11667,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/stairs/goon/stairs2_wide{ dir = 8 }, @@ -11836,9 +11907,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "cWI" = ( -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, +/obj/structure/closet/secure_closet/bar, /obj/machinery/light{ dir = 8 }, @@ -11930,14 +11999,14 @@ name = "Test Chamber Blast Doors"; pixel_x = -7; pixel_y = -26; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/machinery/button/door{ id = "xenobio"; name = "Xenobiology Desk Shutters"; pixel_x = 7; pixel_y = -26; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/effect/turf_decal/stripes{ dir = 8 @@ -12240,8 +12309,7 @@ /area/vacant_room) "dcK" = ( /obj/machinery/door/airlock/security/glass{ - name = "Armoury"; - req_access_txt = "1" + name = "Armoury" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -12252,6 +12320,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "dcM" = ( @@ -12396,9 +12465,9 @@ autoclose = 0; heat_proof = 1; id_tag = "toxins_airlock_exterior"; - name = "Mixing Room Exterior Airlock"; - req_access_txt = "8" + name = "Mixing Room Exterior Airlock" }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/engine, /area/science/mixing/chamber) "deC" = ( @@ -12442,10 +12511,7 @@ /turf/open/floor/plasteel/dark, /area/science/mixing) "dfz" = ( -/obj/machinery/door/airlock/vault{ - req_access_txt = "53" - }, -/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/vault, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -12465,6 +12531,8 @@ dir = 4 }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/command/vault, +/obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) "dgg" = ( @@ -12723,14 +12791,11 @@ /turf/open/floor/plasteel, /area/crew_quarters/bar) "dke" = ( -/obj/effect/turf_decal/arrows/white{ - color = "#99ccff" - }, -/obj/effect/turf_decal/trimline/blue/filled/corner/lower{ - dir = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/turf/open/floor/plasteel/dark, +/area/ai_monitored/storage/eva) "dkh" = ( /obj/structure/table/wood, /obj/item/hand_labeler{ @@ -12775,7 +12840,7 @@ id = "barshutters"; name = "Bar Shutters Control"; pixel_y = 24; - req_access_txt = "25" + req_access = list("bar") }, /obj/machinery/firealarm{ dir = 8; @@ -12787,6 +12852,7 @@ /obj/structure/table, /obj/machinery/microwave, /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/ramp_corner, /turf/open/floor/plasteel/white, /area/security/prison) "dlw" = ( @@ -12982,8 +13048,7 @@ /area/science/storage) "dpi" = ( /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload"; - req_access_txt = "16" + name = "AI Upload" }, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/cable{ @@ -13005,6 +13070,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "dps" = ( @@ -13055,7 +13121,9 @@ /turf/open/floor/plasteel/dark, /area/medical/sleeper) "dqS" = ( -/obj/machinery/door/airlock/medical/glass, +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Treatment Center" + }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -13064,6 +13132,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "drg" = ( @@ -13092,6 +13161,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/stairs/goon/stairs_alone{ dir = 8 }, @@ -13231,8 +13303,7 @@ /area/maintenance/starboard) "dtv" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Isolation A"; - req_access_txt = "39" + name = "Isolation A" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -13244,6 +13315,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "dtM" = ( @@ -13393,9 +13465,9 @@ dir = 4 }, /obj/machinery/door/airlock/command{ - name = "Captain's Office"; - req_access_txt = "20" + name = "Captain's Office" }, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "dxN" = ( @@ -13714,8 +13786,7 @@ /area/engine/atmos) "dEi" = ( /obj/machinery/door/airlock/medical{ - name = "Medbay Reception"; - req_access_txt = "5" + name = "Medbay Reception" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -13727,6 +13798,7 @@ /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "dEx" = ( @@ -13792,9 +13864,9 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_interior"; - name = "Physical Core Access"; - req_one_access_txt = "30, 70" + name = "Networking Chamber Access" }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacoreserver) "dFy" = ( @@ -13806,9 +13878,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/maintenance{ - name = "EVA Maintenance"; - req_access_txt = "18" + name = "EVA Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plating, /area/ai_monitored/storage/eva) "dFN" = ( @@ -13892,8 +13964,7 @@ /area/engine/atmos/storage) "dHh" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/structure/cable{ icon_state = "1-2" @@ -13910,6 +13981,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/science) "dHk" = ( @@ -14114,8 +14186,7 @@ dir = 4 }, /obj/machinery/door/airlock/atmos{ - name = "Atmospherics"; - req_access_txt = "24" + name = "Atmospherics" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -14131,6 +14202,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/storage) "dLg" = ( @@ -14351,7 +14423,8 @@ idDoor = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = -23; - pixel_y = 7 + pixel_y = 7; + req_access = list("ai_master") }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) @@ -14384,6 +14457,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/stairs/goon/stairs2_wide{ dir = 8 }, @@ -14416,8 +14492,7 @@ /area/hallway/primary/fore) "dOx" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63;50" + name = "Security Office" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -14431,6 +14506,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "dOL" = ( @@ -14503,8 +14579,10 @@ /obj/effect/turf_decal/delivery, /obj/machinery/door/window/southleft{ dir = 4; - name = "Engineering Delivery"; - req_access_txt = "10" + name = "Engineering Delivery" + }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/general{ + dir = 4 }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -14572,8 +14650,7 @@ /area/maintenance/starboard/fore) "dQq" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -14587,6 +14664,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port) "dQz" = ( @@ -14640,6 +14718,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/security/armory{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "dQW" = ( @@ -14727,6 +14808,11 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"dSg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/ramp_corner, +/turf/open/floor/plasteel/cafeteria, +/area/security/prison) "dSi" = ( /obj/structure/chair/comfy/brown, /obj/structure/chair/comfy/brown, @@ -14955,8 +15041,7 @@ dir = 1 }, /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload Access"; - req_access_txt = "16" + name = "AI Upload Access" }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 @@ -14964,6 +15049,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "dVp" = ( @@ -15234,7 +15320,9 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/medical/glass, +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Treatment Center" + }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -15243,6 +15331,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 9 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "eaw" = ( @@ -15312,7 +15401,7 @@ name = "Loading Doors"; pixel_x = 7; pixel_y = -24; - req_access_txt = "31" + req_access = list("cargo_bay") }, /obj/machinery/button/door{ id = "QMLoaddoor2"; @@ -15320,7 +15409,7 @@ name = "Loading Doors"; pixel_x = -7; pixel_y = -24; - req_access_txt = "31" + req_access = list("cargo_bay") }, /obj/machinery/computer/cargo{ dir = 1 @@ -15404,13 +15493,13 @@ /area/hallway/secondary/service) "ecG" = ( /obj/machinery/door/airlock{ - name = "Bar Storage"; - req_access_txt = "25" + name = "Bar Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plasteel, /area/crew_quarters/bar) "ecO" = ( @@ -15625,6 +15714,9 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "efC" = ( @@ -15646,8 +15738,7 @@ /area/bridge) "efO" = ( /obj/machinery/door/airlock/command/glass{ - name = "EVA Storage"; - req_access_txt = "18" + name = "EVA Storage" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -15657,6 +15748,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "efW" = ( @@ -15690,8 +15782,7 @@ "egY" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ - name = "Hydroponics Desk"; - req_access_txt = "35" + name = "Hydroponics Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -15701,7 +15792,10 @@ pixel_x = -7; pixel_y = -4 }, -/turf/open/floor/plasteel, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 1 + }, +/turf/open/floor/plating, /area/hydroponics) "ehz" = ( /obj/structure/cable{ @@ -15840,6 +15934,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "ejx" = ( @@ -15876,9 +15971,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/maintenance{ - name = "Kitchen Maintenance"; - req_access_txt = "28" + name = "Kitchen Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plating, /area/maintenance/port/fore) "ejM" = ( @@ -16023,9 +16118,6 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/effect/turf_decal/arrows/white{ - color = "#99ccff" - }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 8 }, @@ -16036,13 +16128,15 @@ base_state = "left"; dir = 1; icon_state = "left"; - name = "Security Delivery"; - req_access_txt = "1" + name = "Security Delivery" }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 6 }, +/obj/effect/mapping_helpers/windoor/access/all/security/basic{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/processing) "elu" = ( @@ -16150,13 +16244,12 @@ /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "end" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "ent" = ( @@ -16544,12 +16637,12 @@ dir = 4 }, /obj/machinery/door/airlock/security{ - name = "Detective's Office"; - req_access_txt = "4" + name = "Detective's Office" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/detective, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "esl" = ( @@ -16568,8 +16661,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, /obj/machinery/atmospherics/pipe/simple/purple/visible, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ @@ -16584,6 +16676,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "esZ" = ( @@ -16681,8 +16774,7 @@ /area/medical/medbay/central) "eur" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -16690,6 +16782,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "euH" = ( @@ -16784,6 +16877,9 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "evA" = ( @@ -16935,8 +17031,7 @@ /area/engine/engineering) "eyr" = ( /obj/machinery/door/airlock/medical{ - name = "Morgue"; - req_access_txt = "6;5" + name = "Morgue" }, /obj/structure/disposalpipe/segment{ dir = 2 @@ -16953,6 +17048,7 @@ /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/plasteel/white, /area/medical/morgue) "eyX" = ( @@ -17020,8 +17116,7 @@ /area/tcommsat/computer) "eAw" = ( /obj/machinery/door/airlock/engineering{ - name = "Port Quarter Solar Access"; - req_access_txt = "10" + name = "Port Quarter Solar Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -17038,6 +17133,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "eAB" = ( @@ -17060,8 +17156,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ dir = 4; - name = "Atmospherics Desk"; - req_access_txt = "24" + name = "Atmospherics Desk" }, /obj/item/paper_bin, /obj/item/pen, @@ -17076,7 +17171,16 @@ pixel_x = -10; pixel_y = 12 }, -/turf/open/floor/plasteel, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos{ + dir = 4 + }, +/turf/open/floor/plating, /area/engine/atmos) "eBg" = ( /obj/structure/cable{ @@ -17231,9 +17335,9 @@ }, /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_exterior"; - name = "Physical Core Access"; - req_one_access_txt = "30;70" + name = "Networking Chamber Access" }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/circuit/telecomms/server, /area/ai_monitored/secondarydatacoreserver) "eEw" = ( @@ -17247,13 +17351,13 @@ dir = 4 }, /obj/machinery/door/airlock/command{ - name = "Head of Personnel"; - req_access_txt = "57" + name = "Head of Personnel" }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/service/hop, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "eEH" = ( @@ -17571,8 +17675,7 @@ dir = 8 }, /obj/machinery/door/airlock/engineering{ - name = "Electrical Maintenance"; - req_access_txt = "11" + name = "Electrical Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -17580,6 +17683,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plating, /area/maintenance/starboard/fore) "eIN" = ( @@ -17615,6 +17719,15 @@ }, /turf/open/floor/plasteel, /area/quartermaster/storage) +"eJP" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/security/courtroom) "eJT" = ( /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 8 @@ -17690,6 +17803,9 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "eKQ" = ( @@ -17751,8 +17867,7 @@ /area/engine/atmos/distro) "eLZ" = ( /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/effect/turf_decal/tile/darkgreen{ dir = 1 @@ -17768,6 +17883,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel, /area/clerk) "eMc" = ( @@ -17930,13 +18046,10 @@ /turf/open/floor/plasteel/white, /area/medical/surgery) "eOr" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable{ - icon_state = "0-2" - }, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "0-4" }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/crew_quarters/heads/hos) "eOB" = ( @@ -17992,8 +18105,7 @@ /area/medical/genetics) "ePa" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Lab"; - req_access_txt = "7" + name = "Toxins Lab" }, /obj/structure/cable{ icon_state = "4-8" @@ -18014,6 +18126,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel/white, /area/science/mixing) "ePs" = ( @@ -18058,8 +18171,7 @@ }, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer_L"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -18069,6 +18181,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "eQb" = ( @@ -18126,8 +18239,7 @@ /area/crew_quarters/locker) "eQL" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/structure/cable{ icon_state = "4-8" @@ -18148,6 +18260,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "eQS" = ( @@ -18394,19 +18507,23 @@ /area/hallway/primary/starboard) "eUh" = ( /obj/machinery/door/window/westleft{ - name = "armoury desk"; - req_access_txt = "3" + name = "armoury desk" }, /obj/machinery/door/window/eastleft{ - name = "armoury desk"; - req_access_txt = "1" + name = "armoury desk" }, /obj/structure/table/reinforced, /obj/item/deskbell/preset/armory{ pixel_x = 5; pixel_y = 10 }, -/turf/open/floor/plasteel, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/all/security/armory{ + dir = 8 + }, +/turf/open/floor/plating, /area/security/warden) "eUk" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -18598,7 +18715,7 @@ name = "Shutters Control Button"; pixel_x = -25; pixel_y = -26; - req_access_txt = "47" + req_access = list("science") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, /turf/open/floor/plasteel/white, @@ -18902,9 +19019,9 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/highsecurity{ - name = "Backup SMES Access"; - req_one_access_txt = "11;32" + name = "Backup SMES Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/engine, /area/engine/engineering) "fcX" = ( @@ -18980,7 +19097,7 @@ id = "cell2 blast"; name = "Cell 2 Blast Door Control"; pixel_x = -26; - req_access_txt = "63" + req_access = list("brig") }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -19094,7 +19211,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/trimline/yellow/filled/corner/lower{ +/obj/effect/turf_decal/stripes/corner{ dir = 8 }, /turf/open/floor/plasteel, @@ -19184,6 +19301,19 @@ }, /turf/open/floor/plasteel, /area/clerk) +"fgk" = ( +/obj/machinery/computer/scan_consolenew{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/purple/filled/line/lower{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 28 + }, +/turf/open/floor/plasteel/white, +/area/medical/genetics) "fgo" = ( /obj/item/a_gift{ pixel_x = -3; @@ -19572,8 +19702,7 @@ /area/ai_monitored/turret_protected/ai_upload) "flH" = ( /obj/machinery/door/airlock/hatch{ - name = "Telecomms Tech Storage"; - req_access_txt = "61" + name = "Telecomms Tech Storage" }, /obj/structure/cable{ icon_state = "1-2" @@ -19584,6 +19713,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/tcommsat/storage) "fmn" = ( @@ -19595,7 +19725,8 @@ "fmt" = ( /obj/machinery/quantumpad{ map_pad_id = "aitoadmin"; - map_pad_link_id = "admintoai" + map_pad_link_id = "admintoai"; + name = "Telecomms Transport" }, /obj/machinery/light_switch{ pixel_y = 24 @@ -19822,6 +19953,17 @@ /obj/item/shovel/spade, /turf/open/floor/plasteel, /area/security/prison) +"frL" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "fsb" = ( /obj/structure/cable{ icon_state = "4-8" @@ -19985,22 +20127,21 @@ /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet/locker) "fvw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/machinery/door/airlock/glass{ + name = "Service Door" }, -/obj/machinery/door/airlock/public, +/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics, +/obj/effect/mapping_helpers/airlock/access/any/service/kitchen, +/obj/effect/turf_decal/trimline/green/filled/corner/lower{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/green/filled/corner/lower, /turf/open/floor/plasteel, /area/hydroponics) "fvF" = ( @@ -20029,8 +20170,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator and SMES"; - req_one_access_txt = "11;32" + name = "Gravity Generator and SMES" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -20044,6 +20184,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engine_smes) "fvZ" = ( @@ -20144,9 +20285,9 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port) "fxV" = ( @@ -20752,8 +20893,7 @@ /area/ai_monitored/nuke_storage) "fJm" = ( /obj/machinery/door/airlock/command{ - name = "Conference Room"; - req_access_txt = "19" + name = "Conference Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -20772,6 +20912,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "fJz" = ( @@ -20883,8 +21024,7 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10" + name = "Engineering External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -20893,6 +21033,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "fLT" = ( @@ -21064,8 +21205,7 @@ /area/hydroponics) "fOM" = ( /obj/machinery/door/airlock/security/glass{ - name = "Brig Control"; - req_access_txt = "3" + name = "Brig Control" }, /obj/structure/cable{ icon_state = "1-2" @@ -21083,6 +21223,7 @@ /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel, /area/security/warden) "fOX" = ( @@ -21176,6 +21317,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/security/armory{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "fQq" = ( @@ -21233,8 +21377,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/research{ - name = "Genetics Lab"; - req_access_txt = "9" + name = "Genetics Lab" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 @@ -21242,6 +21385,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel, /area/medical/genetics) "fQX" = ( @@ -21300,13 +21444,11 @@ /turf/open/floor/wood, /area/hallway/secondary/service) "fRP" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/starboard/fore) "fRT" = ( @@ -21392,10 +21534,10 @@ dir = 8 }, /obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "47" + name = "Experimentation Lab" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/explab) "fSE" = ( @@ -21456,14 +21598,14 @@ name = "Toxins Mixing Room Access Console"; pixel_x = 6; pixel_y = -25; - req_one_access_txt = "8" + req_access = list("toxins") }, /obj/machinery/button/door{ id = "mixvent"; name = "Mixing Room Vent Control"; pixel_x = -7; pixel_y = -24; - req_access_txt = "7" + req_access = list("toxins") }, /obj/machinery/button/ignition{ id = "mixingsparker"; @@ -21491,8 +21633,7 @@ /area/crew_quarters/kitchen) "fUb" = ( /obj/machinery/door/airlock/engineering{ - name = "Vacant Office A"; - req_access_txt = "32" + name = "Vacant Office A" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -21500,6 +21641,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plasteel, /area/vacant_room) "fUp" = ( @@ -21621,14 +21763,14 @@ /area/tcommsat/server) "fWx" = ( /obj/machinery/door/airlock/maintenance{ - name = "Cargo Bay Maintenance"; - req_access_txt = "31" + name = "Delivery Office Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plating, /area/quartermaster/sorting) "fWF" = ( @@ -21715,10 +21857,10 @@ base_state = "left"; dir = 2; icon_state = "left"; - name = "Kitchen Delivery"; - req_access_txt = "28" + name = "Kitchen Delivery" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/service/kitchen, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) "fYr" = ( @@ -21741,8 +21883,7 @@ "fZg" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen 3"; - req_access_txt = "55" + name = "Containment Pen 3" }, /obj/structure/cable{ icon_state = "1-2" @@ -21757,6 +21898,9 @@ /obj/effect/turf_decal/loading_area{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "fZk" = ( @@ -21767,9 +21911,9 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/highsecurity{ - name = "Backup SMES Access"; - req_one_access_txt = "11;32" + name = "Backup SMES Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/engine, /area/engine/engineering) "fZl" = ( @@ -21843,9 +21987,9 @@ /area/security/detectives_office) "gbo" = ( /obj/machinery/door/window/southleft{ - name = "Court Cell"; - req_access_txt = "2" + name = "Court Cell" }, +/obj/effect/mapping_helpers/windoor/access/all/security/general, /turf/open/floor/plasteel, /area/security/courtroom) "gbp" = ( @@ -21887,8 +22031,7 @@ "gbA" = ( /obj/machinery/door/airlock/medical/glass{ closingLayer = 3.3; - name = "Medical Storage"; - req_access_txt = "5" + name = "Medbay Treatment Center" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -21897,6 +22040,8 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "gbR" = ( @@ -22052,13 +22197,13 @@ /area/security/prison) "get" = ( /obj/machinery/door/airlock/maintenance{ - name = "Kitchen Maintenance"; - req_access_txt = "28" + name = "Kitchen Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plating, /area/maintenance/port/fore) "geG" = ( @@ -22092,15 +22237,13 @@ /turf/open/floor/plasteel, /area/crew_quarters/dorms) "gfQ" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/starboard/fore) "ggh" = ( @@ -22298,9 +22441,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -22563,8 +22704,7 @@ /area/quartermaster/sorting) "gmG" = ( /obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance"; - req_access_txt = "1" + name = "Security Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -22577,6 +22717,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/maintenance/starboard/fore) "gmL" = ( @@ -22594,10 +22735,10 @@ base_state = "left"; dir = 2; icon_state = "left"; - name = "Bar Delivery"; - req_access_txt = "25" + name = "Bar Delivery" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/service/bar, /turf/open/floor/plating, /area/crew_quarters/bar) "gnt" = ( @@ -22766,13 +22907,13 @@ frequency = 1449; heat_proof = 1; id_tag = "incinerator_airlock_exterior"; - name = "Incinerator Exterior Airlock"; - req_access_txt = "32" + name = "Incinerator Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "gry" = ( @@ -22784,7 +22925,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/quartermaster/miningdock) "grP" = ( /obj/structure/chair/wood/wings, @@ -22883,9 +23024,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, @@ -22895,12 +23034,12 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "gtW" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -22914,6 +23053,7 @@ /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "gub" = ( @@ -23172,13 +23312,13 @@ dir = 1 }, /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Maintenance"; - req_access_txt = "12;24" + name = "Atmospherics Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/port/fore) "gyl" = ( @@ -23265,8 +23405,7 @@ pixel_y = -24 }, /obj/machinery/door/window/westleft{ - name = "Janitorial Delivery"; - req_access_txt = "26" + name = "Janitorial Delivery" }, /mob/living/simple_animal/cockroach{ desc = "Virtually unkillable."; @@ -23274,6 +23413,9 @@ sentience_type = 5; status_flags = 16 }, +/obj/effect/mapping_helpers/windoor/access/all/service/janitor{ + dir = 8 + }, /turf/open/floor/plasteel, /area/janitor) "gzD" = ( @@ -23566,8 +23708,7 @@ /area/maintenance/starboard/fore) "gEl" = ( /obj/machinery/door/airlock/maintenance{ - name = "Theatre Maintenance"; - req_access_txt = "46" + name = "Theatre Maintenance" }, /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ @@ -23579,6 +23720,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /turf/open/floor/plating, /area/maintenance/port/fore) "gEr" = ( @@ -23728,8 +23870,7 @@ /area/science/research) "gGK" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator and SMES"; - req_one_access_txt = "11;32" + name = "Gravity Generator and SMES" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -23749,6 +23890,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engine_smes) "gGM" = ( @@ -23783,8 +23925,7 @@ dir = 2 }, /obj/machinery/door/airlock/medical{ - name = "Medbay Reception"; - req_access_txt = "5" + name = "Medbay Reception" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -23796,6 +23937,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "gHW" = ( @@ -23812,9 +23954,7 @@ /turf/open/floor/wood, /area/vacant_room) "gID" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -23822,6 +23962,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/aft) "gIL" = ( @@ -24057,7 +24198,8 @@ id = "Skynet_launch"; name = "Mech Bay Door Control"; pixel_x = 6; - pixel_y = 24 + pixel_y = 24; + req_access = list("robotics") }, /obj/structure/cable{ icon_state = "2-8" @@ -24066,7 +24208,8 @@ id = "Skynet_launch"; name = "Mech Bay Door Control"; pixel_x = -7; - pixel_y = 24 + pixel_y = 24; + req_access = list("robotics") }, /turf/open/floor/plasteel/dark, /area/science/robotics/mechbay) @@ -24473,7 +24616,8 @@ /area/crew_quarters/fitness) "gQM" = ( /obj/effect/turf_decal/arrows/white{ - color = "#99ccff" + color = "#99ccff"; + dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 1 @@ -24487,8 +24631,7 @@ "gQY" = ( /obj/machinery/door/window/northleft{ dir = 8; - name = "Containment Pen 4"; - req_access_txt = "55" + name = "Containment Pen 4" }, /obj/structure/cable{ icon_state = "1-2" @@ -24503,6 +24646,9 @@ /obj/effect/turf_decal/loading_area{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "gRa" = ( @@ -24742,9 +24888,7 @@ /turf/open/floor/plasteel/dark, /area/engine/atmos/distro) "gUB" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -24752,6 +24896,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central/secondary) "gUG" = ( @@ -24793,13 +24938,13 @@ /area/hallway/primary/port) "gVk" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "gVz" = ( @@ -24958,8 +25103,7 @@ "gYy" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer_L"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/effect/mapping_helpers/airlock/unres, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -24974,6 +25118,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "gYG" = ( @@ -25199,9 +25344,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, @@ -25212,6 +25355,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "hdj" = ( @@ -25483,8 +25627,7 @@ "hhu" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ - name = "Cargo Desk"; - req_access_txt = "31" + name = "Cargo Desk" }, /obj/item/deskbell/preset/delivery{ pixel_x = 8; @@ -25496,6 +25639,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/supply/general{ + dir = 8 + }, /turf/open/floor/plating, /area/quartermaster/sorting) "hhU" = ( @@ -25528,12 +25674,12 @@ /obj/machinery/door/window{ base_state = "right"; icon_state = "right"; - name = "Core Modules"; - req_access_txt = "20" + name = "Core Modules" }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "hiw" = ( @@ -25585,15 +25731,23 @@ /obj/machinery/door/window/eastright{ base_state = "left"; icon_state = "left"; - name = "Chemistry Desk"; - req_access_txt = "33" + name = "Chemistry Desk" }, /obj/structure/table/reinforced, /obj/item/deskbell/preset/chemistry{ pixel_x = -8; pixel_y = -3 }, -/turf/open/floor/plasteel/white, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry{ + dir = 4 + }, +/turf/open/floor/plating, /area/medical/chemistry) "hiX" = ( /turf/closed/wall, @@ -26054,7 +26208,8 @@ layer = 3.1; name = "Incinerator airlock control"; pixel_x = 22; - pixel_y = 8 + pixel_y = 8; + req_access = list("atmospherics") }, /obj/structure/sign/warning/fire{ pixel_y = -32 @@ -26275,8 +26430,7 @@ "htR" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -26291,6 +26445,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "htX" = ( @@ -26372,6 +26527,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/stairs/goon/stairs_middle{ dir = 8 }, @@ -26509,6 +26667,9 @@ /area/maintenance/port/fore) "hyg" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/plasteel/cafeteria, /area/security/prison) "hyh" = ( @@ -26546,8 +26707,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/command/glass{ - name = "Bridge Access"; - req_access_txt = "19" + name = "Bridge Access" }, /obj/structure/disposalpipe/segment{ dir = 2 @@ -26559,6 +26719,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "hyN" = ( @@ -26608,11 +26769,13 @@ "hzL" = ( /obj/machinery/door/window/eastright{ dir = 8; - name = "Garden Door"; - req_access_txt = "5" + name = "Garden Door" }, /obj/structure/flora/ausbushes/ppflowers, /mob/living/simple_animal/butterfly, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 8 + }, /turf/open/floor/grass, /area/medical/medbay/aft) "hzX" = ( @@ -26624,8 +26787,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/research{ id_tag = "RoboticsFoyer"; - name = "Robotics Surgery Access"; - req_one_access_txt = "29;75" + name = "Robotics Surgery Access" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 8 @@ -26633,6 +26795,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel/white, /area/science/robotics/lab) "hAa" = ( @@ -26731,9 +26894,10 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "hAQ" = ( @@ -26759,9 +26923,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock{ - name = "Service Hall"; - req_access_txt = "35;79" + name = "Hydroponics" }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/wood, /area/hallway/secondary/service) "hBu" = ( @@ -26910,8 +27074,7 @@ /area/janitor) "hCV" = ( /obj/machinery/door/window/northright{ - name = "Backup SMES Chamber"; - req_access_txt = "32" + name = "Backup SMES Chamber" }, /obj/structure/cable/yellow{ icon_state = "1-8" @@ -26919,6 +27082,9 @@ /obj/structure/cable/yellow, /obj/machinery/power/terminal, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/windoor/access/all/engineering/equipment{ + dir = 1 + }, /turf/open/floor/engine, /area/engine/engineering) "hCY" = ( @@ -26956,8 +27122,7 @@ /area/maintenance/port/fore) "hDy" = ( /obj/machinery/door/airlock/medical{ - name = "Medbay Break Room"; - req_access_txt = "5" + name = "Medbay Break Room" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -26969,6 +27134,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/storage/backroom) "hDC" = ( @@ -27014,7 +27180,8 @@ }, /obj/machinery/quantumpad{ map_pad_id = "bridgetoai"; - map_pad_link_id = "aitobridge" + map_pad_link_id = "aitobridge"; + name = "AI Satellite Transport" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -27092,7 +27259,7 @@ name = "Test Chamber Blast Doors"; pixel_x = -5; pixel_y = 3; - req_access_txt = "55" + req_access = list("science") }, /obj/machinery/button/ignition{ id = "testigniter"; @@ -27179,14 +27346,16 @@ idDoor = "ai_core_airlock_exterior"; idSelf = "ai_core_airlock_control"; pixel_x = 23; - pixel_y = -7 + pixel_y = -7; + req_access = list("ai_master") }, /obj/machinery/doorButtons/airlock_controller{ idExterior = "ai_core_airlock_exterior"; idInterior = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 25; - pixel_y = 7 + pixel_y = 7; + req_access = list("ai_master") }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat_interior) @@ -27269,8 +27438,7 @@ /area/security/brig) "hIm" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -27281,6 +27449,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "hIn" = ( @@ -27292,8 +27461,7 @@ /area/ai_monitored/security/armory) "hIA" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator"; - req_access_txt = "11" + name = "Gravity Generator" }, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/cable{ @@ -27303,6 +27471,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engine_smes) "hIC" = ( @@ -27482,12 +27651,13 @@ dir = 8 }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "hMV" = ( @@ -27542,8 +27712,7 @@ frequency = 1449; glass = 1; id_tag = "telecomms_airlock_interior"; - name = "Telecomms Server Room Access"; - req_access_txt = "61" + name = "Telecomms Server Room Access" }, /obj/effect/turf_decal/tile/purple{ dir = 8 @@ -27553,6 +27722,8 @@ }, /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, +/obj/effect/mapping_helpers/airlock/access/any/command/general, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "hNw" = ( @@ -27588,8 +27759,7 @@ /area/hallway/secondary/exit) "hNT" = ( /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -27598,6 +27768,7 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "hNV" = ( @@ -27705,12 +27876,14 @@ }, /obj/machinery/door/window/northleft{ dir = 8; - name = "Containment Pen 2"; - req_access_txt = "55" + name = "Containment Pen 2" }, /obj/effect/turf_decal/loading_area{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "hPw" = ( @@ -27933,8 +28106,7 @@ /area/engine/engineering) "hTU" = ( /obj/machinery/door/airlock/security/glass{ - name = "Long-Term Cell 3"; - req_access_txt = "2" + name = "Long-Term Cell 3" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -27950,6 +28122,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "hUv" = ( @@ -28148,7 +28321,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -24; pixel_y = -7; - req_one_access_txt = "30;70" + req_access = list("ai_sat") }, /obj/machinery/light_switch{ pixel_x = -24; @@ -28172,8 +28345,7 @@ /area/maintenance/port/fore) "hYr" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Isolation B"; - req_access_txt = "39" + name = "Isolation B" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -28186,6 +28358,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "hYt" = ( @@ -28526,20 +28699,19 @@ }, /obj/machinery/door/airlock/medical{ id_tag = "GeneticsDoor"; - name = "Genetics"; - req_access_txt = "5; 68" + name = "Cloning Lab" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cloning, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "ifH" = ( /obj/machinery/door/window/southleft{ dir = 8; - name = "Test Chamber"; - req_access_txt = "55" + name = "Test Chamber" }, /obj/structure/cable{ icon_state = "1-2" @@ -28557,6 +28729,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "ifU" = ( @@ -28580,8 +28755,7 @@ /area/quartermaster/office) "igg" = ( /obj/machinery/door/airlock/maintenance{ - name = "Law Office Maintenance"; - req_access_txt = "38" + name = "Law Office Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -28589,6 +28763,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/lawyer, /turf/open/floor/plating, /area/lawoffice) "igi" = ( @@ -28845,13 +29020,13 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - name = "Library Maintenance"; - req_one_access_txt = "37;12" + name = "Library Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/library, /turf/open/floor/plating, /area/library) "ikB" = ( @@ -29207,9 +29382,9 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" + name = "Medbay Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/starboard/aft) "iqE" = ( @@ -29236,12 +29411,12 @@ dir = 8 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "12" + name = "Shipbreaking External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating/airless, /area/escapepodbay) "irh" = ( @@ -29262,16 +29437,15 @@ name = "prison blast door" }, /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_one_access_txt = "1;4" + name = "Prison Wing" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "irl" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_one_access_txt = "10;32" + name = "Engineering" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -29289,6 +29463,8 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel, /area/engine/foyer) "irx" = ( @@ -29489,8 +29665,7 @@ base_state = "left"; dir = 2; icon_state = "left"; - name = "Robotics Desk"; - req_one_access_txt = "29;75" + name = "Robotics Desk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics"; @@ -29504,7 +29679,12 @@ pixel_x = 8; pixel_y = -4 }, -/turf/open/floor/plasteel, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/science/robotics, +/turf/open/floor/plating, /area/science/robotics/lab) "iuq" = ( /mob/living/simple_animal/hostile/viscerator{ @@ -29764,8 +29944,7 @@ /area/ruin/space/has_grav/listeningstation) "izl" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mining Dock"; - req_access_txt = "48" + name = "Mining Dock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -29780,6 +29959,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "izv" = ( @@ -29816,8 +29996,7 @@ /area/quartermaster/sorting) "izX" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay"; - req_access_txt = "31" + name = "Cargo Bay" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -29826,6 +30005,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plasteel, /area/quartermaster/storage) "iAh" = ( @@ -29843,8 +30023,7 @@ /area/security/prison) "iAo" = ( /obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "63" + name = "Security External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -29853,6 +30032,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/processing) "iAq" = ( @@ -29875,8 +30055,7 @@ dir = 1 }, /obj/machinery/door/airlock/command/glass{ - name = "Chief Medical Officer"; - req_access_txt = "40" + name = "Chief Medical Officer" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -29886,6 +30065,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/cmo) "iAT" = ( @@ -30193,7 +30373,7 @@ name = "Kitchen Shutters Control"; pixel_x = 1; pixel_y = -25; - req_access_txt = "28" + req_access = list("kitchen") }, /turf/open/floor/plasteel{ icon_state = "cafeteria" @@ -30430,7 +30610,7 @@ /area/security/prison) "iKH" = ( /obj/machinery/door/airlock/public/glass{ - name = "Escape Podbay" + name = "Shipbreaking Bay" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -30441,6 +30621,8 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/turf_decal/ramp_middle, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plasteel, /area/escapepodbay) "iKT" = ( @@ -30486,8 +30668,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/engineering/glass{ - name = "Construction Area"; - req_one_access_txt = "11;24" + name = "Construction Area" }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 1 @@ -30497,6 +30678,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/atmos/hfr) "iLV" = ( @@ -30530,8 +30712,7 @@ /area/engine/atmos/pumproom) "iMI" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Maintenance"; - req_access_txt = "48" + name = "Mining Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -30545,6 +30726,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plating, /area/maintenance/port/aft) "iMX" = ( @@ -30775,15 +30957,14 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment{ dir = 8 }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) "iQK" = ( @@ -30944,8 +31125,7 @@ /area/maintenance/port/fore) "iSZ" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" + name = "Bridge" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -30964,6 +31144,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/brown/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "iTl" = ( @@ -31143,8 +31324,7 @@ "iVZ" = ( /obj/machinery/door/airlock/research{ id_tag = "RoboticsFoyer"; - name = "Robotics Surgery Access"; - req_one_access_txt = "29;75" + name = "Robotics Surgery Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -31162,6 +31342,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel/white, /area/science/robotics/lab) "iWd" = ( @@ -31335,7 +31516,8 @@ icon_state = "airlock_control_standby"; id = "chapelgun"; name = "Mass Driver Controller"; - pixel_x = 24 + pixel_x = 24; + req_access = list("chapel_office") }, /obj/machinery/light{ dir = 1 @@ -31498,7 +31680,7 @@ name = "CMO Shutter Control"; pixel_x = 25; pixel_y = -9; - req_access_txt = "40" + req_access = list("medical") }, /obj/machinery/light_switch{ pixel_x = 35; @@ -31614,8 +31796,7 @@ dir = 4 }, /obj/machinery/door/airlock/atmos{ - name = "Equipment Room"; - req_access_txt = "24" + name = "Equipment Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -31628,6 +31809,7 @@ }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower, /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/storage) "jcB" = ( @@ -31775,12 +31957,16 @@ id = "kanyewest"; name = "Privacy Shutters"; pixel_x = 6; - pixel_y = -26 + pixel_y = -26; + req_access = list("detective") }, /obj/machinery/light_switch{ pixel_x = -6; pixel_y = -25 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "jdx" = ( @@ -32194,9 +32380,9 @@ name = "blast door" }, /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/execution/transfer) "jiT" = ( @@ -32249,13 +32435,12 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "jky" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "jkz" = ( @@ -32328,8 +32513,7 @@ /area/ai_monitored/nuke_storage) "jlc" = ( /obj/machinery/door/airlock/maintenance{ - name = "Holodeck Maintenance"; - req_access_txt = "12" + name = "Holodeck Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -32337,6 +32521,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "jlj" = ( @@ -32443,6 +32628,9 @@ /obj/effect/turf_decal/loading_area{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/science/toxins{ + dir = 1 + }, /turf/open/floor/engine, /area/science/mixing) "jmp" = ( @@ -32598,7 +32786,7 @@ name = "Gift Shop Internal Shutters"; pixel_x = -6; pixel_y = 25; - req_access_txt = "36" + req_access = list("clerk") }, /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 1 @@ -32705,13 +32893,16 @@ dir = 4 }, /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/foyer) "jql" = ( @@ -32775,8 +32966,7 @@ /area/maintenance/solars/starboard/aft) "jqS" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only, /obj/structure/cable{ @@ -32793,6 +32983,7 @@ /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "jqV" = ( @@ -33002,13 +33193,14 @@ /area/engine/engineering) "juR" = ( /obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance"; - req_access_txt = "1" + name = "Security Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/checkpoint/auxiliary) "juW" = ( @@ -33056,8 +33248,7 @@ /area/ai_monitored/turret_protected/aisat_interior) "jvN" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -33074,6 +33265,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/fore) "jwc" = ( @@ -33095,13 +33287,13 @@ dir = 6 }, /obj/machinery/door/airlock/command/glass{ - name = "Server Room"; - req_access_txt = "30" + name = "Server Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers, /turf/open/floor/plasteel/dark, /area/science/server) "jwI" = ( @@ -33156,11 +33348,11 @@ /area/escapepodbay) "jyg" = ( /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "jyH" = ( @@ -33291,18 +33483,18 @@ /obj/machinery/button/door{ id = "heads_meeting"; name = "Security Shutters"; - pixel_y = 24 + pixel_y = 24; + req_access = list("command") }, /turf/open/floor/wood, /area/bridge/meeting_room) "jBu" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central/secondary) "jBx" = ( @@ -33426,7 +33618,7 @@ name = "Delivery Office Door"; pixel_x = -6; pixel_y = 7; - req_access_txt = "31" + req_access = list("cargo") }, /obj/item/folder/yellow{ pixel_x = 6; @@ -33533,6 +33725,7 @@ name = "Detective RC"; pixel_x = 32 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "jEa" = ( @@ -34548,13 +34741,13 @@ dir = 4 }, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "5" + name = "Medbay Break Room" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/storage/backroom) "jVM" = ( @@ -34631,8 +34824,7 @@ /area/bridge/meeting_room) "jXf" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Break Room"; - req_access_txt = "39" + name = "Break Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ @@ -34645,6 +34837,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "jXg" = ( @@ -34984,10 +35177,6 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -37 - }, /obj/machinery/camera{ c_tag = "Medbay - Genetics Lab"; dir = 1; @@ -35085,8 +35274,7 @@ /area/maintenance/disposal/incinerator) "kdW" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -35095,6 +35283,7 @@ /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "keh" = ( @@ -35162,7 +35351,7 @@ id = "chemistry_shutters"; name = "Chemistry shutters"; pixel_y = 25; - req_one_access_txt = "5; 33" + req_access = list("chemistry") }, /obj/machinery/firealarm{ dir = 1; @@ -35260,8 +35449,7 @@ /area/maintenance/starboard/fore) "kgA" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -35278,6 +35466,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "kgB" = ( @@ -35569,9 +35758,9 @@ dir = 4 }, /obj/machinery/door/airlock/mining/glass{ - name = "Delivery Office"; - req_access_txt = "50" + name = "Delivery Office" }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/sorting) "knl" = ( @@ -35594,8 +35783,10 @@ /area/crew_quarters/heads/captain) "knE" = ( /obj/machinery/door/window/northright{ - name = "Prize Corner"; - req_access_txt = "12" + name = "Prize Corner" + }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/maintenance{ + dir = 1 }, /turf/open/floor/eighties, /area/maintenance/starboard/fore) @@ -35686,7 +35877,9 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/medical, +/obj/machinery/door/airlock/medical{ + name = "Operating Theatre" + }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -35700,6 +35893,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /turf/open/floor/plasteel/white, /area/medical/surgery) "koH" = ( @@ -35808,6 +36002,9 @@ /area/engine/engineering) "kqr" = ( /obj/item/radio/off, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "kqx" = ( @@ -35861,7 +36058,7 @@ id = "cell3 blast"; name = "Cell 3 Blast Door Control"; pixel_x = -26; - req_access_txt = "63" + req_access = list("brig") }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -35876,8 +36073,7 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance{ - name = "Psychiatrists office Maintenance"; - req_access_txt = "5" + name = "Psychiatrists office Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -35888,6 +36084,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/psychology, /turf/open/floor/plating, /area/maintenance/port/aft) "krz" = ( @@ -35954,16 +36151,16 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/machinery/door/airlock/engineering/glass{ + name = "AI Satellite Monitoring" + }, /turf/open/floor/plasteel, /area/engine/engineering) "ksg" = ( @@ -36063,18 +36260,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/turf_decal/trimline/blue/filled/corner/lower, /obj/effect/turf_decal/arrows/white{ color = "#99ccff"; dir = 1 }, -/obj/effect/turf_decal/trimline/blue/filled/corner/lower, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "ktf" = ( -/obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -36090,6 +36283,10 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/maintenance{ + name = "Gift Shop Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plating, /area/clerk) "kti" = ( @@ -36440,9 +36637,9 @@ tag = "" }, /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" + name = "Medbay Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/port/aft) "kAt" = ( @@ -36459,7 +36656,8 @@ dir = 5 }, /obj/effect/turf_decal/arrows/white{ - color = "#99ccff" + color = "#99ccff"; + dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower, /turf/open/floor/plasteel/white, @@ -36513,12 +36711,12 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/fore) "kCn" = ( @@ -36564,8 +36762,7 @@ /area/engine/atmos/storage) "kDj" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Launch Room"; - req_access_txt = "7" + name = "Toxins Launch Room" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -36582,6 +36779,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel, /area/science/mixing) "kDo" = ( @@ -36764,12 +36962,14 @@ /area/bridge) "kGy" = ( /obj/machinery/door/window/westleft{ - name = "Atmospherics Delivery"; - req_access_txt = "24" + name = "Atmospherics Delivery" }, /obj/effect/turf_decal/loading_area{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos{ + dir = 8 + }, /turf/open/floor/plasteel, /area/engine/atmos) "kGE" = ( @@ -37007,20 +37207,19 @@ name = "Secondary AI Core Access Button"; pixel_x = -8; pixel_y = -24; - req_one_access_txt = "30;70" + req_access = list("ai_sat") }, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacoreserver) "kKq" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "kLh" = ( @@ -37029,7 +37228,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/trimline/yellow/warning/lower{ +/obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/plasteel, @@ -37092,8 +37291,8 @@ dir = 4 }, /obj/structure/barricade/wooden, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" +/obj/machinery/door/airlock/maintenance/external{ + welded = 1 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -37310,8 +37509,7 @@ /area/crew_quarters/heads/hop) "kQI" = ( /obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" + name = "Supply Dock Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -37321,14 +37519,14 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/quartermaster/storage) "kQM" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/southright{ dir = 1; - name = "Research and Development Desk"; - req_access_txt = "7" + name = "Research and Development Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -37344,9 +37542,12 @@ }, /obj/item/storage/pencil_holder/crew{ pixel_x = -10; - pixel_y = 12 + pixel_y = -1 }, -/turf/open/floor/plasteel/white, +/obj/effect/mapping_helpers/windoor/access/all/science/general{ + dir = 1 + }, +/turf/open/floor/plating, /area/science/lab) "kQS" = ( /obj/structure/grille/broken, @@ -38074,6 +38275,7 @@ c_tag = "Law Office"; dir = 1 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/wood, /area/lawoffice) "lep" = ( @@ -38197,7 +38399,8 @@ idDoor = "telecomms_airlock_exterior"; idSelf = "telecomms_airlock_control"; pixel_x = 7; - pixel_y = -23 + pixel_y = -23; + req_access = list("tcomms") }, /obj/machinery/light_switch{ pixel_x = -23 @@ -38491,8 +38694,7 @@ /area/security/main) "llW" = ( /obj/machinery/door/airlock/medical{ - name = "Medbay Break Room"; - req_access_txt = "5" + name = "Operating Theatre" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -38516,6 +38718,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /turf/open/floor/plasteel/white, /area/medical/surgery) "llY" = ( @@ -38530,6 +38733,20 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"lml" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/port/fore) "lmB" = ( /obj/machinery/portable_atmospherics/canister, /turf/open/floor/engine, @@ -38629,8 +38846,7 @@ /area/security/processing) "loi" = ( /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -38642,6 +38858,7 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "loy" = ( @@ -38712,8 +38929,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/research{ - name = "Xenobiology Lab"; - req_access_txt = "55" + name = "Xenobiology Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -38734,6 +38950,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/white, /area/science/xenobiology) "lqb" = ( @@ -38865,19 +39082,29 @@ /area/engine/atmos/distro) "ltn" = ( /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "ltu" = ( /obj/structure/table/reinforced, /turf/open/floor/plasteel, /area/hallway/primary/central) +"ltA" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "ltD" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 @@ -38917,9 +39144,10 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "ltY" = ( @@ -39117,8 +39345,7 @@ name = "Surgery shutters"; pixel_x = 26; pixel_y = 6; - req_access_txt = "45"; - req_one_access_txt = null + req_access = list("surgery") }, /obj/machinery/button/holosign{ id = "surgery"; @@ -39226,12 +39453,12 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Teleporter Maintenance"; - req_access_txt = "17" + name = "Teleporter Maintenance" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/command/teleporter, /turf/open/floor/plating, /area/maintenance/central/secondary) "lzi" = ( @@ -39584,13 +39811,15 @@ "lGG" = ( /obj/machinery/door/window/northleft{ dir = 8; - name = "Containment Pen 3"; - req_access_txt = "55" + name = "Containment Pen 3" }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/engine, /area/science/xenobiology) "lGX" = ( @@ -39806,6 +40035,18 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"lLn" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit) "lLu" = ( /obj/machinery/power/apc/highcap/five_k{ areastring = "/area/tcommsat/computer"; @@ -39843,8 +40084,7 @@ /area/quartermaster/storage) "lLV" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prisoner Processing"; - req_access_txt = "2" + name = "Prisoner Processing" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -39861,6 +40101,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/processing) "lMf" = ( @@ -40070,15 +40311,14 @@ /turf/open/floor/plasteel, /area/engine/atmos/distro) "lOU" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central/secondary) "lOW" = ( @@ -40113,6 +40353,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/stairs/goon/stairs_middle{ dir = 8 }, @@ -40173,9 +40416,9 @@ /obj/machinery/door/window{ base_state = "right"; icon_state = "right"; - name = "Core Modules"; - req_access_txt = "20" + name = "Core Modules" }, +/obj/effect/mapping_helpers/windoor/access/all/medical/psychology, /turf/open/floor/wood, /area/medical/psych) "lQG" = ( @@ -40301,9 +40544,6 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, @@ -40316,6 +40556,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/starboard/aft) "lSA" = ( @@ -40544,8 +40785,7 @@ /area/ai_monitored/turret_protected/ai_upload) "lVZ" = ( /obj/machinery/door/airlock/external{ - name = "Escape Pod Four"; - req_access_txt = "10" + name = "Escape Pod Four" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -40557,6 +40797,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "lWa" = ( @@ -40839,8 +41080,7 @@ /area/hallway/primary/starboard) "lZJ" = ( /obj/machinery/door/airlock{ - name = "Crematorium"; - req_access_txt = "27" + name = "Crematorium" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -40851,6 +41091,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plasteel/dark, /area/chapel/office) "mab" = ( @@ -41081,8 +41322,7 @@ /area/ai_monitored/storage/eva) "mdF" = ( /obj/machinery/door/airlock/maintenance{ - name = "Detective Maintenance"; - req_access_txt = "4" + name = "Detective Maintenance" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -41096,6 +41336,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/detective, /turf/open/floor/plating, /area/security/detectives_office) "mdS" = ( @@ -41691,13 +41932,14 @@ dir = 1 }, /obj/machinery/door/airlock/hatch{ - name = "MiniSat Teleporter Room"; - req_one_access_txt = "17;65" + name = "MiniSat Teleporter Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "mnc" = ( @@ -41901,9 +42143,9 @@ /area/engine/atmos/distro) "mpf" = ( /obj/machinery/door/airlock/hatch{ - name = "Telecomms Teleporter Access"; - req_access_txt = "61" + name = "Telecomms Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "mph" = ( @@ -41944,14 +42186,14 @@ name = "Privacy Shutters Control"; pixel_x = 6; pixel_y = 25; - req_access_txt = "57" + req_access = list("hop") }, /obj/machinery/button/door{ id = "hopqueue"; name = "Queue Shutters Control"; pixel_x = -4; pixel_y = 25; - req_access_txt = "57" + req_access = list("hop") }, /obj/machinery/light_switch{ pixel_x = -4; @@ -42142,7 +42384,10 @@ /obj/machinery/light_switch{ pixel_x = -22 }, -/turf/open/floor/plasteel/stairs, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, +/turf/open/floor/plasteel/stairs/goon/stairs_alone, /area/escapepodbay) "msX" = ( /obj/structure/flora/ausbushes/ywflowers, @@ -42248,10 +42493,6 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "mvr" = ( -/obj/machinery/door/morgue{ - name = "Private Study"; - req_access_txt = "37" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -42264,6 +42505,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/machinery/door/morgue/curator, /turf/open/floor/carpet, /area/library) "mvN" = ( @@ -42362,13 +42604,13 @@ /area/janitor) "mxQ" = ( /obj/machinery/door/airlock{ - name = "Theatre Backstage"; - req_access_txt = "46" + name = "Theatre Backstage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /turf/open/floor/wood, /area/crew_quarters/theatre) "mxU" = ( @@ -42445,8 +42687,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/atmos/glass{ - name = "Construction Area"; - req_access_txt = "24" + name = "Construction Area" }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 @@ -42454,6 +42695,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "mzc" = ( @@ -42465,7 +42707,7 @@ id = "Secure Storage"; pixel_x = -24; pixel_y = -26; - req_access_txt = "11" + req_access = list("engine_equip") }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -42523,7 +42765,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/highsecurity{ name = "Secure Tech Storage"; - req_access_txt = "76"; security_level = 6 }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ @@ -42532,6 +42773,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/secure_tech, /turf/open/floor/plasteel/dark/side, /area/storage/tech) "mzQ" = ( @@ -42635,7 +42877,7 @@ name = "Virology Access Button"; pixel_x = 8; pixel_y = -28; - req_access_txt = "39" + req_access = list("virology") }, /turf/open/floor/plasteel/white, /area/medical/virology) @@ -42726,9 +42968,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "mCM" = ( @@ -42762,16 +43003,16 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/door/airlock/medical{ - name = "Morgue"; - req_access_txt = "5; 9; 68" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/machinery/door/airlock/research/glass{ + name = "Genetics Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/medical/morgue) "mDt" = ( @@ -43238,11 +43479,11 @@ /area/security/execution/transfer) "mJD" = ( /obj/machinery/door/airlock/external{ - name = "Escape Pod Three"; - req_access_txt = "63" + name = "Escape Pod Three" }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/processing) "mJK" = ( @@ -43411,14 +43652,14 @@ name = "Research Lab Shutter Control"; pixel_x = 5; pixel_y = 8; - req_access_txt = "47" + req_access = list("science") }, /obj/machinery/button/door{ id = "Biohazard"; name = "Biohazard Shutter Control"; pixel_x = -5; pixel_y = 8; - req_access_txt = "47" + req_access = list("science") }, /obj/item/paper_bin{ pixel_x = -1; @@ -43471,7 +43712,7 @@ name = "Telecommunications server shutters control"; pixel_x = 25; pixel_y = 25; - req_one_access_txt = "19;61" + req_access = list("tcomms") }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) @@ -43645,12 +43886,14 @@ base_state = "left"; dir = 8; icon_state = "left"; - name = "Robotics Desk"; - req_one_access_txt = "29;75" + name = "Robotics Desk" }, /obj/structure/table/reinforced, /obj/item/folder/white, /obj/item/pen, +/obj/effect/mapping_helpers/windoor/access/all/science/robotics{ + dir = 8 + }, /turf/open/floor/plating, /area/science/robotics/lab) "mOX" = ( @@ -43744,7 +43987,7 @@ name = "Armory Shutters"; pixel_x = 26; pixel_y = 26; - req_access_txt = "3" + req_access = list("armory") }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -43864,7 +44107,8 @@ idDoor = "telecomms_airlock_interior"; idSelf = "telecomms_airlock_control"; pixel_x = -23; - pixel_y = -23 + pixel_y = -23; + req_access = list("tcomms") }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) @@ -44122,12 +44366,10 @@ "mXJ" = ( /obj/machinery/door/window/brigdoor{ dir = 1; - name = "Armory Desk"; - req_access_txt = "3" + name = "Armory Desk" }, /obj/machinery/door/window/southleft{ - name = "Reception Desk"; - req_access_txt = "63" + name = "Reception Desk" }, /obj/structure/table/reinforced, /obj/item/deskbell/preset/warden{ @@ -44135,10 +44377,14 @@ pixel_y = -4 }, /obj/item/storage/pencil_holder/crew{ - pixel_x = -12; - pixel_y = 1 + pixel_x = -9; + pixel_y = -2 }, -/turf/open/floor/plasteel, +/obj/effect/mapping_helpers/windoor/access/all/security/armory{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/all/security/basic, +/turf/open/floor/plating, /area/security/warden) "mXM" = ( /obj/structure/disposalpipe/segment{ @@ -44277,8 +44523,7 @@ /area/hallway/secondary/entry) "mZh" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -44292,6 +44537,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "mZp" = ( @@ -44337,8 +44583,7 @@ /area/hallway/secondary/entry) "nai" = ( /obj/machinery/door/airlock/engineering{ - name = "Starboard Quarter Solar Access"; - req_access_txt = "10" + name = "Starboard Quarter Solar Access" }, /obj/structure/cable{ icon_state = "4-8" @@ -44358,6 +44603,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "nan" = ( @@ -44441,7 +44687,7 @@ name = "Telecommunications server shutters control"; pixel_x = 8; pixel_y = 23; - req_access_txt = "61" + req_access = list("tcomms") }, /turf/open/floor/plasteel/dark, /area/tcommsat/storage) @@ -44559,8 +44805,7 @@ /area/ai_monitored/turret_protected/ai) "ncK" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -44568,6 +44813,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/fore) "ncO" = ( @@ -44595,8 +44841,7 @@ /area/maintenance/disposal/incinerator) "ndh" = ( /obj/machinery/door/airlock/maintenance{ - name = "Fitness Room Maintenance"; - req_access_txt = "12" + name = "Fitness Room Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -44616,6 +44861,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/crew_quarters/fitness) "ndo" = ( @@ -44805,8 +45051,7 @@ /area/crew_quarters/heads/cmo) "nfY" = ( /obj/machinery/door/airlock/medical{ - name = "Morgue"; - req_access_txt = "6" + name = "Morgue" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -44818,6 +45063,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/plasteel, /area/medical/morgue) "ngf" = ( @@ -45291,8 +45537,7 @@ /area/ai_monitored/security/armory) "nma" = ( /obj/machinery/door/airlock/security{ - name = "Interrogation"; - req_access_txt = "63" + name = "Interrogation" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -45304,6 +45549,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/prison) "nmj" = ( @@ -45387,9 +45633,8 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard) "npe" = ( @@ -45467,13 +45712,13 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/maintenance_hatch{ - name = "MiniSat Maintenance"; - req_access_txt = "65" + name = "MiniSat Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/aisat_interior) "nrj" = ( @@ -45519,13 +45764,11 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/starboard/aft) "nrP" = ( @@ -46002,8 +46245,7 @@ /area/maintenance/starboard/fore) "nyY" = ( /obj/machinery/door/airlock/research/glass{ - name = "Test Chamber"; - req_access_txt = "47" + name = "Test Chamber" }, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -46023,6 +46265,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/engine, /area/science/misc_lab) "nzj" = ( @@ -46131,9 +46374,9 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Toxins Maintenance"; - req_access_txt = "8" + name = "Toxins Storage Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins_storage, /turf/open/floor/plating, /area/maintenance/starboard) "nAs" = ( @@ -46620,13 +46863,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/engineering{ - name = "Port Bow Solar Access"; - req_access_txt = "10" + name = "Port Bow Solar Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "nLg" = ( @@ -46650,8 +46893,7 @@ /area/medical/genetics/cloning) "nLF" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_one_access_txt = "1;4" + name = "Prison Wing" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -46675,6 +46917,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "nLG" = ( @@ -46839,7 +47082,7 @@ name = "Engineering Lockdown"; pixel_x = -8; pixel_y = 39; - req_access_txt = "10" + req_access = list("engineering") }, /obj/machinery/button/door{ desc = "A remote control-switch for secure storage."; @@ -46847,20 +47090,21 @@ name = "Engineering Secure Storage"; pixel_x = -8; pixel_y = 26; - req_access_txt = "11" + req_access = list("engineering") }, /obj/machinery/button/door{ id = "atmos"; name = "Atmospherics Lockdown"; pixel_x = 7; pixel_y = 26; - req_access_txt = "24" + req_access = list("engineering") }, /obj/machinery/button/door{ id = "ceprivacy"; name = "Privacy Shutters Control"; pixel_x = 7; - pixel_y = 39 + pixel_y = 39; + req_access = list("engineering") }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 @@ -47082,8 +47326,7 @@ /area/hallway/primary/starboard) "nRQ" = ( /obj/machinery/door/airlock/command{ - name = "Bridge Access"; - req_access_txt = "19" + name = "Bridge Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -47091,6 +47334,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "nRR" = ( @@ -47230,7 +47474,7 @@ /obj/machinery/door/window/eastright{ dir = 1; name = "Bridge Delivery"; - req_access_txt = "19" + req_access = list("command") }, /turf/open/floor/plasteel, /area/maintenance/central) @@ -47256,14 +47500,14 @@ name = "Telecommunications server shutters control"; pixel_x = 28; pixel_y = -2; - req_one_access_txt = "19;61" + req_access = list("command") }, /obj/machinery/button/door{ id = "bridge blast"; name = "Bridge Blast Door Control"; pixel_x = 28; pixel_y = 8; - req_access_txt = "19" + req_access = list("command") }, /obj/structure/cable{ icon_state = "1-2" @@ -47414,6 +47658,7 @@ /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/security/brig_phys, /turf/open/floor/plasteel/white, /area/security/physician) "nVY" = ( @@ -47934,6 +48179,9 @@ wound_bonus = 0 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/security/prison) "ofT" = ( @@ -48043,7 +48291,11 @@ pixel_y = 23 }, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "0-2"; + pixel_y = 1 + }, +/obj/structure/cable{ + icon_state = "2-8" }, /obj/item/kirbyplants/random, /turf/open/floor/carpet, @@ -48067,7 +48319,7 @@ name = "Public Teleporter Access Control"; pixel_x = 5; pixel_y = -24; - req_access_txt = "17" + req_access = list("teleporter") }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, /turf/open/floor/plasteel, @@ -48294,8 +48546,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/command/glass{ - name = "Bridge Access"; - req_access_txt = "19" + name = "Bridge Access" }, /obj/structure/disposalpipe/segment{ dir = 2 @@ -48307,6 +48558,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "olJ" = ( @@ -48352,14 +48604,14 @@ /area/ai_monitored/turret_protected/aisat_interior) "omU" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "omX" = ( @@ -48490,8 +48742,10 @@ /area/science/xenobiology) "ooL" = ( /obj/machinery/door/window/westleft{ - name = "Atmospherics Canister Storage"; - req_access_txt = "24" + name = "Atmospherics Canister Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/engine/atmos) @@ -48528,8 +48782,7 @@ /area/crew_quarters/dorms) "opx" = ( /obj/machinery/door/airlock/security{ - name = "Security Office"; - req_one_access_txt = "1;4" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -48552,6 +48805,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/brig) "opy" = ( @@ -48788,8 +49043,7 @@ base_state = "left"; dir = 1; icon_state = "left"; - name = "Xenobiology Desk"; - req_access_txt = "55" + name = "Xenobiology Desk" }, /obj/item/paper_bin{ pixel_x = -3; @@ -48808,10 +49062,12 @@ pixel_y = -5 }, /obj/item/storage/pencil_holder/crew{ - pixel_x = -10; - pixel_y = 12 + pixel_x = -10 }, -/turf/open/floor/plasteel/white, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 1 + }, +/turf/open/floor/plating, /area/science/xenobiology) "otj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -48874,8 +49130,7 @@ /area/ai_monitored/secondarydatacoreserver) "ous" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Storage"; - req_access_txt = "8" + name = "Toxins Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -48887,13 +49142,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins_storage, /turf/open/floor/plasteel/dark, /area/science/mixing) "ouM" = ( /obj/machinery/door/window/southleft{ dir = 4; - name = "Virology"; - req_one_access_txt = "39;24" + name = "Virology" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -48901,6 +49156,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/virology{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "ovj" = ( @@ -48915,8 +49173,7 @@ /area/engine/engineering) "ovp" = ( /obj/machinery/door/airlock/wood{ - name = "Psychiatrists office"; - req_access_txt = "5" + name = "Psychiatrists office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -49081,17 +49338,16 @@ /turf/open/floor/plating, /area/maintenance/disposal) "oyn" = ( -/obj/machinery/door/airlock{ - name = "Hydroponics Maintenance"; - req_access_txt = "35"; - req_one_access_txt = "0" - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, +/obj/machinery/door/airlock/maintenance{ + name = "Hydroponics Maintenance" + }, /turf/open/floor/plating, /area/maintenance/port/fore) "oyo" = ( @@ -49368,9 +49624,7 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "oDf" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -49380,6 +49634,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "oDh" = ( @@ -49418,9 +49673,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/starboard/aft) "oDL" = ( @@ -49582,8 +49836,7 @@ "oFH" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer_L"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/effect/mapping_helpers/airlock/unres, /obj/machinery/door/firedoor/border_only{ @@ -49593,6 +49846,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "oFR" = ( @@ -49796,9 +50050,9 @@ autoclose = 0; heat_proof = 1; id_tag = "toxins_airlock_interior"; - name = "Mixing Room Interior Airlock"; - req_access_txt = "8" + name = "Mixing Room Interior Airlock" }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/engine, /area/science/mixing/chamber) "oIx" = ( @@ -50162,9 +50416,10 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "oNt" = ( @@ -50199,9 +50454,9 @@ dir = 2 }, /obj/machinery/door/airlock/maintenance{ - name = "Custodial Maintenance"; - req_access_txt = "26" + name = "Custodial Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/plating, /area/janitor) "oNH" = ( @@ -50337,13 +50592,12 @@ /turf/open/floor/plasteel/dark, /area/tcommsat/storage) "oQP" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) "oQW" = ( @@ -50509,9 +50763,10 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "oUf" = ( @@ -51094,6 +51349,15 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"peB" = ( +/obj/structure/window{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) "peE" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -51176,14 +51440,14 @@ name = "Turbine Vent Control"; pixel_x = 25; pixel_y = 8; - req_access_txt = "12" + req_access = list("atmospherics") }, /obj/machinery/button/door{ id = "auxincineratorvent"; name = "Auxiliary Vent Control"; pixel_x = 25; pixel_y = -9; - req_access_txt = "12" + req_access = list("atmospherics") }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 6 @@ -51267,13 +51531,15 @@ "phj" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen 1"; - req_access_txt = "55" + name = "Containment Pen 1" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/engine, /area/science/xenobiology) "pht" = ( @@ -51345,8 +51611,7 @@ dir = 4 }, /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/machinery/door/poddoor/preopen{ id = "Engineering"; @@ -51357,10 +51622,15 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "piD" = ( /obj/effect/turf_decal/siding/wideplating, +/obj/effect/turf_decal/ramp_corner, /turf/open/floor/grass, /area/hallway/secondary/exit) "piF" = ( @@ -51547,7 +51817,7 @@ name = "Virology Access Console"; pixel_x = 8; pixel_y = 22; - req_access_txt = "39" + req_access = list("virology") }, /obj/item/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -51618,8 +51888,7 @@ /area/science/robotics/lab) "pmr" = ( /obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" + name = "Supply Dock Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ @@ -51628,6 +51897,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/quartermaster/storage) "pmF" = ( @@ -51880,8 +52150,7 @@ "ppN" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/northright{ - name = "Emergency Storage"; - req_access_txt = "19" + name = "Emergency Storage" }, /obj/item/flashlight, /obj/item/storage/toolbox/emergency{ @@ -51896,6 +52165,9 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/command/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/bridge) "ppQ" = ( @@ -51999,8 +52271,7 @@ /area/maintenance/port) "prI" = ( /obj/machinery/door/airlock/command{ - name = "Command Tool Storage"; - req_access_txt = "19" + name = "Command Tool Storage" }, /obj/structure/cable{ icon_state = "1-2" @@ -52011,6 +52282,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "prJ" = ( @@ -52086,7 +52358,7 @@ name = "Incinerator Access Console"; pixel_x = 24; pixel_y = -6; - req_one_access_txt = "12" + req_access = list("atmospherics") }, /obj/machinery/button/ignition{ id = "Incinerator"; @@ -52202,6 +52474,9 @@ "puc" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/window/eastright, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hydroponics) "puh" = ( @@ -52295,8 +52570,7 @@ "pvD" = ( /obj/machinery/door/window{ dir = 8; - name = "SMES Chamber"; - req_access_txt = "32" + name = "SMES Chamber" }, /obj/structure/cable{ icon_state = "1-2" @@ -52307,6 +52581,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/equipment{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/engine/engine_smes) "pvM" = ( @@ -52397,8 +52674,7 @@ /area/ai_monitored/storage/eva) "pwX" = ( /obj/machinery/door/airlock/maintenance{ - name = "Engineering Maintenance"; - req_access_txt = "10" + name = "Engineering Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -52406,6 +52682,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "pxl" = ( @@ -52646,13 +52923,9 @@ }, /area/crew_quarters/kitchen) "pAZ" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/structure/cable{ icon_state = "0-8" }, @@ -52662,6 +52935,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/crew_quarters/heads/hos) "pBd" = ( @@ -52714,10 +52988,12 @@ base_state = "left"; dir = 8; icon_state = "left"; - name = "Research Division Delivery"; - req_access_txt = "47" + name = "Research Division Delivery" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/science/general{ + dir = 8 + }, /turf/open/floor/plasteel, /area/science/lab) "pBw" = ( @@ -52783,8 +53059,7 @@ /area/quartermaster/storage) "pCZ" = ( /obj/machinery/door/airlock/research/glass{ - name = "Test Chamber"; - req_access_txt = "47" + name = "Test Chamber" }, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -52805,6 +53080,7 @@ dir = 4 }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/misc_lab) "pDe" = ( @@ -52962,8 +53238,7 @@ /area/engine/engineering) "pGl" = ( /obj/machinery/door/airlock/command/glass{ - name = "Research Director"; - req_access_txt = "30" + name = "Research Director" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -52980,6 +53255,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/rd, /turf/open/floor/plasteel/bluespace, /area/crew_quarters/heads/hor) "pGm" = ( @@ -53144,8 +53420,10 @@ }, /obj/machinery/door/window/southleft{ dir = 4; - name = "Test Chamber"; - req_access_txt = "55" + name = "Test Chamber" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -53355,7 +53633,8 @@ "pMQ" = ( /obj/machinery/quantumpad{ map_pad_id = "aitoscience"; - map_pad_link_id = "sciencetoai" + map_pad_link_id = "sciencetoai"; + name = "RD Office Transport" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) @@ -53829,8 +54108,7 @@ "pUv" = ( /obj/machinery/door/window/northleft{ dir = 8; - name = "Containment Pen 6"; - req_access_txt = "55" + name = "Containment Pen 6" }, /obj/structure/cable{ icon_state = "1-2" @@ -53845,6 +54123,9 @@ /obj/effect/turf_decal/loading_area{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "pUz" = ( @@ -53858,8 +54139,7 @@ base_state = "rightsecure"; dir = 4; icon_state = "rightsecure"; - name = "Head of Personnel's Desk"; - req_access_txt = "57" + name = "Head of Personnel's Desk" }, /obj/machinery/door/window/northleft{ dir = 8; @@ -53893,6 +54173,9 @@ /obj/item/storage/pencil_holder/crew{ pixel_y = 9 }, +/obj/effect/mapping_helpers/windoor/access/all/service/hop{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "pUG" = ( @@ -54401,8 +54684,7 @@ /area/hallway/primary/starboard) "qbk" = ( /obj/machinery/door/airlock/security{ - name = "Security Office"; - req_one_access_txt = "1;4" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -54414,6 +54696,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/brig) "qbt" = ( @@ -54557,6 +54841,12 @@ }, /turf/open/floor/plasteel/white, /area/medical/virology) +"qer" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "qeJ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -54696,12 +54986,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/turf_decal/arrows/white{ - color = "#99ccff" - }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/turf_decal/arrows/white{ + color = "#99ccff"; + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "qif" = ( @@ -54884,6 +55175,9 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "qkB" = ( @@ -54910,7 +55204,7 @@ name = "Cell 3 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "PCell 3"; @@ -55054,9 +55348,7 @@ /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet/locker) "qmH" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -55071,6 +55363,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "qmN" = ( @@ -55097,8 +55390,7 @@ /area/hallway/secondary/exit) "qnL" = ( /obj/machinery/door/airlock/hatch{ - name = "Hardware Workshop"; - req_access_txt = "61" + name = "Hardware Workshop" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -55110,6 +55402,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/carpet/black, /area/tcommsat/computer) "qnO" = ( @@ -55157,13 +55450,12 @@ /turf/open/floor/plating, /area/crew_quarters/heads/cmo) "qop" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/starboard/aft) "qoK" = ( @@ -55179,8 +55471,7 @@ /area/engine/engineering) "qoN" = ( /obj/machinery/door/airlock/maintenance{ - name = "Dormitories Maintenance"; - req_access_txt = "12" + name = "Dormitories Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -55191,12 +55482,12 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "qoO" = ( /obj/machinery/door/airlock/public/glass{ - name = "Chapel Office"; - req_access_txt = "22" + name = "Chapel Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -55210,6 +55501,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/wood, /area/chapel/office) "qpg" = ( @@ -55221,8 +55513,8 @@ id = "roboticssurgery"; name = "Shutters Control Button"; pixel_x = -6; - pixel_y = 25; - req_access_txt = "29" + pixel_y = 24; + req_access = list("robotics") }, /turf/open/floor/plasteel/white, /area/science/robotics/lab) @@ -55508,8 +55800,7 @@ /area/engine/engineering) "quB" = ( /obj/machinery/door/airlock/research{ - name = "Mech Bay"; - req_one_access_txt = "29;75" + name = "Mech Bay" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = -1; @@ -55522,6 +55813,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plating, /area/science/robotics/lab) "quG" = ( @@ -55598,8 +55890,7 @@ /area/maintenance/starboard/fore) "qwA" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Quartermaster"; - req_access_txt = "41" + name = "Quartermaster" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -55611,6 +55902,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, /turf/open/floor/plasteel, /area/quartermaster/qm) "qwM" = ( @@ -55744,9 +56036,9 @@ dir = 8 }, /obj/machinery/door/airlock/research{ - name = "Toxins Storage"; - req_access_txt = "8" + name = "Toxins Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins_storage, /turf/open/floor/plating, /area/science/storage) "qzh" = ( @@ -55969,8 +56261,7 @@ /area/medical/sleeper) "qDZ" = ( /obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_access_txt = "27" + name = "Funeral Parlour Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -55984,6 +56275,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plating, /area/maintenance/port/fore) "qEc" = ( @@ -56193,7 +56485,8 @@ idSelf = "incinerator_access_control"; name = "Incinerator airlock control"; pixel_x = -24; - pixel_y = -8 + pixel_y = -8; + req_access = list("atmospherics") }, /obj/machinery/atmospherics/components/binary/pump{ dir = 4; @@ -56516,6 +56809,12 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/checkpoint/medical) +"qNB" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "qNE" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -56700,6 +56999,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/plasteel/cafeteria, /area/security/prison) "qQs" = ( @@ -56760,8 +57062,7 @@ "qQO" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "innerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -56771,6 +57072,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "qRk" = ( @@ -57362,13 +57664,13 @@ /area/hallway/secondary/entry) "rbC" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "rbK" = ( @@ -57542,9 +57844,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/door/airlock/mining{ - req_access_txt = "48" - }, +/obj/machinery/door/airlock/mining, /obj/structure/cable{ icon_state = "4-8" }, @@ -57552,12 +57852,12 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "rdK" = ( /obj/machinery/door/airlock/maintenance{ - name = "Vacant Office Maint"; - req_access_txt = "32" + name = "Vacant Office Maint" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -57574,6 +57874,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/vacant_room) "rdW" = ( @@ -58330,8 +58631,7 @@ "roD" = ( /obj/machinery/door/window/northleft{ dir = 8; - name = "Containment Pen 5"; - req_access_txt = "55" + name = "Containment Pen 5" }, /obj/structure/cable{ icon_state = "1-2" @@ -58346,6 +58646,9 @@ /obj/effect/turf_decal/loading_area{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "roK" = ( @@ -58354,11 +58657,11 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/public/glass{ - name = "Courtroom"; - req_access_txt = "42" + name = "Courtroom" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/courtroom) "roM" = ( @@ -58587,9 +58890,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/aft) "rsm" = ( @@ -58919,8 +59220,7 @@ "rwD" = ( /obj/machinery/door/airlock/highsecurity{ id_tag = "ai_core_airlock_exterior"; - name = "AI Core"; - req_access_txt = "16" + name = "AI Core" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -58935,6 +59235,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "rwS" = ( @@ -59084,6 +59385,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "rzS" = ( @@ -59175,8 +59479,7 @@ /area/engine/atmos/pumproom) "rBT" = ( /obj/machinery/door/airlock/maintenance{ - name = "Telecomms Maintenance"; - req_access_txt = "61" + name = "Telecomms Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -59184,6 +59487,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plating, /area/maintenance/central) "rBY" = ( @@ -59387,8 +59691,7 @@ /area/janitor) "rEP" = ( /obj/machinery/door/airlock/security/glass{ - name = "Long-Term Cell 1"; - req_access_txt = "2" + name = "Long-Term Cell 1" }, /obj/structure/cable{ icon_state = "1-2" @@ -59404,6 +59707,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "rFg" = ( @@ -59423,11 +59727,11 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/door/airlock/research/glass{ - name = "Secondary AI Core"; - normalspeed = 0; - req_access_txt = "47" +/obj/machinery/door/airlock/command/glass{ + name = "R&D Servers and Networking" }, +/obj/effect/mapping_helpers/airlock/access/any/science/rnd_servers, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/science/server) "rFr" = ( @@ -59656,7 +59960,7 @@ name = "Warehouse Door Control"; pixel_x = 1; pixel_y = -24; - req_access_txt = "31" + req_access = list("cargo") }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) @@ -59711,8 +60015,7 @@ /area/hallway/primary/central) "rKI" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" + name = "Bridge" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -59733,6 +60036,7 @@ /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "rKM" = ( @@ -59965,7 +60269,7 @@ name = "Chemistry shutters"; pixel_x = 25; pixel_y = -7; - req_one_access_txt = "5; 33" + req_access = list("chemistry") }, /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ dir = 6 @@ -60034,13 +60338,19 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/eastright{ dir = 1; - name = "Chemistry Desk"; - req_access_txt = "33" + name = "Chemistry Desk" }, /obj/machinery/door/poddoor/preopen{ id = "chemistry_shutters"; name = "Chemistry shutters" }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry{ + dir = 1 + }, /turf/open/floor/plating, /area/medical/chemistry) "rOt" = ( @@ -60251,8 +60561,7 @@ /area/engine/engineering) "rRG" = ( /obj/machinery/door/airlock/medical{ - name = "Medbay Break Room"; - req_access_txt = "5" + name = "Medbay Break Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -60264,6 +60573,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plasteel/white, /area/medical/storage/backroom) "rRH" = ( @@ -60326,8 +60636,7 @@ /area/science/robotics/mechbay) "rSn" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics"; - req_access_txt = "24" + name = "Atmospherics" }, /obj/structure/cable{ icon_state = "1-2" @@ -60351,6 +60660,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/foyer) "rSp" = ( @@ -60418,8 +60728,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_access_txt = "50" + name = "Cargo Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -60430,6 +60739,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/office) "rTv" = ( @@ -60642,8 +60952,7 @@ /area/hallway/primary/port) "rWd" = ( /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -60652,6 +60961,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "rWg" = ( @@ -61024,9 +61335,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock{ - name = "Kitchen cold room"; - req_access_txt = "28" + name = "Kitchen cold room" }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) "sbp" = ( @@ -61042,8 +61353,7 @@ "sbt" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -61055,6 +61365,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "sbH" = ( @@ -61084,11 +61395,11 @@ /obj/machinery/door/window/southleft{ base_state = "right"; icon_state = "right"; - name = "Monkey Pen"; - req_access_txt = "39" + name = "Monkey Pen" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/windoor/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "sbX" = ( @@ -61224,24 +61535,26 @@ "scG" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen 4"; - req_access_txt = "55" + name = "Containment Pen 4" }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/engine, /area/science/xenobiology) "scH" = ( /obj/machinery/door/airlock/maintenance{ - name = "Holodeck Maintenance"; - req_access_txt = "12" + name = "Holodeck Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "sdk" = ( @@ -61310,9 +61623,11 @@ /turf/closed/mineral/random/low_chance_air, /area/space/nearstation) "sek" = ( -/obj/machinery/door/window/westright, +/obj/machinery/door/window/westright{ + dir = 4; + name = "Kitchen Window" + }, /obj/structure/table/reinforced, -/obj/effect/turf_decal/sand, /obj/item/reagent_containers/food/snacks/pie/cream, /obj/structure/disposalpipe/segment{ dir = 8 @@ -61320,9 +61635,13 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/turf/open/floor/plasteel{ - icon_state = "cafeteria" +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/all/service/kitchen{ + dir = 4 }, +/turf/open/floor/plating, /area/crew_quarters/kitchen) "sem" = ( /obj/structure/chair/sofa/right, @@ -61473,6 +61792,9 @@ /obj/structure/chair{ dir = 4 }, +/obj/structure/sign/poster/official/obey{ + pixel_y = 32 + }, /turf/open/floor/plasteel, /area/security/execution/transfer) "shP" = ( @@ -61640,12 +61962,11 @@ /turf/open/floor/plating/asteroid, /area/ruin/powered) "slo" = ( -/obj/machinery/door/window/southleft{ - req_access_txt = "36" - }, +/obj/machinery/door/window/southleft, /obj/machinery/door/poddoor/shutters{ id = "giftshop" }, +/obj/effect/mapping_helpers/windoor/access/all/service/clerk, /turf/open/floor/plating, /area/clerk) "slv" = ( @@ -61665,8 +61986,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/mining/glass{ - name = "Quartermaster"; - req_access_txt = "41" + name = "Quartermaster" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -61685,6 +62005,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, /turf/open/floor/plasteel, /area/quartermaster/office) "slC" = ( @@ -61952,12 +62273,14 @@ }, /obj/machinery/suit_storage_unit/command, /obj/machinery/door/window/northright{ - name = "Emergency Storage"; - req_access_txt = "19" + name = "Emergency Storage" }, /obj/structure/window/reinforced{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/command/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/bridge) "spX" = ( @@ -62437,12 +62760,14 @@ pixel_y = -3 }, /obj/machinery/door/window/northleft{ - name = "Emergency Storage"; - req_access_txt = "19" + name = "Emergency Storage" }, /obj/structure/window/reinforced{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/command/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/bridge) "sxy" = ( @@ -62540,12 +62865,12 @@ dir = 8 }, /obj/machinery/door/airlock/highsecurity{ - name = "Backup SMES Access"; - req_one_access_txt = "11;32" + name = "Backup SMES Access" }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/engine, /area/engine/engineering) "szs" = ( @@ -62596,13 +62921,13 @@ }, /obj/machinery/door/airlock/highsecurity{ id_tag = "ai_core_airlock_exterior"; - name = "AI Core"; - req_access_txt = "65" + name = "AI Core" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "aicoredoor"; name = "AI Chamber entrance shutters" }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) "szX" = ( @@ -62651,7 +62976,7 @@ id = "atmos"; name = "Atmospherics Lockdown"; pixel_y = 24; - req_access_txt = "24" + req_access = list("atmospherics") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -62775,7 +63100,7 @@ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_x = -25; - req_access_txt = "31" + req_access = list("cargo") }, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -63459,14 +63784,14 @@ dir = 8 }, /obj/machinery/door/window{ - name = "Low-Risk Modules"; - req_access_txt = "20" + name = "Low-Risk Modules" }, /obj/effect/spawner/lootdrop/aimodule_neutral, /obj/effect/spawner/lootdrop/aimodule_neutral, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "sLA" = ( @@ -63601,8 +63926,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/research/glass{ - name = "Genetics Research"; - req_access_txt = "5; 9; 68" + name = "Genetics Lab" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -63619,6 +63943,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/medical/genetics) "sNj" = ( @@ -63655,20 +63980,20 @@ name = "Left side containment blast doors"; pixel_x = -6; pixel_y = 30; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/machinery/button/door{ id = "xenobio_r"; name = "Right side containment blast doors"; pixel_x = 6; pixel_y = 30; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/machinery/button/door{ id = "xenobio_main"; name = "Main containment blast doors"; pixel_y = 39; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/machinery/plortrefinery, /turf/open/floor/plasteel/white, @@ -63692,13 +64017,13 @@ dir = 8 }, /obj/machinery/door/airlock/security{ - name = "Brig"; - req_access_txt = "63; 42" + name = "Courtroom" }, /obj/effect/turf_decal/trimline/secred/filled/corner/lower, /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/courtroom) "sOi" = ( @@ -63739,9 +64064,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/security/courtroom) "sOo" = ( @@ -63825,6 +64149,14 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"sQp" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/maintenance_hatch, +/turf/open/floor/plating, +/area/maintenance/port/aft) "sQz" = ( /obj/structure/window/reinforced{ dir = 4 @@ -64033,14 +64365,16 @@ "sUV" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/northright{ - name = "Hydroponics Desk"; - req_access_txt = "35" + name = "Hydroponics Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 1 + }, +/turf/open/floor/plating, /area/hydroponics) "sVg" = ( /obj/effect/spawner/lootdrop/maintenance, @@ -64106,12 +64440,15 @@ /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 4 }, +/obj/effect/turf_decal/arrows/white{ + color = "#99ccff"; + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "sVB" = ( /obj/machinery/door/airlock/external{ - name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -64122,6 +64459,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/processing) "sVU" = ( @@ -64158,8 +64496,7 @@ /area/maintenance/port/fore) "sWo" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -64167,6 +64504,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "sWs" = ( @@ -64509,7 +64847,7 @@ name = "Cell 1 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "PCell 1"; @@ -64525,9 +64863,8 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/fore) "tbV" = ( @@ -65042,7 +65379,9 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/door/airlock/medical/glass, +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Treatment Center" + }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -65050,6 +65389,8 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "tkr" = ( @@ -65102,8 +65443,7 @@ /area/medical/storage/backroom) "tlC" = ( /obj/machinery/door/airlock{ - name = "Kitchen"; - req_access_txt = "28" + name = "Kitchen" }, /obj/effect/turf_decal/sand, /obj/machinery/door/firedoor/border_only{ @@ -65112,6 +65452,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plasteel{ icon_state = "cafeteria" }, @@ -65208,8 +65549,7 @@ /area/security/brig) "tmQ" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prisoner Processing"; - req_access_txt = "2" + name = "Prisoner Processing" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -65229,6 +65569,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/processing) "tnb" = ( @@ -65347,8 +65688,7 @@ "tpZ" = ( /obj/machinery/door/window{ dir = 1; - name = "Backup SMES Chamber"; - req_access_txt = "32" + name = "Backup SMES Chamber" }, /obj/structure/cable{ icon_state = "1-2" @@ -65356,6 +65696,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/equipment{ + dir = 1 + }, /turf/open/floor/engine, /area/engine/engineering) "tqf" = ( @@ -65408,8 +65751,7 @@ /area/crew_quarters/bar) "tqW" = ( /obj/machinery/door/airlock/security/glass{ - name = "Brig Control"; - req_access_txt = "3" + name = "Brig Control" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -65417,6 +65759,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel, /area/security/warden) "trc" = ( @@ -65679,12 +66022,12 @@ dir = 4 }, /obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "47" + name = "Experimentation Lab" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/explab) "tvh" = ( @@ -65996,9 +66339,7 @@ /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai_upload) "tAj" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;36" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable{ icon_state = "4-8" }, @@ -66014,6 +66355,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/general, /turf/open/floor/plating, /area/maintenance/port/fore) "tAq" = ( @@ -66029,13 +66372,13 @@ }, /obj/machinery/door/airlock/security/glass{ id_tag = "innerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "tAK" = ( @@ -66145,9 +66488,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -66157,6 +66498,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "tCc" = ( @@ -66174,8 +66516,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator and SMES"; - req_one_access_txt = "11;32" + name = "Gravity Generator and SMES" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -66186,6 +66527,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engine_smes) "tCo" = ( @@ -66240,9 +66582,6 @@ pixel_y = 25; specialfunctions = 4 }, -/obj/structure/sign/poster/official/obey{ - pixel_x = 32 - }, /turf/open/floor/plasteel, /area/security/prison) "tCZ" = ( @@ -66435,8 +66774,7 @@ dir = 4 }, /obj/machinery/door/airlock/command{ - name = "Head of Personnel"; - req_access_txt = "57" + name = "Head of Personnel" }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 @@ -66444,6 +66782,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hop, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "tGC" = ( @@ -66869,8 +67208,7 @@ /area/maintenance/central/secondary) "tOw" = ( /obj/machinery/door/airlock/hatch{ - name = "MiniSat Monitoring Room"; - req_access_txt = "65" + name = "MiniSat Monitoring Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -66882,6 +67220,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/aisat_interior) "tOY" = ( @@ -66966,13 +67305,13 @@ dir = 4 }, /obj/machinery/door/airlock/command/glass{ - name = "Chief Engineer"; - req_access_txt = "56" + name = "Chief Engineer" }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/engineering/ce, /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "tPL" = ( @@ -67151,13 +67490,13 @@ base_state = "left"; dir = 2; icon_state = "left"; - name = "Robotics Desk"; - req_one_access_txt = "29;75" + name = "Robotics Desk" }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower, /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/robotics, /turf/open/floor/plasteel/white, /area/science/robotics/lab) "tRA" = ( @@ -67324,9 +67663,7 @@ /area/science/xenobiology) "tUi" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medical Storage"; - normalspeed = 0; - req_access_txt = "5" + name = "Medical Storage" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -67337,6 +67674,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/storage) "tUl" = ( @@ -67427,14 +67765,14 @@ /area/hallway/primary/central) "tUT" = ( /obj/machinery/door/airlock/external{ - name = "Escape Pod Three"; - req_access_txt = "63" + name = "Escape Pod Three" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/processing) "tUW" = ( @@ -67513,9 +67851,10 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "tWu" = ( @@ -67664,8 +68003,7 @@ /area/security/prison) "tYy" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator and SMES"; - req_one_access_txt = "11;32" + name = "Gravity Generator and SMES" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -67688,6 +68026,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engine_smes) "tYC" = ( @@ -67780,9 +68119,9 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "12" + name = "Shipbreaking External Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plasteel, /area/escapepodbay) "uau" = ( @@ -68338,6 +68677,7 @@ "ujc" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/wood, /area/lawoffice) "ujr" = ( @@ -68613,9 +68953,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) "unf" = ( @@ -68643,7 +68982,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/effect/turf_decal/trimline/yellow/filled/corner/lower{ +/obj/effect/turf_decal/stripes/corner{ dir = 1 }, /turf/open/floor/plasteel, @@ -68670,7 +69009,7 @@ name = "Cell 2 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "PCell 2"; @@ -68776,9 +69115,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock{ - name = "Custodial Closet"; - req_access_txt = "26" + name = "Custodial Closet" }, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/plasteel, /area/janitor) "upW" = ( @@ -68907,8 +69246,7 @@ /area/maintenance/starboard/fore) "uso" = ( /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/machinery/newscaster{ pixel_x = 32 @@ -68923,6 +69261,7 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "usq" = ( @@ -68990,8 +69329,7 @@ dir = 4 }, /obj/machinery/door/airlock{ - name = "Service Hall"; - req_access_txt = "79" + name = "Service Hall" }, /obj/structure/cable{ icon_state = "4-8" @@ -69002,6 +69340,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/general, /turf/open/floor/plating, /area/hallway/secondary/service) "utD" = ( @@ -69478,13 +69817,15 @@ idInterior = "telecomms_airlock_interior"; idSelf = "telecomms_airlock_control"; pixel_x = 5; - pixel_y = 25 + pixel_y = 25; + req_access = list("tcomms") }, /obj/machinery/doorButtons/access_button{ idDoor = "telecomms_airlock_exterior"; idSelf = "telecomms_airlock_control"; pixel_x = -7; - pixel_y = 23 + pixel_y = 23; + req_access = list("tcomms") }, /turf/open/floor/plasteel/dark, /area/tcommsat/storage) @@ -69605,17 +69946,16 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Disposal Access"; - req_access_txt = "12" + name = "Disposal Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "uFc" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ dir = 1; - name = "Engineering Desk"; - req_access_txt = "10" + name = "Engineering Desk" }, /obj/item/deskbell/preset/engi{ pixel_x = 8; @@ -69623,7 +69963,17 @@ }, /obj/item/storage/pencil_holder/crew{ pixel_x = -10; - pixel_y = 12 + pixel_y = -1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/any/engineering/construction{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/any/engineering/general{ + dir = 1 }, /turf/open/floor/plating, /area/engine/foyer) @@ -69746,7 +70096,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/effect/turf_decal/trimline/yellow/warning/lower{ +/obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/plasteel, @@ -70418,6 +70768,9 @@ dir = 1 }, /obj/structure/flora/ausbushes/fullgrass, +/obj/effect/turf_decal/ramp_corner{ + dir = 8 + }, /turf/open/floor/grass, /area/hallway/secondary/exit) "uVk" = ( @@ -70602,8 +70955,7 @@ "uYy" = ( /obj/machinery/door/airlock/research/glass{ name = "Kill Chamber"; - normalspeed = 0; - req_access_txt = "55" + normalspeed = 0 }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -70614,6 +70966,7 @@ /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "uYQ" = ( @@ -70809,8 +71162,7 @@ "vbw" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen 1"; - req_access_txt = "55" + name = "Containment Pen 1" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio_l"; @@ -70822,6 +71174,9 @@ /obj/effect/turf_decal/loading_area{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "vbB" = ( @@ -70970,6 +71325,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/trimline/green/filled/corner/lower{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/filled/corner/lower{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hydroponics) "veU" = ( @@ -71231,6 +71592,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/open/floor/plating, /area/maintenance/port/aft) "vjp" = ( @@ -71529,15 +71893,14 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "voZ" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/fore) "vpg" = ( @@ -71660,8 +72023,7 @@ base_state = "left"; dir = 2; icon_state = "left"; - name = "Genetics Desk"; - req_access_txt = "5;9;68" + name = "Genetics Desk" }, /obj/item/paper_bin{ pixel_x = -3; @@ -71675,7 +72037,8 @@ pixel_x = 9; pixel_y = 9 }, -/turf/open/floor/plasteel/white, +/obj/effect/mapping_helpers/windoor/access/all/science/genetics, +/turf/open/floor/plating, /area/medical/genetics) "vse" = ( /obj/structure/table/wood, @@ -71761,7 +72124,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -10; pixel_y = 24; - req_one_access_txt = "30;70" + req_access = list("ai_sat") }, /turf/open/floor/plasteel/dark, /area/science/server) @@ -71835,8 +72198,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/medical/glass{ - name = "Chemistry Lab"; - req_access_txt = "5; 33" + name = "Chemistry Lab" }, /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ dir = 8 @@ -71844,6 +72206,7 @@ /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, /turf/open/floor/plasteel/white, /area/medical/chemistry) "vtU" = ( @@ -71898,8 +72261,7 @@ autoclose = 0; frequency = 1449; id_tag = "telecomms_airlock_exterior"; - name = "Telecomms Server Room Access"; - req_access_txt = "61" + name = "Telecomms Server Room Access" }, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/cable/yellow{ @@ -71911,6 +72273,8 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, +/obj/effect/mapping_helpers/airlock/access/any/command/general, /turf/open/floor/plasteel, /area/tcommsat/storage) "vuV" = ( @@ -72015,16 +72379,17 @@ }, /obj/item/scalpel, /obj/machinery/door/window/northright{ - name = "Autopsy Desk"; - req_access_txt = "4" + name = "Autopsy Desk" }, /obj/item/paper/autopsy, +/obj/effect/mapping_helpers/windoor/access/all/security/detective{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/security/detectives_office) "vwo" = ( /obj/machinery/door/airlock/security{ - name = "Security Checkpoint"; - req_access_txt = "1" + name = "Security Checkpoint" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -72032,6 +72397,8 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/checkpoint/auxiliary) "vwp" = ( @@ -72383,8 +72750,7 @@ "vCX" = ( /obj/machinery/door/window/southleft{ dir = 8; - name = "Test Chamber"; - req_access_txt = "55" + name = "Test Chamber" }, /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 8 @@ -72395,6 +72761,9 @@ /obj/effect/turf_decal/stripes{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "vCY" = ( @@ -72489,14 +72858,14 @@ "vFa" = ( /obj/machinery/door/window/westleft{ dir = 2; - name = "Monkey Pen"; - req_access_txt = "9" + name = "Monkey Pen" }, /mob/living/carbon/monkey, /obj/structure/window/reinforced{ dir = 4 }, /obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/mapping_helpers/windoor/access/all/science/genetics, /turf/open/floor/grass, /area/medical/genetics) "vFj" = ( @@ -72774,6 +73143,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/stairs/goon/stairs_wide{ dir = 8 }, @@ -72848,8 +73220,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/medical{ - name = "Paramedic Staging Area"; - req_access_txt = "69" + name = "Paramedic Staging Area" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 @@ -72857,6 +73228,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "vMP" = ( @@ -72914,9 +73286,9 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" + name = "Medbay Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/port/aft) "vNA" = ( @@ -73037,6 +73409,7 @@ c_tag = "Library North"; dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/service/library, /turf/open/floor/wood, /area/library) "vOX" = ( @@ -73103,12 +73476,14 @@ "vQU" = ( /obj/machinery/suit_storage_unit/command, /obj/machinery/door/window/northleft{ - name = "Emergency Storage"; - req_access_txt = "19" + name = "Emergency Storage" }, /obj/structure/window/reinforced{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/command/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/bridge) "vQV" = ( @@ -73359,7 +73734,8 @@ "vUC" = ( /obj/machinery/quantumpad{ map_pad_id = "sciencetoai"; - map_pad_link_id = "aitoscience" + map_pad_link_id = "aitoscience"; + name = "AI Satellite Transport" }, /obj/item/radio/intercom{ dir = 8; @@ -73417,8 +73793,7 @@ /area/engine/atmos/distro) "vVe" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Power Storage"; - req_access_txt = "11" + name = "Power Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -73437,6 +73812,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engineering) "vVy" = ( @@ -73542,8 +73918,7 @@ /area/hallway/primary/port) "vYq" = ( /obj/machinery/door/airlock/security/glass{ - name = "Long-Term Cell 2"; - req_access_txt = "2" + name = "Long-Term Cell 2" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -73556,6 +73931,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "vYx" = ( @@ -73580,6 +73956,18 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, /turf/open/floor/plasteel, /area/hallway/primary/port) +"vYA" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/security/courtroom) "vYC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -73752,23 +74140,23 @@ name = "Public Shutters Control Button"; pixel_x = 26; pixel_y = 38; - req_one_access_txt = "29;75" + req_access = list("robotics") }, /obj/machinery/button/door{ id = "robotics2"; name = "Science Shutters Control Button"; pixel_x = 26; pixel_y = 27; - req_one_access_txt = "29;75" + req_access = list("robotics") }, /obj/machinery/button/door{ desc = "A remote control switch for the robotics foyer."; id = "RoboticsFoyer"; name = "Robotics Doors Control"; normaldoorcontrol = 1; - pixel_x = 39; + pixel_x = 38; pixel_y = 27; - req_one_access_txt = "29;75" + req_access = list("robotics") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 @@ -74379,6 +74767,11 @@ /obj/structure/chair/stool, /turf/open/floor/carpet/purple, /area/maintenance/port/aft) +"wkg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/ramp_corner, +/turf/open/floor/plasteel, +/area/security/prison) "wkn" = ( /obj/structure/table/optable, /obj/item/storage/backpack/duffelbag/med/surgery, @@ -74447,7 +74840,6 @@ "wlh" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2"; shuttledocked = 1 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -74456,6 +74848,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/processing) "wln" = ( @@ -74464,8 +74857,7 @@ /area/tcommsat/server) "wlt" = ( /obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_access_txt = "27" + name = "Crematorium Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -74482,6 +74874,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plating, /area/maintenance/port/fore) "wlB" = ( @@ -74743,6 +75136,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/stairs/goon/stairs_wide{ dir = 8 }, @@ -75219,6 +75615,9 @@ /area/hallway/primary/central) "wxr" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/stairs/goon/stairs2_wide{ dir = 8 }, @@ -75418,7 +75817,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/effect/turf_decal/trimline/yellow/filled/corner/lower{ +/obj/effect/turf_decal/stripes/corner{ dir = 1 }, /turf/open/floor/plasteel, @@ -75521,7 +75920,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -7; pixel_y = -24; - req_one_access_txt = "30;70" + req_access = list("ai_sat") }, /obj/machinery/doorButtons/airlock_controller{ idExterior = "secondary_aicore_exterior"; @@ -75530,7 +75929,7 @@ name = "Secondary AI Core Access Console"; pixel_x = 6; pixel_y = -26; - req_one_access_txt = "30;70" + req_access = list("ai_sat") }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/secondarydatacoreserver) @@ -75577,7 +75976,7 @@ name = "AI Chamber entrance shutters control"; pixel_x = -23; pixel_y = 21; - req_access_txt = "16" + req_access = list("ai_master") }, /obj/structure/ethernet_cable{ icon_state = "0-4" @@ -75711,8 +76110,7 @@ /area/security/physician) "wBT" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Auxiliary Storage"; - req_access_txt = "24" + name = "Atmospherics Auxiliary Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -75732,6 +76130,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/storage) "wCt" = ( @@ -75779,9 +76178,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/corner, /obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "63" + name = "Security External Airlock" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/processing) "wCU" = ( @@ -75818,8 +76217,7 @@ /area/ai_monitored/storage/satellite) "wDy" = ( /obj/machinery/door/airlock/maintenance{ - name = "Cargo Bay Warehouse Maintenance"; - req_access_txt = "31" + name = "Cargo Bay Warehouse Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -75833,6 +76231,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/quartermaster/warehouse) "wDH" = ( @@ -76269,6 +76668,22 @@ }, /turf/open/floor/plasteel/dark, /area/security/prison) +"wKg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/security/prison) "wKv" = ( /obj/item/stack/sheet/cardboard, /obj/machinery/light_switch{ @@ -76282,6 +76697,22 @@ /obj/structure/cable, /turf/open/floor/plating, /area/security/prison) +"wKM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/prison) "wKR" = ( /obj/effect/landmark/carpspawn, /turf/open/space/basic, @@ -76827,8 +77258,7 @@ dir = 1 }, /obj/machinery/door/airlock/command{ - name = "Teleport Access"; - req_access_txt = "17" + name = "Teleport Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -76849,6 +77279,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/teleporter, /turf/open/floor/mineral/titanium, /area/teleporter) "wTi" = ( @@ -77004,7 +77435,8 @@ /obj/machinery/button/door{ id = "hosspace"; name = "Space Shutters Control"; - pixel_y = 36 + pixel_y = 36; + req_access = list("security") }, /obj/item/paper_bin{ pixel_y = 5 @@ -77111,6 +77543,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, +/obj/effect/turf_decal/ramp_corner{ + dir = 8 + }, /turf/open/floor/plasteel, /area/security/prison) "wWl" = ( @@ -77426,12 +77861,12 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay"; - req_access_txt = "31" + name = "Cargo Bay" }, /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plasteel, /area/quartermaster/storage) "xbn" = ( @@ -77442,12 +77877,12 @@ /area/ai_monitored/turret_protected/aisat_interior) "xbB" = ( /obj/machinery/door/airlock/external{ - name = "Security Escape Airlock"; - req_access_txt = "2" + name = "Security Escape Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/hallway/secondary/exit) "xcB" = ( @@ -77469,8 +77904,7 @@ /area/security/prison) "xcY" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Launch Room"; - req_access_txt = "7" + name = "Toxins Launch Room" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -77484,6 +77918,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel, /area/science/mixing) "xds" = ( @@ -77580,9 +78015,6 @@ /turf/open/floor/plasteel, /area/crew_quarters/locker) "xfk" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -77595,6 +78027,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/port/fore) "xfu" = ( @@ -77849,8 +78282,7 @@ /area/hallway/primary/starboard) "xkg" = ( /obj/machinery/door/airlock/external{ - name = "Security Escape Airlock"; - req_access_txt = "2" + name = "Security Escape Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -77861,6 +78293,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/hallway/secondary/exit) "xki" = ( @@ -78049,7 +78482,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/ministile/hop{ name = "Cargo line turnstile"; - req_one_access = list(50) + req_access = list("cargo") }, /obj/effect/turf_decal/loading_area{ dir = 1 @@ -78077,8 +78510,7 @@ /area/security/brig) "xnZ" = ( /obj/machinery/door/airlock/maintenance{ - name = "Paramedic Staging Area Maintenance"; - req_access_txt = "69" + name = "Paramedic Staging Area Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -78089,6 +78521,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plating, /area/medical/paramedic) "xom" = ( @@ -78118,19 +78551,12 @@ /turf/open/floor/plasteel, /area/engine/foyer) "xpC" = ( -/obj/machinery/door/airlock/command/glass{ - name = "Head of Security"; - req_access_txt = "58" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -78140,6 +78566,10 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/machinery/door/airlock/command/glass{ + name = "Head of Security" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/hos, /turf/open/floor/plasteel, /area/crew_quarters/heads/hos) "xpM" = ( @@ -78229,8 +78659,10 @@ /obj/machinery/shieldwallgen/xenobiologyaccess, /obj/machinery/door/window/southleft{ dir = 4; - name = "Test Chamber"; - req_access_txt = "55" + name = "Test Chamber" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -78447,7 +78879,8 @@ idDoor = "telecomms_airlock_interior"; idSelf = "telecomms_airlock_control"; pixel_x = 21; - pixel_y = -4 + pixel_y = -4; + req_access = list("tcomms") }, /obj/item/radio/intercom{ freerange = 1; @@ -78464,8 +78897,7 @@ /obj/machinery/door/window/westleft{ dir = 1; layer = 3.1; - name = "Cyborg Upload Console Window"; - req_access_txt = "16" + name = "Cyborg Upload Console Window" }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -78477,6 +78909,9 @@ /obj/machinery/computer/upload/borg{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 1 + }, /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai_upload) "xvw" = ( @@ -78539,7 +78974,7 @@ name = "Disposal Vent Control"; pixel_x = -25; pixel_y = 4; - req_access_txt = "12" + req_access = list("maint_tunnels") }, /obj/machinery/button/massdriver{ id = "trash"; @@ -78603,7 +79038,7 @@ id = "cell1 blast"; name = "Cell 1 Blast Door Control"; pixel_x = -26; - req_access_txt = "63" + req_access = list("brig") }, /turf/open/floor/plasteel, /area/security/prison) @@ -78747,13 +79182,13 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_interior"; - name = "Virology Interior Airlock"; - req_access_txt = "39" + name = "Virology Interior Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "xzU" = ( @@ -78828,8 +79263,7 @@ /area/hallway/secondary/entry) "xAQ" = ( /obj/machinery/door/airlock/security/glass{ - name = "Evidence Storage"; - req_access_txt = "63" + name = "Evidence Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -78841,6 +79275,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/brig) "xAW" = ( @@ -79282,8 +79718,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/window/westleft{ dir = 2; - name = "Cargo Desk"; - req_access_txt = "31" + name = "Cargo Desk" }, /obj/item/deskbell/preset/supply{ pixel_x = 7; @@ -79293,6 +79728,7 @@ pixel_x = 9; pixel_y = -2 }, +/obj/effect/mapping_helpers/windoor/access/all/supply/general, /turf/open/floor/plating, /area/quartermaster/office) "xIK" = ( @@ -79413,14 +79849,14 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" + name = "Supply Dock Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/quartermaster/storage) "xKQ" = ( @@ -79473,8 +79909,7 @@ /area/medical/medbay/central) "xLc" = ( /obj/machinery/door/airlock/maintenance{ - name = "Bar Storage Maintenance"; - req_access_txt = "25" + name = "Bar Storage Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -79487,6 +79922,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plating, /area/maintenance/port/fore) "xLd" = ( @@ -79633,14 +80069,14 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_one_access_txt = "10" - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/engineering/glass{ + name = "External Access and Backup SMES" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "xNz" = ( @@ -79746,8 +80182,7 @@ }, /obj/machinery/door/airlock/security{ aiControlDisabled = 1; - name = "Prisoner Transfer Centre"; - req_access_txt = "2" + name = "Prisoner Transfer Centre" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -79755,6 +80190,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/execution/transfer) "xOT" = ( @@ -79958,8 +80394,7 @@ /area/engine/foyer) "xSa" = ( /obj/machinery/door/airlock/security/glass{ - name = "Equipment Room"; - req_access_txt = "1" + name = "Equipment Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -79967,6 +80402,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel, /area/security/main) "xSo" = ( @@ -80146,9 +80582,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/maintenance{ - name = "Research Maintenance Closet"; - req_access_txt = "47" + name = "Research Maintenance Closet" }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/maintenance/central/secondary) "xVO" = ( @@ -80178,9 +80614,6 @@ /turf/closed/wall/r_wall, /area/engine/atmos/distro) "xWi" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, /turf/open/floor/mech_bay_recharge_floor/dark, /area/science/robotics/mechbay) "xWm" = ( @@ -80264,6 +80697,18 @@ }, /turf/open/floor/plasteel, /area/security/courtroom) +"xXB" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plating, +/area/maintenance/port/fore) "xXG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -80461,7 +80906,7 @@ name = "Gift Shop Internal Shutters"; pixel_x = 6; pixel_y = 25; - req_access_txt = "36" + req_access = list("clerk") }, /obj/effect/turf_decal/tile/darkgreen{ dir = 1 @@ -80487,7 +80932,8 @@ id = "giftshop_ext"; name = "Gift Shop External Shutters"; pixel_x = -5; - pixel_y = 25 + pixel_y = 25; + req_access = list("clerk") }, /turf/open/floor/plasteel, /area/clerk) @@ -80618,12 +81064,11 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "ycz" = ( @@ -80640,8 +81085,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 @@ -80649,6 +81093,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/white, /area/security/checkpoint/medical) "ycH" = ( @@ -80686,8 +81131,7 @@ /area/quartermaster/sorting) "ydq" = ( /obj/machinery/door/airlock/command/glass{ - name = "Research Director"; - req_access_txt = "30" + name = "Research Director" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -80695,6 +81139,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/rd, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "ydt" = ( @@ -80747,6 +81192,9 @@ /area/engine/atmos/distro) "yek" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/stairs/goon/stairs_wide{ dir = 8 }, @@ -80914,8 +81362,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/atmos/glass{ - name = "Construction Area"; - req_access_txt = "24" + name = "Construction Area" }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 4 @@ -80923,6 +81370,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ygB" = ( @@ -80946,7 +81394,6 @@ "ygS" = ( /obj/machinery/door/airlock/external{ name = "Mining Dock Airlock"; - req_access_txt = "48"; shuttledocked = 1 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -80956,6 +81403,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "ygU" = ( @@ -81167,7 +81615,7 @@ /obj/machinery/ministile/hop{ dir = 1; name = "Cargo line turnstile"; - req_one_access = list(50) + req_access = list("cargo") }, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/loading_area, @@ -98857,11 +99305,11 @@ nkT aAw aAw aAw -jOx +ltA ixW vYd ixW -aAw +qNB aAw aAw cNO @@ -100351,7 +100799,7 @@ qad nFu xmg kit -aao +bZX sEf aao aao @@ -101194,7 +101642,7 @@ aZG aPk aVy aQo -aVy +peB aaQ wzK oKW @@ -106524,9 +106972,9 @@ wkR lEu qHN wkR -wkR +xXB evt -wkR +lml wdu wkR jTt @@ -107038,8 +107486,8 @@ iXr cLe oXy rft -rft -mab +eJP +vYA aFr gLJ soS @@ -107110,7 +107558,7 @@ thM thM elg oFH -dke +nQb yfs qhQ gbA @@ -108361,7 +108809,7 @@ akp akp akp akp -azt +aAA aNg kfu ycH @@ -110409,7 +110857,7 @@ bXz cij jpN cij -cij +jpN ktk adX aFu @@ -111659,9 +112107,9 @@ qiR axP wjs mLG -eoe +byp rzN -eoe +frL eoe eoe lyn @@ -113207,7 +113655,7 @@ aXS aXS aXS eYe -aZH +qer oGi oGi oGi @@ -113721,7 +114169,7 @@ oGi oGi oGi oGi -ucA +dke nwk ucA oGi @@ -114581,7 +115029,7 @@ ciZ uHk aVN mNt -oQP +sQp aQo aQo atJ @@ -117277,12 +117725,12 @@ xkT rsd ajQ dln -cNa -pWE +ciz +wKg ofo ahZ wtQ -hyg +dSg qQp hyg arQ @@ -118157,7 +118605,7 @@ aWh eJa hvX mNs -hvX +fgk uKZ aWh agB @@ -118305,10 +118753,10 @@ msb msb aTD vvv -kUA -kUA -vim -kUA +wkg +cbC +wKM +cbC wWj wgJ aTD @@ -125817,9 +126265,9 @@ aNY jDk eIN piD -ajX -qnO -ajX +azt +lLn +azt uVe eIN dfi diff --git a/_maps/map_files/DonutStation/DonutStation.dmm b/_maps/map_files/DonutStation/DonutStation.dmm index 428b725bc800..997a1eadee75 100644 --- a/_maps/map_files/DonutStation/DonutStation.dmm +++ b/_maps/map_files/DonutStation/DonutStation.dmm @@ -24,8 +24,7 @@ /area/science/research) "aaO" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -36,6 +35,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "aaQ" = ( @@ -240,14 +240,13 @@ /turf/open/floor/plasteel, /area/security/brig) "aen" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "aeq" = ( @@ -276,8 +275,7 @@ dir = 4 }, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "5" + name = "Medbay Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -289,6 +287,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel, /area/medical/storage) "afk" = ( @@ -1123,8 +1122,7 @@ /area/engine/atmos) "aur" = ( /obj/machinery/door/airlock/research{ - name = "Genetics Research Access"; - req_access_txt = "9" + name = "Genetics Research Access" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ @@ -1139,6 +1137,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/medical/genetics) "aux" = ( @@ -1229,9 +1228,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "avK" = ( @@ -1673,8 +1672,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock{ - name = "Service Hall"; - req_access_txt = "79" + name = "Service Hall" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -1688,6 +1686,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/general, /turf/open/floor/plasteel, /area/hallway/secondary/service) "aGC" = ( @@ -1823,8 +1822,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/security{ aiControlDisabled = 1; - name = "Prisoner Transfer Centre"; - req_access_txt = "2" + name = "Prisoner Transfer Centre" }, /obj/structure/cable{ icon_state = "1-2" @@ -1833,6 +1831,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/prison) "aJS" = ( @@ -1869,7 +1868,8 @@ idSelf = "incinerator_access_control"; name = "Incinerator airlock control"; pixel_x = -22; - pixel_y = 22 + pixel_y = 22; + req_access = list("atmospherics") }, /obj/machinery/doorButtons/access_button{ idDoor = "incinerator_airlock_interior"; @@ -1877,7 +1877,8 @@ layer = 3.1; name = "Incinerator airlock control"; pixel_x = -22; - pixel_y = -21 + pixel_y = -21; + req_access = list("atmospherics") }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -2305,6 +2306,9 @@ /area/engine/atmos) "aSn" = ( /obj/structure/railing, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/plasteel/stairs/goon/stairs2_wide{ dir = 4 }, @@ -2608,12 +2612,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "aXH" = ( @@ -2803,7 +2807,8 @@ id = "Skynet_launch"; name = "Mech Bay Door Control"; pixel_x = 24; - pixel_y = -6 + pixel_y = -6; + req_access = list("robotics") }, /obj/machinery/light_switch{ pixel_x = 24; @@ -2928,13 +2933,14 @@ /area/security/warden) "bdj" = ( /obj/machinery/door/airlock/maintenance{ - name = "Chapel Maintenance"; - req_access_txt = "12" + name = "Chapel Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/chapel_office, /turf/open/floor/plating, /area/maintenance/starboard) "bdC" = ( @@ -3129,13 +3135,14 @@ /area/security/processing) "bhj" = ( /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "bhk" = ( @@ -3694,8 +3701,7 @@ /area/maintenance/port/aft) "bsQ" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -3703,6 +3709,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos) "btE" = ( @@ -3813,7 +3820,7 @@ /area/hallway/primary/central) "bvJ" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Surgery Observation" + name = "Morgue" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -3830,6 +3837,7 @@ /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/plasteel/dark, /area/medical/morgue) "bvP" = ( @@ -3970,8 +3978,7 @@ /area/security/courtroom) "byL" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Maintenance"; - req_access_txt = "12;24" + name = "Atmospherics Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -3982,6 +3989,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/port) "bzc" = ( @@ -4223,8 +4231,7 @@ /area/tcommsat/computer) "bGn" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -4245,6 +4252,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "bGy" = ( @@ -4313,13 +4321,12 @@ /turf/open/space/basic, /area/ai_monitored/storage/satellite) "bIo" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "bIv" = ( @@ -4367,15 +4374,14 @@ /turf/open/floor/plasteel, /area/engine/atmos) "bJc" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/vacant_room/commissary) "bJy" = ( @@ -4711,8 +4717,7 @@ /area/engine/atmos) "bQg" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -4723,6 +4728,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "bQv" = ( @@ -4953,7 +4959,7 @@ name = "Privacy Shutter Controls"; pixel_x = -24; pixel_y = 8; - req_one_access_txt = "35;28" + req_access = list("kitchen") }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -5170,8 +5176,7 @@ /area/engine/engineering) "cad" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Launch Room Access"; - req_access_txt = "7" + name = "Toxins Launch Room Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -5185,6 +5190,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel/white, /area/science/research) "cai" = ( @@ -5228,9 +5234,9 @@ dir = 1 }, /obj/machinery/door/airlock/command/glass{ - name = "EVA Storage"; - req_access_txt = "18" + name = "EVA Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "caN" = ( @@ -5243,7 +5249,6 @@ "caS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -5255,6 +5260,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/aft) "cbl" = ( @@ -5350,8 +5356,7 @@ /area/bridge) "ccx" = ( /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -5359,6 +5364,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "ccS" = ( @@ -5382,8 +5388,7 @@ /area/bridge) "cdf" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Lab"; - req_access_txt = "7" + name = "Toxins Lab" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -5401,6 +5406,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel/white, /area/science/mixing) "cdj" = ( @@ -5432,7 +5438,8 @@ name = "port to mix" }, /obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ - pixel_y = 28 + pixel_y = 28; + req_access = list("toxins") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -5616,6 +5623,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/processing) "chE" = ( @@ -5646,8 +5654,7 @@ /area/space/nearstation) "ciy" = ( /obj/machinery/door/airlock/public/glass{ - name = "Courtroom"; - req_access_txt = "42" + name = "Courtroom" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -5664,6 +5671,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/courtroom) "ciD" = ( @@ -5941,21 +5949,21 @@ id = "xenobio_main"; name = "Main containment blast doors"; pixel_x = -32; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/machinery/button/door{ id = "xenobio_r"; name = "Right side containment blast doors"; pixel_x = -32; pixel_y = 10; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/machinery/button/door{ id = "xenobio_l"; name = "Left side containment blast doors"; pixel_x = -32; pixel_y = -10; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/machinery/disposal/bin{ name = "sample disposal unit" @@ -6358,12 +6366,12 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "cyX" = ( @@ -6736,8 +6744,7 @@ /area/crew_quarters/dorms) "cGJ" = ( /obj/machinery/door/airlock{ - name = "Bar Storage"; - req_access_txt = "25" + name = "Bar Storage" }, /obj/structure/cable{ icon_state = "4-8" @@ -6751,6 +6758,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/wood, /area/crew_quarters/bar) "cGM" = ( @@ -6823,8 +6831,7 @@ /area/maintenance/port/fore) "cHW" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -6837,6 +6844,7 @@ id = "Prison Gate"; name = "prison blast door" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "cIi" = ( @@ -6884,8 +6892,7 @@ /area/hallway/secondary/exit/departure_lounge) "cIK" = ( /obj/machinery/door/airlock{ - name = "Crematorium"; - req_access_txt = "27" + name = "Crematorium" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -6905,6 +6912,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plasteel/dark, /area/chapel/office) "cIN" = ( @@ -6914,14 +6922,14 @@ name = "Secure Storage Control"; pixel_x = -8; pixel_y = 24; - req_access_txt = "56" + req_access = list("engineering") }, /obj/machinery/button/door{ id = "enginepashutter"; name = "Particle Accelerator Shutter Control"; pixel_x = 2; pixel_y = 24; - req_access_txt = "56" + req_access = list("engineering") }, /obj/machinery/photocopier/faxmachine{ department = "Chief Engineer"; @@ -6956,8 +6964,7 @@ /area/maintenance/central) "cJK" = ( /obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "47" + name = "Experimentation Lab" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -6975,13 +6982,13 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/experimentation, /turf/open/floor/plasteel/white, /area/science/explab) "cLl" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ - name = "Engineering Desk"; - req_one_access_txt = "32;19" + name = "Engineering Desk" }, /obj/item/deskbell/preset/engi{ pixel_x = -8; @@ -6991,6 +6998,12 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/any/engineering/construction{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/any/engineering/general{ + dir = 1 + }, /turf/open/floor/plating, /area/engine/engineering) "cLs" = ( @@ -7068,8 +7081,7 @@ /area/solar/starboard/fore) "cMt" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_access_txt = "10" + name = "Engineering" }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 @@ -7081,6 +7093,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "cMD" = ( @@ -7119,6 +7132,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/window/southleft{ + dir = 8; + name = "Virology" + }, +/obj/effect/mapping_helpers/windoor/access/all/medical/virology{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "cNq" = ( @@ -7375,9 +7395,7 @@ "cSX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -7387,6 +7405,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plasteel/dark, /area/maintenance/aft) "cTN" = ( @@ -7409,13 +7428,15 @@ idInterior = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 25; - pixel_y = 7 + pixel_y = 7; + req_access = list("ai_master") }, /obj/machinery/doorButtons/access_button{ idDoor = "ai_core_airlock_exterior"; idSelf = "ai_core_airlock_control"; pixel_x = 23; - pixel_y = -7 + pixel_y = -7; + req_access = list("ai_master") }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat_interior) @@ -7446,7 +7467,7 @@ name = "Incinerator Access Console"; pixel_x = -25; pixel_y = -25; - req_one_access_txt = "12" + req_access = list("atmospherics") }, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -7482,8 +7503,7 @@ /area/ai_monitored/turret_protected/ai) "cVJ" = ( /obj/machinery/door/airlock/command/glass{ - name = "Research Director"; - req_access_txt = "30" + name = "Research Director" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -7503,6 +7523,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/rd, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/hor) "cVS" = ( @@ -7553,15 +7574,14 @@ /turf/open/floor/wood, /area/hallway/primary/central) "cWw" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "47;12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "cWB" = ( @@ -7621,8 +7641,7 @@ /area/science/robotics/lab) "cXJ" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Monkey Pen"; - req_access_txt = "39" + name = "Monkey Pen" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/border_only{ @@ -7634,6 +7653,7 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "cXW" = ( @@ -7718,12 +7738,13 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "dbb" = ( @@ -7800,8 +7821,7 @@ /area/maintenance/disposal/incinerator) "dcQ" = ( /obj/machinery/door/airlock/command{ - name = "Captain's Office"; - req_access_txt = "20" + name = "Captain's Office" }, /obj/structure/cable{ icon_state = "1-2" @@ -7819,6 +7839,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain) "dcX" = ( @@ -7840,7 +7861,7 @@ name = "Privacy Shutters Control"; pixel_x = 25; pixel_y = 10; - req_access_txt = "57" + req_access = list("hop") }, /turf/open/floor/carpet, /area/crew_quarters/heads/hop) @@ -7851,11 +7872,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/window/brigdoor/westleft{ - id = "Cell 2"; - name = "Cell 2"; - req_access_txt = "1" - }, /obj/structure/cable{ icon_state = "1-4" }, @@ -7872,6 +7888,11 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/machinery/door/window/brigdoor/security/cell{ + id = "Cell 2"; + name = "Cell 2"; + dir = 8 + }, /turf/open/floor/plasteel, /area/security/brig) "ddE" = ( @@ -7959,8 +7980,7 @@ "dfT" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/southleft{ - name = "Atmospherics Desk"; - req_access_txt = "24" + name = "Atmospherics Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -7971,7 +7991,8 @@ pixel_y = 8 }, /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos, +/turf/open/floor/plating, /area/engine/atmos) "dfZ" = ( /obj/machinery/light{ @@ -7981,8 +8002,7 @@ /area/science/xenobiology) "dgh" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" + name = "Bridge" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -8015,6 +8035,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "dgk" = ( @@ -8108,7 +8129,7 @@ name = "Bridge Blast Door Control"; pixel_x = 28; pixel_y = 8; - req_access_txt = "19" + req_access = list("command") }, /turf/open/floor/carpet, /area/bridge) @@ -8390,8 +8411,7 @@ /area/hallway/primary/central) "dpy" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Foyer"; - req_one_access_txt = "24;10" + name = "Atmospherics Foyer" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -8411,6 +8431,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos) "dpM" = ( @@ -8447,8 +8468,7 @@ dir = 4 }, /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/structure/cable{ icon_state = "4-8" @@ -8457,6 +8477,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "dqp" = ( @@ -8606,8 +8627,7 @@ /area/hallway/primary/central) "dsZ" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay"; - req_one_access_txt = "31;48" + name = "Cargo Bay" }, /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 4 @@ -8616,6 +8636,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/storage) "dtk" = ( @@ -8632,9 +8653,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "5;12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -8644,6 +8663,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) "dtz" = ( @@ -8978,14 +8998,14 @@ name = "Privacy Shutters Control"; pixel_x = 6; pixel_y = -25; - req_access_txt = "57" + req_access = list("hop") }, /obj/machinery/button/door{ id = "hopqueue"; name = "Queue Shutters Control"; pixel_x = -4; pixel_y = -25; - req_access_txt = "57" + req_access = list("hop") }, /obj/machinery/light_switch{ pixel_x = -4; @@ -9062,8 +9082,7 @@ /area/maintenance/aft) "dDZ" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -9077,8 +9096,7 @@ /area/security/warden) "dEt" = ( /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -9092,6 +9110,7 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/execution/transfer) "dEw" = ( @@ -9375,8 +9394,7 @@ "dJN" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "CloningDoor"; - name = "Cloning Lab"; - req_access_txt = "5; 68" + name = "Cloning Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -9403,6 +9421,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cloning, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "dJS" = ( @@ -9421,11 +9440,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/window/brigdoor/westleft{ - id = "Cell 3"; - name = "Cell 3"; - req_access_txt = "1" - }, /obj/structure/cable{ icon_state = "1-4" }, @@ -9442,6 +9456,11 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/machinery/door/window/brigdoor/security/cell{ + id = "Cell 3"; + name = "Cell 3"; + dir = 8 + }, /turf/open/floor/plasteel, /area/security/brig) "dKn" = ( @@ -9456,15 +9475,16 @@ /turf/open/floor/plating, /area/maintenance/disposal) "dKX" = ( -/obj/structure/closet/emcloset, -/obj/machinery/button/door{ - id = "podescape"; - name = "Pod Bay Control"; - pixel_x = 8; - pixel_y = 24 +/obj/machinery/door/poddoor/preopen{ + id = "xenobio_l"; + name = "Left side containment blast door" }, -/turf/open/floor/plating, -/area/maintenance/port/fore) +/obj/machinery/door/window/southleft{ + name = "Containment Pen" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio, +/turf/open/floor/engine, +/area/science/xenobiology) "dKY" = ( /obj/machinery/holopad, /obj/structure/cable/yellow{ @@ -9956,9 +9976,9 @@ dir = 1 }, /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "dVN" = ( @@ -10018,6 +10038,7 @@ /obj/machinery/door/airlock/external{ name = "Construction Zone" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base, /turf/open/floor/plating, /area/construction/mining/aux_base) "dXy" = ( @@ -10182,6 +10203,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/processing) "ebD" = ( @@ -10461,12 +10483,14 @@ /obj/machinery/door/window/westleft{ dir = 1; layer = 3.1; - name = "Cyborg Upload Console Window"; - req_access_txt = "16" + name = "Cyborg Upload Console Window" }, /obj/machinery/computer/upload/borg{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 1 + }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "ehx" = ( @@ -10599,9 +10623,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/maintenance{ - name = "Paramedic Staging Area Maintenance"; - req_access_txt = "69" + name = "Paramedic Staging Area Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plating, /area/medical/paramedic) "ejG" = ( @@ -10837,8 +10861,7 @@ /area/quartermaster/storage) "epk" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Access"; - req_access_txt = "10" + name = "Engineering Access" }, /obj/structure/cable{ icon_state = "1-2" @@ -10846,6 +10869,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating/airless, /area/space/nearstation) "epq" = ( @@ -10868,14 +10892,12 @@ /turf/closed/wall, /area/quartermaster/warehouse) "epV" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/port/aft) "eqh" = ( @@ -11195,13 +11217,13 @@ "exC" = ( /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_exterior"; - name = "Physical Core Access"; - req_one_access_txt = "30;70" + name = "Physical Core Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) "exN" = ( @@ -11371,8 +11393,7 @@ dir = 1 }, /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -11383,6 +11404,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel, /area/clerk) "eBU" = ( @@ -11731,13 +11753,13 @@ /area/maintenance/fore) "eKB" = ( /obj/machinery/door/airlock/security{ - name = "Security Office"; - req_access_txt = "1" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel, /area/security/main) "eKG" = ( @@ -12472,8 +12494,7 @@ /area/engine/engineering) "fat" = ( /obj/machinery/door/airlock/hatch{ - name = "Telecomms Control Room"; - req_one_access_txt = "19; 61" + name = "Telecomms Control Room" }, /obj/structure/cable{ icon_state = "1-2" @@ -12488,6 +12509,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/tcommsat/server) "fau" = ( @@ -12528,8 +12550,7 @@ "fbR" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -12544,6 +12565,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "fbU" = ( @@ -12616,8 +12638,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/hatch{ - name = "MiniSat Monitoring Room"; - req_access_txt = "65" + name = "MiniSat Monitoring Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -12627,6 +12648,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "ffa" = ( @@ -12671,14 +12693,15 @@ id = "Secure Gate"; name = "Cell Shutters"; pixel_x = -7; - pixel_y = 30 + pixel_y = 30; + req_access = list("brig") }, /obj/machinery/button/door{ id = "Prison Gate"; name = "Prison Wing Lockdown"; pixel_x = 7; pixel_y = 30; - req_access_txt = "2" + req_access = list("brig") }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) @@ -12697,6 +12720,7 @@ /turf/open/floor/plasteel, /area/engine/atmos) "ffF" = ( +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/plasteel/stairs/goon/wood_stairs_middle, /area/library) "ffQ" = ( @@ -12880,8 +12904,7 @@ "fiA" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "CloningDoor"; - name = "Cloning Lab"; - req_access_txt = "5; 68" + name = "Cloning Lab" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -12897,6 +12920,7 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/cloning, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "fiB" = ( @@ -12936,14 +12960,14 @@ /turf/open/floor/engine, /area/science/explab) "fkv" = ( -/obj/machinery/door_timer{ - id = "Cell 2"; - name = "Cell 2"; - pixel_x = -32 - }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/machinery/door_timer{ + id = "Cell 3"; + name = "Cell 3"; + pixel_x = -32 + }, /turf/open/floor/plasteel, /area/security/brig) "fkG" = ( @@ -12982,7 +13006,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/turf/open/floor/plasteel/cafeteria, +/turf/open/floor/plating, /area/crew_quarters/kitchen) "flE" = ( /obj/structure/table/wood, @@ -13089,8 +13113,7 @@ /area/engine/atmos) "fqa" = ( /obj/machinery/door/airlock{ - name = "Hydroponics Backroom"; - req_access_txt = "35" + name = "Hydroponics Backroom" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -13101,6 +13124,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "fqS" = ( @@ -13240,19 +13264,8 @@ /turf/open/floor/plating, /area/maintenance/aft) "fsl" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/door_timer{ - id = "Cell 3"; - name = "Cell 3"; - pixel_x = -32 - }, -/obj/effect/turf_decal/trimline/secred/filled/line/lower{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) +/turf/open/floor/circuit/telecomms/mainframe, +/area/tcommsat/server) "fsK" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -13411,7 +13424,7 @@ id = "aux_base_shutters"; name = "Public Shutters Control"; pixel_x = 24; - req_one_access_txt = "32;47;48" + req_access = list("aux_base") }, /turf/open/floor/plasteel, /area/construction/mining/aux_base) @@ -13476,8 +13489,7 @@ dir = 1 }, /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload Access"; - req_access_txt = "16" + name = "AI Upload Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -13486,6 +13498,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "fxG" = ( @@ -13574,10 +13587,12 @@ }, /obj/machinery/door/window/westleft{ dir = 1; - name = "Cargo Desk"; - req_access_txt = "31" + name = "Cargo Desk" }, -/turf/open/floor/plasteel, +/obj/effect/mapping_helpers/windoor/access/all/supply/general{ + dir = 1 + }, +/turf/open/floor/plating, /area/quartermaster/office) "fzE" = ( /obj/effect/turf_decal/stripes, @@ -13882,6 +13897,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/plasteel/stairs/goon/stairs_middle{ dir = 4 }, @@ -13991,6 +14009,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/ramp_corner, /turf/open/floor/wood, /area/library) "fIB" = ( @@ -14061,8 +14080,7 @@ /area/medical/sleeper) "fJT" = ( /obj/machinery/door/airlock/hatch{ - name = "Telecomms Control Room"; - req_one_access_txt = "19; 61" + name = "Telecomms Control Room" }, /obj/structure/cable{ icon_state = "1-2" @@ -14075,6 +14093,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/tcommsat/server) "fJY" = ( @@ -14181,8 +14200,7 @@ /area/crew_quarters/heads/chief) "fLH" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" + name = "Bridge" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -14201,6 +14219,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "fLS" = ( @@ -14449,6 +14468,9 @@ /area/medical/storage) "fRn" = ( /obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/wood, /area/library) "fRq" = ( @@ -14507,7 +14529,7 @@ name = "Secure Storage Control"; pixel_x = 7; pixel_y = 25; - req_access_txt = "11" + req_access = list("engine_equip") }, /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ dir = 1 @@ -14602,9 +14624,9 @@ }, /obj/machinery/door/airlock/security/glass{ name = "Armory"; - req_access_txt = "3"; security_level = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "fTU" = ( @@ -14845,7 +14867,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = -24; - req_access_txt = "10" + req_access = list("engineering") }, /turf/open/floor/engine, /area/engine/engineering) @@ -14900,8 +14922,7 @@ /area/engine/engineering) "gaI" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -14912,6 +14933,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "gbh" = ( @@ -15309,8 +15331,7 @@ /area/science/server) "gko" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -15321,6 +15342,7 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos) "gkJ" = ( @@ -15597,10 +15619,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance"; - req_access_txt = "63" - }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -15629,8 +15647,7 @@ dir = 4 }, /obj/machinery/door/airlock/engineering{ - name = "Port Bow Solar Access"; - req_access_txt = "10" + name = "Port Bow Solar Access" }, /obj/structure/cable{ icon_state = "4-8" @@ -15638,12 +15655,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "gsD" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable{ icon_state = "4-8" }, @@ -15653,6 +15669,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/vacant_room/commissary) "gsG" = ( @@ -15761,8 +15778,7 @@ "guO" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ - name = "Hydroponics Desk"; - req_access_txt = "35" + name = "Hydroponics Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -15772,7 +15788,10 @@ pixel_x = -8; pixel_y = -4 }, -/turf/open/floor/plasteel, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 1 + }, +/turf/open/floor/plating, /area/hydroponics) "guQ" = ( /obj/effect/turf_decal/trimline/blue/filled/line/lower{ @@ -15793,8 +15812,7 @@ /area/crew_quarters/kitchen) "gvb" = ( /obj/machinery/door/airlock/maintenance{ - name = "Bar Maintenance"; - req_access_txt = "25" + name = "Bar Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -15814,6 +15832,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plating, /area/maintenance/port/aft) "gvo" = ( @@ -15853,13 +15872,13 @@ "gvG" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2"; shuttledocked = 1 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/processing) "gvP" = ( @@ -15886,8 +15905,7 @@ /area/engine/atmos) "gxd" = ( /obj/machinery/door/airlock/maintenance{ - name = "Medical Maintenance Access"; - req_access_txt = "5" + name = "Medical Maintenance Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -15896,6 +15914,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/port/aft) "gxe" = ( @@ -16011,8 +16030,7 @@ /area/engine/atmos) "gAg" = ( /obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_access_txt = "27" + name = "Crematorium Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -16023,6 +16041,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plating, /area/maintenance/starboard) "gAh" = ( @@ -16297,8 +16316,10 @@ "gHs" = ( /obj/machinery/door/window/brigdoor/northright{ name = "Filing Room"; - opacity = 1; - req_access_txt = "77" + opacity = 1 + }, +/obj/effect/mapping_helpers/windoor/access/all/medical/psychology{ + dir = 1 }, /turf/open/floor/wood, /area/medical/psych) @@ -16473,13 +16494,13 @@ }, /obj/machinery/door/airlock/highsecurity{ id_tag = "ai_core_airlock_interior"; - name = "AI Core"; - req_access_txt = "65" + name = "AI Core" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "aicoredoor"; name = "AI Chamber entrance shutters" }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) "gMA" = ( @@ -16636,8 +16657,7 @@ /area/hallway/secondary/entry) "gPu" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Storage"; - req_access_txt = "8" + name = "Toxins Storage" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -16645,6 +16665,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins_storage, /turf/open/floor/plasteel, /area/science/mixing) "gPv" = ( @@ -16691,9 +16712,9 @@ /area/crew_quarters/heads/hos) "gQb" = ( /obj/machinery/door/window/southleft{ - name = "Containment Pen"; - req_access_txt = "55" + name = "Containment Pen" }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio, /turf/open/floor/plasteel, /area/science/xenobiology) "gQi" = ( @@ -16823,13 +16844,12 @@ /turf/closed/wall, /area/crew_quarters/bar) "gSN" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "gSQ" = ( @@ -17016,7 +17036,7 @@ id = "robotics2"; name = "Shutters Control Button"; pixel_y = 24; - req_access_txt = "29" + req_access = list("robotics") }, /obj/machinery/light_switch{ pixel_x = -8; @@ -17097,6 +17117,9 @@ /obj/structure/railing{ dir = 1 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/plasteel/stairs/goon/stairs_wide{ dir = 4 }, @@ -17226,11 +17249,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock{ - name = "Kitchen"; - req_access_txt = null; - req_one_access_txt = "28;35" + name = "Kitchen" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "hbi" = ( @@ -17653,11 +17675,14 @@ /area/medical/morgue) "hlb" = ( /obj/machinery/door/window/northleft{ - req_access_txt = "37" + name = "Library Desk Door" }, /obj/machinery/light_switch{ pixel_x = 24 }, +/obj/effect/mapping_helpers/windoor/access/all/service/library{ + dir = 1 + }, /turf/open/floor/carpet, /area/library) "hld" = ( @@ -17812,7 +17837,7 @@ id = "barshutters"; name = "bar shutters" }, -/turf/open/floor/carpet/black, +/turf/open/floor/plating, /area/crew_quarters/bar) "hnM" = ( /obj/machinery/advanced_airlock_controller{ @@ -18188,8 +18213,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ dir = 8; - name = "Robotics Desk"; - req_access_txt = "29" + name = "Robotics Desk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "roboticsprivacy"; @@ -18205,6 +18229,9 @@ pixel_x = 6; pixel_y = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/science/robotics{ + dir = 8 + }, /turf/open/floor/plating, /area/science/robotics/lab) "hwZ" = ( @@ -18309,9 +18336,9 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "12" + name = "Shipbreaking External Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/escapepodbay) "hAf" = ( @@ -18565,14 +18592,14 @@ /area/bridge) "hFi" = ( /obj/machinery/door/airlock/maintenance{ - name = "Disposals Maintenance"; - req_access_txt = "31" + name = "Disposals Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plating, /area/quartermaster/sorting) "hFt" = ( @@ -18656,8 +18683,7 @@ /area/storage/primary) "hGO" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Quartermaster"; - req_access_txt = "41" + name = "Quartermaster" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -18674,6 +18700,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, /turf/open/floor/plasteel, /area/quartermaster/qm) "hHk" = ( @@ -18719,8 +18746,10 @@ dir = 4 }, /obj/machinery/door/window/northleft{ - name = "Secure Board Storage"; - req_access_txt = "53" + name = "Secure Board Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 1 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) @@ -18797,12 +18826,12 @@ /obj/machinery/door/window/northright{ dir = 2; name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "5" + red_alert_access = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 5 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general, /turf/open/floor/plasteel/dark, /area/medical/storage) "hIY" = ( @@ -18884,10 +18913,7 @@ /turf/open/floor/wood, /area/lawoffice) "hLQ" = ( -/obj/machinery/door/morgue{ - name = "Confession Booth (Chaplain)"; - req_access_txt = "22" - }, +/obj/machinery/door/morgue/chaplain, /turf/open/floor/plasteel/dark, /area/chapel/main) "hLW" = ( @@ -18984,8 +19010,7 @@ /area/science/research) "hOL" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Treatment"; - req_access_txt = "5" + name = "Medbay Treatment" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -19006,6 +19031,7 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "hOQ" = ( @@ -19129,7 +19155,7 @@ name = "Disposal Vent Control"; pixel_x = -8; pixel_y = -23; - req_access_txt = "12" + req_access = list("maint_tunnels") }, /obj/structure/window/reinforced/spawner/east, /obj/structure/railing/corner{ @@ -19290,14 +19316,19 @@ /area/crew_quarters/kitchen) "hWs" = ( /obj/machinery/door/window/northleft{ - name = "Checkpoint Desk"; - req_access_txt = "1" + name = "Checkpoint Desk" }, /obj/structure/table/reinforced, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/any/security/detective{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/any/security/general{ + dir = 1 + }, /turf/open/floor/plating, /area/security/checkpoint) "hWu" = ( @@ -19349,8 +19380,7 @@ /area/bridge) "hXl" = ( /obj/machinery/door/airlock{ - name = "Theatre Backstage"; - req_access_txt = "46" + name = "Theatre Backstage" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -19363,6 +19393,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /turf/open/floor/plating, /area/maintenance/port/aft) "hXS" = ( @@ -19717,8 +19748,7 @@ /area/crew_quarters/dorms) "iiD" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" + name = "Bridge" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -19737,6 +19767,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "iiG" = ( @@ -19901,8 +19932,7 @@ /area/ai_monitored/secondarydatacore) "ilL" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Main"; - req_access_txt = "24" + name = "Atmospherics Main" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -19922,6 +19952,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos) "ilP" = ( @@ -20290,8 +20321,7 @@ /area/crew_quarters/kitchen) "ivt" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator and SMES"; - req_one_access_txt = "11;32" + name = "Gravity Generator and SMES" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -20308,6 +20338,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engine_smes) "ivF" = ( @@ -20391,20 +20422,20 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_access_txt = "10" + name = "Engineering" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engineering) "ixO" = ( /obj/machinery/door/airlock/security{ - name = "Courtroom Prisoner Access"; - req_access_txt = "63; 42" + name = "Courtroom Prisoner Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/brig) "ixS" = ( @@ -20721,15 +20752,15 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "63" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plating, /area/maintenance/aft) "iIH" = ( @@ -20745,9 +20776,7 @@ /turf/open/floor/plasteel/stairs/goon/wood_stairs_wide, /area/tcommsat/computer) "iIQ" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;35" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -20757,6 +20786,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "iIS" = ( @@ -20784,8 +20814,7 @@ /area/bridge) "iJU" = ( /obj/machinery/door/airlock{ - name = "Kitchen Cold Room"; - req_access_txt = "28" + name = "Kitchen Cold Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -20794,6 +20823,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) "iKb" = ( @@ -20867,12 +20897,14 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Captain's Desk Door"; - req_access_txt = "20" + name = "Captain's Desk Door" }, /obj/machinery/camera{ c_tag = "Bridge - Captain's Office" }, +/obj/effect/mapping_helpers/windoor/access/all/command/captain{ + dir = 4 + }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "iLy" = ( @@ -20929,14 +20961,14 @@ /area/construction/mining/aux_base) "iMB" = ( /obj/machinery/door/airlock/medical{ - name = "Medbay Backroom"; - req_access_txt = "5" + name = "Medbay Backroom" }, /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/medical/sleeper) "iMD" = ( @@ -21050,12 +21082,12 @@ /area/hallway/secondary/exit/departure_lounge) "iOb" = ( /obj/machinery/door/airlock/hatch{ - name = "TeleSat Space Access Airlock"; - req_one_access_txt = "32;19" + name = "TeleSat Space Access Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plating, /area/tcommsat/computer) "iOe" = ( @@ -21227,8 +21259,7 @@ "iQC" = ( /obj/effect/turf_decal/trimline/brown/filled/line/lower, /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_access_txt = "50" + name = "Cargo Office" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -21236,16 +21267,18 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/sorting) "iQG" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "iQK" = ( @@ -21551,10 +21584,7 @@ /turf/open/floor/plasteel/white, /area/science/mixing) "iXI" = ( -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/airlock/vault{ - req_access_txt = "53" - }, +/obj/machinery/door/airlock/vault, /obj/structure/cable{ icon_state = "4-8" }, @@ -21574,6 +21604,8 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/vault, +/obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/plating, /area/ai_monitored/nuke_storage) "iXL" = ( @@ -21673,9 +21705,11 @@ /turf/open/floor/wood, /area/crew_quarters/theatre) "jbc" = ( -/obj/machinery/blackbox_recorder, -/turf/open/floor/circuit/telecomms/mainframe, -/area/tcommsat/server) +/obj/effect/turf_decal/ramp_corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "jbD" = ( /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 @@ -21859,8 +21893,7 @@ /area/engine/atmos) "jgg" = ( /obj/machinery/door/airlock/command/glass{ - name = "Server Room"; - req_access_txt = "30" + name = "Server Room" }, /obj/machinery/atmospherics/pipe/simple, /obj/machinery/door/firedoor, @@ -21868,6 +21901,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers, /turf/open/floor/plasteel/dark, /area/science/server) "jgE" = ( @@ -21878,10 +21912,10 @@ /area/hallway/primary/central) "jgF" = ( /obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" + name = "Supply Dock Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plasteel, /area/quartermaster/storage) "jgH" = ( @@ -21907,8 +21941,7 @@ /area/tcommsat/computer) "jhB" = ( /obj/machinery/door/airlock/external{ - name = "AISat External Access"; - req_one_access_txt = "32;19" + name = "AISat External Access" }, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/barricade/wooden, @@ -22161,8 +22194,7 @@ /area/hallway/primary/central) "jla" = ( /obj/machinery/door/airlock/command{ - name = "Server Room"; - req_access_txt = "30" + name = "R&D Servers and Networking" }, /obj/structure/cable{ icon_state = "1-2" @@ -22173,6 +22205,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers, /turf/open/floor/plasteel/dark, /area/science/server) "jlg" = ( @@ -22348,9 +22381,9 @@ frequency = 1449; heat_proof = 1; id_tag = "incinerator_airlock_exterior"; - name = "Incinerator Exterior Airlock"; - req_access_txt = "32" + name = "Incinerator Exterior Airlock" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "joC" = ( @@ -22360,9 +22393,6 @@ name = "Mechbay APC"; pixel_x = -25 }, -/obj/structure/cable{ - icon_state = "0-4" - }, /obj/machinery/camera{ c_tag = "Research - Mech Bay"; dir = 4; @@ -22608,7 +22638,8 @@ id = "kanyewest"; name = "Privacy Shutters"; pixel_x = -28; - pixel_y = 5 + pixel_y = 5; + req_access = list("detective") }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) @@ -22656,7 +22687,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/turf/open/floor/plasteel/cafeteria, +/turf/open/floor/plating, /area/crew_quarters/kitchen) "jtZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -22764,8 +22795,7 @@ /area/maintenance/port) "jyg" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/structure/cable{ icon_state = "1-2" @@ -22783,6 +22813,7 @@ id = "Prison Gate"; name = "prison blast door" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "jyj" = ( @@ -23012,6 +23043,9 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/wood, /area/library) "jBL" = ( @@ -23096,8 +23130,9 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/door/window/northleft{ - req_access_txt = "7" +/obj/machinery/door/window/northleft, +/obj/effect/mapping_helpers/windoor/access/all/science/toxins{ + dir = 1 }, /turf/open/floor/plasteel, /area/science/research) @@ -23435,6 +23470,11 @@ dir = 4 }, /obj/machinery/disposal/bin, +/obj/machinery/door_timer{ + id = "Cell 1"; + name = "Cell 1"; + pixel_x = -32 + }, /turf/open/floor/plasteel, /area/security/brig) "jLn" = ( @@ -23710,7 +23750,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = 24; - req_access_txt = "10" + req_access = list("engineering") }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 1 @@ -23737,9 +23777,7 @@ "jRI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "47" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ icon_state = "1-2" @@ -23748,6 +23786,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plating, /area/maintenance/port) "jRO" = ( @@ -23960,8 +23999,7 @@ /area/crew_quarters/kitchen) "jVz" = ( /obj/machinery/door/airlock/command{ - name = "Chief Engineer's Office"; - req_access_txt = "56" + name = "Chief Engineer's Office" }, /obj/structure/cable{ icon_state = "1-2" @@ -23988,24 +24026,35 @@ dir = 4 }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/engineering/ce, /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "jVI" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ - name = "Brig Desk"; - req_access_txt = "1" + name = "Brig Desk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "briggate"; name = "security shutters" }, -/turf/open/floor/plasteel/dark, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, +/turf/open/floor/plating, /area/security/brig) "jVO" = ( /obj/machinery/door/window/eastright{ - name = "Robotics Surgery"; - req_access_txt = "29" + name = "Robotics Surgery" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/robotics{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) @@ -24211,8 +24260,7 @@ /area/tcommsat/server) "kal" = ( /obj/machinery/door/airlock/hatch{ - name = "TeleSat Space Access Airlock"; - req_one_access_txt = "32;19" + name = "TeleSat Space Access Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -24223,6 +24271,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plating, /area/tcommsat/computer) "kaw" = ( @@ -24418,7 +24467,7 @@ /area/ai_monitored/turret_protected/ai) "kfe" = ( /obj/machinery/door/airlock/public/glass{ - name = "Escape Podbay" + name = "Shipbreaking Bay" }, /obj/structure/cable{ icon_state = "1-2" @@ -24429,6 +24478,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plasteel, /area/escapepodbay) "kfk" = ( @@ -24454,9 +24504,10 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/hatch{ - name = "MiniSat Access"; - req_one_access_txt = "32;19" + name = "MiniSat Access" }, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/bridge) "kfu" = ( @@ -24909,8 +24960,7 @@ /area/hallway/primary/central) "knb" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "5" + name = "Medbay Storage" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 @@ -24918,6 +24968,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /turf/open/floor/plasteel/white, /area/medical/surgery) "knh" = ( @@ -25301,13 +25352,11 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator"; - req_access_txt = "11" - }, +/obj/machinery/door/airlock/highsecurity, /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel/dark, /area/engine/gravity_generator) "kyL" = ( @@ -25664,8 +25713,7 @@ /area/medical/chemistry) "kJb" = ( /obj/machinery/door/airlock/public/glass{ - name = "Chapel Office"; - req_access_txt = "22" + name = "Chapel Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -25676,6 +25724,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/grimy, /area/chapel/office) "kJg" = ( @@ -25787,12 +25836,13 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "kNt" = ( @@ -26093,8 +26143,7 @@ /area/security/brig) "kTO" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator and SMES"; - req_one_access_txt = "11;32" + name = "Gravity Generator and SMES" }, /obj/structure/cable{ icon_state = "4-8" @@ -26105,6 +26154,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engine_smes) "kTW" = ( @@ -26211,10 +26261,10 @@ /area/hallway/primary/central) "kWk" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Access"; - req_access_txt = "10" + name = "Engineering Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/space/nearstation) "kWn" = ( @@ -26309,13 +26359,13 @@ /area/security/prison) "kXM" = ( /obj/machinery/door/airlock/public/glass{ - name = "Chapel Office"; - req_access_txt = "22" + name = "Chapel Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/grimy, /area/chapel/office) "kXP" = ( @@ -26469,9 +26519,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "laU" = ( @@ -26581,12 +26632,12 @@ dir = 8 }, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "5" + name = "Medbay Storage" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel, /area/medical/storage) "ldf" = ( @@ -26705,6 +26756,9 @@ dir = 1; network = list("ss13","Medical") }, +/obj/machinery/light_switch{ + pixel_y = -23 + }, /turf/open/floor/plasteel/white, /area/medical/surgery) "lgs" = ( @@ -26716,8 +26770,7 @@ dir = 1 }, /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -26725,6 +26778,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel, /area/clerk) "lgu" = ( @@ -26912,8 +26966,7 @@ "lkV" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ - name = "Chemistry Desk"; - req_access_txt = "33" + name = "Chemistry Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -26925,6 +26978,9 @@ pixel_x = -8; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry{ + dir = 4 + }, /turf/open/floor/plating, /area/medical/chemistry) "lla" = ( @@ -27084,9 +27140,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "lnZ" = ( -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, +/obj/structure/closet/secure_closet/bar, /turf/open/floor/wood, /area/maintenance/port/fore) "loa" = ( @@ -27143,8 +27197,10 @@ /area/crew_quarters/kitchen) "lpx" = ( /obj/machinery/door/window/eastright{ - name = "Test Chamber"; - req_access_txt = "55" + name = "Test Chamber" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 }, /turf/open/floor/plasteel, /area/science/xenobiology) @@ -27157,9 +27213,9 @@ /area/library) "lpE" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating/airless, /area/engine/engineering) "lpJ" = ( @@ -27232,13 +27288,15 @@ base_state = "rightsecure"; dir = 4; icon_state = "rightsecure"; - name = "Head of Personnel's Desk"; - req_access_txt = "57" + name = "Head of Personnel's Desk" }, /obj/machinery/door/window/northleft{ dir = 8; name = "Reception Window" }, +/obj/effect/mapping_helpers/windoor/access/all/service/hop{ + dir = 4 + }, /turf/open/floor/plating, /area/crew_quarters/heads/hop) "lqH" = ( @@ -27345,7 +27403,8 @@ id = "briggate"; name = "Desk Shutters"; pixel_x = -7; - pixel_y = -25 + pixel_y = -25; + req_access = list("security") }, /turf/open/floor/plasteel/dark, /area/security/brig) @@ -27368,7 +27427,8 @@ idDoor = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 23; - pixel_y = -7 + pixel_y = -7; + req_access = list("ai_master") }, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -27707,8 +27767,7 @@ /area/maintenance/port/aft) "lCd" = ( /obj/machinery/door/airlock/virology{ - name = "Break Room"; - req_access_txt = "39" + name = "Break Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -27722,6 +27781,7 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "lCv" = ( @@ -27998,6 +28058,7 @@ /obj/structure/railing{ dir = 8 }, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/plasteel/stairs/goon/wood_stairs_wide, /area/library) "lJg" = ( @@ -28193,8 +28254,7 @@ /area/space/nearstation) "lNO" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -28208,6 +28268,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "lNP" = ( @@ -28335,8 +28396,7 @@ /area/maintenance/disposal/incinerator) "lRp" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -28347,6 +28407,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "lRu" = ( @@ -28396,8 +28457,7 @@ /area/maintenance/port/fore) "lSn" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Treatment"; - req_access_txt = "5" + name = "Medbay Treatment" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -28411,6 +28471,7 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "lSz" = ( @@ -28446,14 +28507,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_access_txt = "10" + name = "Engineering" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "lTh" = ( @@ -28470,8 +28531,7 @@ /area/maintenance/starboard) "lTl" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay"; - req_one_access_txt = "31;48" + name = "Cargo Bay" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -28485,6 +28545,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/storage) "lTs" = ( @@ -28526,11 +28587,11 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload"; - req_access_txt = "16" + name = "AI Upload" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai_upload) "lTP" = ( @@ -28841,6 +28902,7 @@ /obj/machinery/light_switch{ pixel_x = 24 }, +/obj/machinery/blackbox_recorder, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "maz" = ( @@ -28975,8 +29037,7 @@ /area/maintenance/fore) "mfh" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Desk"; - req_one_access_txt = "10;32" + name = "Engineering Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -28990,6 +29051,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "mfk" = ( @@ -29055,8 +29118,7 @@ "mha" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/effect/mapping_helpers/airlock/unres{ dir = 8 @@ -29074,6 +29136,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "mhp" = ( @@ -29124,7 +29187,7 @@ /area/science/research) "miG" = ( /obj/machinery/shower{ - pixel_y = 28 + pixel_y = 20 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -29179,8 +29242,7 @@ /area/maintenance/port) "mjO" = ( /obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "63" + name = "Security External Airlock" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -29188,6 +29250,8 @@ dirx = 2; diry = -1 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plating, /area/security/main) "mki" = ( @@ -29230,29 +29294,18 @@ /turf/open/floor/plasteel, /area/quartermaster/miningdock) "mkT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/machinery/door/window/northleft{ + name = "Containment Pen" }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/machinery/door/poddoor/preopen{ + id = "xenobio_r"; + name = "Right side containment blast door" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 1 }, -/turf/open/floor/plating, -/area/maintenance/aft) +/turf/open/floor/engine, +/area/science/xenobiology) "mkY" = ( /obj/machinery/disposal/bin/tagger, /obj/machinery/newscaster/security_unit{ @@ -29271,14 +29324,16 @@ /turf/open/floor/wood, /area/library) "mlJ" = ( -/obj/machinery/door/window/northleft{ - name = "Containment Pen"; - req_access_txt = "55" - }, /obj/machinery/door/poddoor/preopen{ id = "xenobio_r"; name = "Right side containment blast door" }, +/obj/machinery/door/window/northleft{ + name = "Containment Pen" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 1 + }, /turf/open/floor/engine, /area/science/xenobiology) "mlL" = ( @@ -29305,14 +29360,14 @@ name = "Biohazard Shutter Control"; pixel_x = -5; pixel_y = 5; - req_access_txt = "47" + req_access = list("science") }, /obj/machinery/button/door{ id = "rnd2"; name = "Research Lab Shutter Control"; pixel_x = 5; pixel_y = 5; - req_access_txt = "47" + req_access = list("science") }, /obj/item/toy/figure/rd, /turf/open/floor/carpet/purple, @@ -29333,8 +29388,7 @@ /area/clerk) "mmQ" = ( /obj/machinery/door/airlock/security{ - name = "Brig"; - req_access_txt = "63; 42" + name = "Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -29342,6 +29396,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/courtroom) "mnd" = ( @@ -29362,8 +29417,7 @@ /area/hallway/primary/central) "mnx" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" + name = "Bridge" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -29396,6 +29450,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "mny" = ( @@ -29621,9 +29676,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/command/glass{ - name = "EVA Storage"; - req_access_txt = "18" + name = "EVA Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "mqJ" = ( @@ -30323,8 +30378,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ dir = 8; - name = "Research Desk"; - req_access_txt = "47" + name = "Research Desk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "researchprivate"; @@ -30343,6 +30397,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/science/general{ + dir = 8 + }, /turf/open/floor/plating, /area/science/lab) "mFd" = ( @@ -30433,8 +30490,7 @@ /area/security/prison) "mHn" = ( /obj/machinery/door/airlock/research{ - name = "Genetics Research Access"; - req_access_txt = "47" + name = "Genetics Research Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -30451,6 +30507,7 @@ name = "biohazard containment door" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/science/research) "mHy" = ( @@ -31076,12 +31133,13 @@ }, /obj/machinery/door/airlock/security{ name = "Security Office"; - req_one_access_txt = "1;4"; security_level = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/main) "mVo" = ( @@ -31126,8 +31184,7 @@ /area/ai_monitored/storage/eva) "mVH" = ( /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -31141,6 +31198,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "mVN" = ( @@ -31188,14 +31247,14 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/research/glass{ name = "Computer Science"; - normalspeed = 0; - req_access_txt = "67" + normalspeed = 0 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) "mWZ" = ( @@ -31267,7 +31326,7 @@ name = "Virology Access Button"; pixel_x = -28; pixel_y = 8; - req_access_txt = "39" + req_access = list("virology") }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -31387,8 +31446,7 @@ /area/clerk) "naC" = ( /obj/machinery/door/airlock{ - name = "Custodial Closet"; - req_access_txt = "26" + name = "Custodial Closet" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -31403,6 +31461,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/plasteel, /area/janitor) "naG" = ( @@ -31668,10 +31727,10 @@ dir = 1 }, /obj/machinery/door/airlock/maintenance/external{ - name = "toxins launcher intersection"; - req_access_txt = "12" + name = "toxins launcher intersection" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "nhk" = ( @@ -31741,8 +31800,7 @@ /area/construction/mining/aux_base) "niG" = ( /obj/machinery/door/airlock/maintenance{ - name = "Disposal Access"; - req_access_txt = "12" + name = "Disposal Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -31752,6 +31810,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard) "niP" = ( @@ -31770,8 +31829,7 @@ /area/security/checkpoint/science) "njm" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Maintenance"; - req_access_txt = "12;24" + name = "Atmospherics Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -31782,6 +31840,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/aft) "njB" = ( @@ -31928,7 +31987,7 @@ name = "Cell 2 Lockdown"; pixel_x = 25; pixel_y = -4; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "PCell 2"; @@ -31942,8 +32001,7 @@ /area/security/prison) "nlF" = ( /obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "63" + name = "Security External Airlock" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 @@ -31952,6 +32010,8 @@ dirx = -2; diry = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plating, /area/security/main) "nlJ" = ( @@ -32073,13 +32133,13 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos, /turf/open/floor/plating, /area/maintenance/aft) "nnZ" = ( @@ -32218,9 +32278,6 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "nrZ" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ icon_state = "1-2" @@ -32439,7 +32496,7 @@ name = "Virology Access Console"; pixel_x = 22; pixel_y = 8; - req_access_txt = "39" + req_access = list("virology") }, /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 6 @@ -32586,12 +32643,14 @@ }, /obj/machinery/door/window/northright{ name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "5" + red_alert_access = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 6 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/medical/storage) "nCa" = ( @@ -32833,23 +32892,16 @@ /area/quartermaster/office) "nGX" = ( /obj/machinery/door/window/southleft{ - name = "Containment Pen"; - req_access_txt = "55" + name = "Containment Pen" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio_l"; name = "Left side containment blast door" }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio, /turf/open/floor/engine, /area/science/xenobiology) "nHe" = ( -/obj/machinery/button/door{ - id = "cargowarehouse"; - name = "warehouse shutter controls"; - pixel_x = 8; - pixel_y = -24; - req_access_txt = "50" - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/cable{ @@ -32904,9 +32956,8 @@ /turf/open/floor/plasteel/dark, /area/bridge) "nIc" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "nIe" = ( @@ -32958,12 +33009,12 @@ /obj/machinery/door/window/northleft{ dir = 2; name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "5" + red_alert_access = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general, /turf/open/floor/plasteel/dark, /area/medical/storage) "nIK" = ( @@ -33636,10 +33687,10 @@ "nVy" = ( /obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "nWn" = ( @@ -33729,12 +33780,12 @@ /area/maintenance/port) "nXK" = ( /obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" + name = "Supply Dock Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plasteel, /area/quartermaster/storage) "nXP" = ( @@ -33990,16 +34041,17 @@ /area/security/courtroom) "ocx" = ( /obj/machinery/door/window/northleft{ - name = "Containment Pen"; - req_access_txt = "55" + name = "Containment Pen" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 1 }, /turf/open/floor/plasteel, /area/science/xenobiology) "ocI" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "47" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plating, /area/science/research) "ocK" = ( @@ -34252,8 +34304,7 @@ /area/crew_quarters/heads/captain) "ojp" = ( /obj/machinery/door/airlock/engineering{ - name = "Auxillary Base Construction"; - req_one_access_txt = "32;47;48" + name = "Auxillary Base Construction" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -34264,6 +34315,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base, /turf/open/floor/plasteel, /area/construction/mining/aux_base) "ojI" = ( @@ -34407,7 +34459,7 @@ name = "Medbay Doors Control"; normaldoorcontrol = 1; pixel_x = -4; - req_access_txt = "5" + req_access = list("medical") }, /obj/item/deskbell/preset/med{ pixel_x = 7; @@ -34498,12 +34550,12 @@ "ooO" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2"; shuttledocked = 1 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/processing) "ooP" = ( @@ -34546,8 +34598,10 @@ layer = 2.9 }, /obj/machinery/door/window/eastleft{ - name = "Bar Access"; - req_access_txt = "25" + name = "Bar Access" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/bar{ + dir = 4 }, /turf/open/floor/plasteel, /area/crew_quarters/bar) @@ -34565,8 +34619,7 @@ dir = 8 }, /obj/machinery/door/airlock/security/glass{ - name = "Evidence Storage"; - req_access_txt = "63" + name = "Evidence Storage" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ @@ -34578,6 +34631,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/main) "oqt" = ( @@ -34640,8 +34695,10 @@ /area/hallway/primary/central) "orH" = ( /obj/machinery/door/window/eastleft{ - name = "Bar Access"; - req_access_txt = "25" + name = "Bar Access" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/bar{ + dir = 4 }, /turf/open/floor/carpet/black, /area/crew_quarters/bar) @@ -34736,10 +34793,8 @@ /area/bridge) "otS" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = null; - req_access_txt = "4;12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/security/detective, /turf/open/floor/plating, /area/security/detectives_office) "otU" = ( @@ -34933,6 +34988,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "oyE" = ( @@ -35363,14 +35421,14 @@ /turf/open/floor/plating, /area/maintenance/disposal) "oKR" = ( -/obj/structure/sign/departments/medbay/alt{ - pixel_y = -32 - }, /obj/effect/turf_decal/bot, /obj/machinery/door/poddoor/preopen{ id = "Biohazard"; name = "biohazard containment door" }, +/obj/structure/sign/departments/minsky/research/genetics{ + pixel_y = -32 + }, /turf/open/floor/plasteel, /area/science/research) "oKU" = ( @@ -35379,9 +35437,10 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/hatch{ - name = "MiniSat Access"; - req_one_access_txt = "32;19" + name = "MiniSat Access" }, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/bridge) "oLn" = ( @@ -35486,12 +35545,10 @@ /obj/machinery/barsign{ pixel_y = 32 }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "barshutters"; - name = "bar shutters" +/obj/machinery/smartfridge/drinks{ + icon_state = "boozeomat" }, -/obj/machinery/smartfridge/drinks, -/turf/open/floor/carpet/black, +/turf/closed/wall, /area/crew_quarters/bar) "oNz" = ( /obj/structure/lattice/catwalk, @@ -35531,8 +35588,7 @@ /area/security/brig) "oOn" = ( /obj/machinery/door/airlock/security{ - name = "Security Checkpoint"; - req_access_txt = "1" + name = "Security Checkpoint" }, /obj/structure/cable{ icon_state = "1-2" @@ -35543,6 +35599,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/checkpoint) "oOW" = ( @@ -35716,7 +35774,8 @@ layer = 4; name = "Loading Doors"; pixel_x = 7; - pixel_y = 24 + pixel_y = 24; + req_access = list("cargo_bay") }, /obj/machinery/light{ dir = 1 @@ -35726,7 +35785,8 @@ layer = 4; name = "Loading Doors"; pixel_x = -7; - pixel_y = 24 + pixel_y = 24; + req_access = list("cargo_bay") }, /obj/machinery/camera{ c_tag = "Cargo - Docking Bay North" @@ -35740,7 +35800,8 @@ }, /obj/machinery/button/door{ id = "xenocontainment"; - name = "Xenobiology Containment Control" + name = "Xenobiology Containment Control"; + req_access = list("xenobiology") }, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -35823,18 +35884,22 @@ "oVa" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/eastright{ - name = "Armory Desk"; - req_access_txt = "3" + name = "Armory Desk" }, /obj/machinery/door/window/westright{ - name = "Armory Desk"; - req_access_txt = "63" + name = "Armory Desk" }, /obj/item/deskbell/preset/armory{ pixel_x = -4; pixel_y = 5 }, -/turf/open/floor/plasteel/showroomfloor, +/obj/effect/mapping_helpers/windoor/access/all/security/basic{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/all/security/armory{ + dir = 4 + }, +/turf/open/floor/plating, /area/security/warden) "oVc" = ( /obj/machinery/power/apc{ @@ -36012,8 +36077,7 @@ dir = 1 }, /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_one_access_txt = "10;32" + name = "Engineering" }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 4 @@ -36027,6 +36091,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "oZb" = ( @@ -36215,8 +36281,7 @@ /area/maintenance/port/fore) "peD" = ( /obj/machinery/door/airlock/maintenance{ - name = "Medical Maintenance Access"; - req_access_txt = "5" + name = "Medical Maintenance Access" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -36229,6 +36294,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/port/aft) "peP" = ( @@ -36349,7 +36415,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/turf/open/floor/plasteel/cafeteria, +/turf/open/floor/plating, /area/crew_quarters/kitchen) "pjm" = ( /obj/structure/closet/secure_closet/atmospherics, @@ -36375,7 +36441,10 @@ dir = 4; layer = 2.9 }, -/obj/machinery/door/window/brigdoor, +/obj/machinery/door/window/eastleft{ + name = "Mail"; + dir = 2 + }, /turf/open/floor/plasteel, /area/quartermaster/sorting) "pjU" = ( @@ -36593,9 +36662,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/command/glass{ - name = "EVA Storage"; - req_access_txt = "18" + name = "EVA Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "ppd" = ( @@ -36697,8 +36766,7 @@ dir = 4 }, /obj/machinery/door/airlock/security{ - name = "Secure Evidence Storage"; - req_access_txt = "3" + name = "Secure Evidence Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -36706,6 +36774,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel/dark, /area/security/main) "pqS" = ( @@ -36824,8 +36893,7 @@ /area/maintenance/fore) "psr" = ( /obj/machinery/door/airlock/research/glass{ - name = "Robotics Lab"; - req_access_txt = "29" + name = "Robotics Lab" }, /obj/structure/cable{ icon_state = "1-2" @@ -36836,6 +36904,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/science/robotics/mechbay) "psu" = ( @@ -36949,8 +37018,7 @@ /area/security/brig) "puy" = ( /obj/machinery/door/airlock/maintenance{ - name = "Custodial Maintenance"; - req_access_txt = "26" + name = "Custodial Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -36958,6 +37026,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/plating, /area/maintenance/aft) "puF" = ( @@ -37029,8 +37098,7 @@ /area/quartermaster/office) "pwz" = ( /obj/machinery/door/airlock/maintenance{ - name = "Kitchen Maintenance"; - req_access_txt = "28" + name = "Kitchen Maintenance" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable{ @@ -37042,6 +37110,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plating, /area/maintenance/port/aft) "pwB" = ( @@ -37095,8 +37164,7 @@ /area/engine/engineering) "pxn" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Isolation A"; - req_access_txt = "39" + name = "Isolation A" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor/border_only{ @@ -37108,6 +37176,7 @@ }, /obj/effect/turf_decal/trimline/green/filled/corner/lower, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "pxq" = ( @@ -37292,8 +37361,7 @@ dir = 4 }, /obj/machinery/door/airlock/wood{ - name = "Psychiatrists office"; - req_access_txt = "5" + name = "Psychiatrists office" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -37356,7 +37424,7 @@ pixel_x = -8; pixel_y = 5 }, -/turf/open/floor/plasteel/cafeteria, +/turf/open/floor/plating, /area/crew_quarters/kitchen) "pDE" = ( /obj/machinery/air_sensor/atmos/toxin_tank, @@ -37610,7 +37678,8 @@ id = "disposalshutters"; name = "disposals shutter control"; pixel_x = -5; - pixel_y = -25 + pixel_y = -25; + req_access = list("cargo") }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -37664,8 +37733,7 @@ /area/hydroponics/garden) "pJU" = ( /obj/machinery/door/airlock{ - name = "Theatre Backstage"; - req_access_txt = "46" + name = "Theatre Backstage" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -37673,6 +37741,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /turf/open/floor/wood, /area/crew_quarters/theatre) "pKm" = ( @@ -37775,8 +37844,7 @@ /area/bridge) "pLS" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Monkey Pen"; - req_access_txt = "39" + name = "Monkey Pen" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -37791,6 +37859,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/green/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "pLU" = ( @@ -38128,7 +38197,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/quartermaster/storage) "pTD" = ( /obj/machinery/modular_computer/console/preset/curator{ @@ -38182,8 +38251,7 @@ /area/maintenance/port) "pVA" = ( /obj/machinery/door/airlock/maintenance{ - name = "Toxins Maintenance Access"; - req_one_access_txt = "7" + name = "Toxins Maintenance Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -38203,6 +38271,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plating, /area/maintenance/port/fore) "pVC" = ( @@ -38288,10 +38357,12 @@ /obj/machinery/light, /obj/machinery/door/window/northleft{ name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "5" + red_alert_access = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/medical/storage) "pXq" = ( @@ -38323,8 +38394,7 @@ /area/quartermaster/warehouse) "pXG" = ( /obj/machinery/door/airlock/engineering{ - name = "Starboard Aux Solar Access"; - req_access_txt = "10" + name = "Starboard Aux Solar Access" }, /obj/structure/cable{ icon_state = "1-2" @@ -38335,6 +38405,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "pYq" = ( @@ -38383,16 +38454,13 @@ /turf/open/floor/plasteel, /area/engine/atmos) "pZj" = ( -/obj/machinery/door/morgue{ - name = "Private Study"; - req_access_txt = "37" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/door/morgue/curator, /turf/open/floor/engine/cult, /area/library) "pZt" = ( @@ -38434,7 +38502,8 @@ dir = 1 }, /obj/machinery/airlock_sensor/incinerator_toxmix{ - pixel_x = 28 + pixel_x = 28; + req_access = list("toxins") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -38515,9 +38584,9 @@ }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/airlock/external{ - name = "AISat External Access"; - req_one_access_txt = "32;19" + name = "External Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/aft) "qck" = ( @@ -38818,8 +38887,7 @@ /area/medical/virology) "qhW" = ( /obj/machinery/door/airlock/public/glass{ - name = "Auxiliary Tool Storage"; - req_access_txt = "12" + name = "Auxiliary Tool Storage" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -38830,6 +38898,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plasteel, /area/storage/primary) "qij" = ( @@ -38850,8 +38919,7 @@ /area/engine/atmos) "qiN" = ( /obj/machinery/door/airlock/security/glass{ - name = "Brig Control"; - req_access_txt = "3" + name = "Brig Control" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -38862,6 +38930,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "qiR" = ( @@ -39292,8 +39361,7 @@ /area/science/research) "qqD" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Quartermaster"; - req_access_txt = "41" + name = "Quartermaster" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -39305,6 +39373,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, /turf/open/floor/plasteel, /area/quartermaster/qm) "qqK" = ( @@ -39343,8 +39412,7 @@ /area/maintenance/aft) "qrg" = ( /obj/machinery/door/airlock/external{ - name = "AISat External Access"; - req_one_access_txt = "32;19" + name = "AISat External Access" }, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/barricade/wooden, @@ -39444,8 +39512,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, @@ -39536,9 +39603,9 @@ dir = 4 }, /obj/machinery/door/airlock/medical{ - name = "Paramedic Staging Area"; - req_access_txt = "69" + name = "Paramedic Staging Area" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plasteel, /area/medical/paramedic) "quW" = ( @@ -39575,8 +39642,7 @@ /area/security/checkpoint/supply) "qvj" = ( /obj/machinery/door/airlock/security/glass{ - name = "Brig Control"; - req_access_txt = "3" + name = "Brig Control" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -39585,6 +39651,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "qvv" = ( @@ -39658,8 +39725,7 @@ /area/quartermaster/qm) "qwU" = ( /obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Maintenance"; - req_access_txt = "24" + name = "Atmospherics Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -39674,6 +39740,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/aft) "qxi" = ( @@ -39798,8 +39865,7 @@ dir = 8 }, /obj/machinery/door/airlock/hatch{ - name = "MiniSat Antechamber"; - req_access_txt = "65" + name = "MiniSat Antechamber" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -39811,6 +39877,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "qAe" = ( @@ -39837,8 +39904,7 @@ base_state = "right"; dir = 0; icon_state = "right"; - name = "Core Modules"; - req_access_txt = "20" + name = "Core Modules" }, /obj/structure/window/reinforced{ dir = 4 @@ -39850,6 +39916,7 @@ /obj/effect/spawner/lootdrop/aimodule_neutral, /obj/effect/spawner/lootdrop/aimodule_harmless, /obj/item/aiModule/core/freeformcore, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "qBl" = ( @@ -39921,7 +39988,7 @@ name = "AI Chamber entrance shutters control"; pixel_x = -23; pixel_y = 21; - req_access_txt = "16" + req_access = list("ai_master") }, /obj/structure/ethernet_cable{ icon_state = "0-4" @@ -40116,13 +40183,11 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "qHq" = ( -/obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/effect/turf_decal/tile/green/opposingcorners{ - dir = 1 +/obj/effect/turf_decal/ramp_middle{ + dir = 8 }, -/obj/effect/spawner/structure/window, /turf/open/floor/plasteel, -/area/clerk) +/area/crew_quarters/fitness) "qHw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -40200,7 +40265,7 @@ name = "Cell 1 Lockdown"; pixel_x = 25; pixel_y = -4; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "PCell 1"; @@ -40269,9 +40334,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, +/obj/machinery/door/airlock/maintenance{ + name = "Gift Shop Maintenance" }, /turf/open/floor/plating, /area/maintenance/central) @@ -40354,8 +40419,7 @@ /area/engine/atmos) "qNk" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -40372,6 +40436,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/white, /area/security/checkpoint/medical) "qNp" = ( @@ -40721,13 +40786,13 @@ /area/engine/engineering) "qWy" = ( /obj/machinery/door/airlock/maintenance{ - name = "Chemistry Lab Maintenance"; - req_access_txt = "5; 33" + name = "Chemistry Lab Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, /turf/open/floor/plating, /area/maintenance/port/aft) "qWF" = ( @@ -40773,8 +40838,7 @@ /area/crew_quarters/kitchen) "qXg" = ( /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -40785,6 +40849,8 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "qXB" = ( @@ -41654,8 +41720,7 @@ /area/ai_monitored/secondarydatacore) "rqS" = ( /obj/machinery/door/airlock/research/glass{ - name = "Genetics Research"; - req_access_txt = "5; 9; 68" + name = "Genetics Research" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -41667,6 +41732,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "rrd" = ( @@ -41733,9 +41799,7 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "rrS" = ( -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, +/obj/structure/closet/secure_closet/bar, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -41768,15 +41832,14 @@ /turf/open/floor/plasteel/dark, /area/engine/atmos) "rsn" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "5" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/medical/sleeper) "rsE" = ( @@ -41785,7 +41848,7 @@ id = "barshutters"; name = "bar shutters" }, -/turf/open/floor/carpet/black, +/turf/open/floor/plating, /area/crew_quarters/bar) "rsK" = ( /turf/closed/wall/r_wall, @@ -42085,18 +42148,19 @@ dir = 8 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "12" + name = "Shipbreaking External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/escapepodbay) "rAR" = ( /obj/structure/railing{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/plasteel/stairs/goon/wood_stairs_wide2, /area/library) "rAT" = ( @@ -42217,9 +42281,9 @@ /area/medical/genetics) "rDI" = ( /obj/machinery/door/window/southleft{ - name = "Court Cell"; - req_access_txt = "2" + name = "Court Cell" }, +/obj/effect/mapping_helpers/windoor/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/courtroom) "rDM" = ( @@ -42329,13 +42393,15 @@ "rGq" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/northleft{ - name = "Armory Desk"; - req_access_txt = "2" + name = "Armory Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/security/armory{ + dir = 1 + }, /turf/open/floor/plating, /area/ai_monitored/security/armory) "rGD" = ( @@ -42396,14 +42462,16 @@ "rIh" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/northright{ - name = "Hydroponics Desk"; - req_access_txt = "35" + name = "Hydroponics Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 1 + }, +/turf/open/floor/plating, /area/hydroponics) "rIj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -42547,9 +42615,7 @@ /turf/open/floor/plating, /area/maintenance/aft) "rLj" = ( -/obj/machinery/door/airlock/mining{ - req_access_txt = "48" - }, +/obj/machinery/door/airlock/mining, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -42566,6 +42632,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "rLy" = ( @@ -42678,8 +42745,7 @@ /area/hallway/primary/central) "rOf" = ( /obj/machinery/door/airlock/medical{ - name = "Patient Room B"; - req_access_txt = "45" + name = "Patient Room B" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -42703,6 +42769,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /turf/open/floor/plasteel/white, /area/medical/surgery) "rOl" = ( @@ -42879,8 +42946,10 @@ /area/security/processing) "rRZ" = ( /obj/machinery/door/window/westleft{ - name = "Monkey Pen"; - req_access_txt = "9" + name = "Monkey Pen" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/genetics{ + dir = 8 }, /turf/open/floor/grass, /area/medical/genetics) @@ -42982,7 +43051,7 @@ id = "telelab"; name = "Test Chamber Blast Doors"; pixel_x = 25; - req_access_txt = "47" + req_access = list("experimentation") }, /turf/open/floor/plasteel/white, /area/science/explab) @@ -43020,8 +43089,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/hatch{ - name = "MiniSat Teleporter Room"; - req_one_access_txt = "17;65" + name = "MiniSat Teleporter Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -43031,6 +43099,8 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "rXd" = ( @@ -43367,8 +43437,7 @@ dir = 1 }, /obj/machinery/door/airlock/maintenance{ - name = "Incinerator Access"; - req_one_access_txt = "24;10" + name = "Incinerator Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -43379,6 +43448,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) "shv" = ( @@ -43545,8 +43615,7 @@ /area/bridge) "slu" = ( /obj/machinery/door/airlock/maintenance/external{ - name = "toxins launcher intersection"; - req_access_txt = "12" + name = "toxins launcher intersection" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -43555,6 +43624,7 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "slw" = ( @@ -43600,8 +43670,7 @@ /area/hallway/primary/central) "smr" = ( /obj/machinery/door/airlock/engineering{ - name = "Tech Storage"; - req_access_txt = "23" + name = "Tech Storage" }, /obj/structure/cable{ icon_state = "1-2" @@ -43617,6 +43686,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /turf/open/floor/plating, /area/storage/tech) "smy" = ( @@ -43702,7 +43772,8 @@ id = "chemistryshutter"; name = "Chemistry Privacy Toggle"; pixel_x = -26; - pixel_y = 31 + pixel_y = 24; + req_access = list("chemistry") }, /obj/effect/landmark/start/chemist, /turf/open/floor/plasteel/white, @@ -43947,9 +44018,7 @@ /turf/open/floor/plasteel, /area/science/xenobiology) "svp" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable{ icon_state = "1-2" }, @@ -43958,18 +44027,18 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/fore) "svz" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "47" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plating, /area/maintenance/port/fore) "swf" = ( @@ -44005,6 +44074,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/wood, /area/library) "swM" = ( @@ -44034,8 +44106,7 @@ dir = 4 }, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "5" + name = "Medbay Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -44044,6 +44115,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel, /area/medical/storage) "sxt" = ( @@ -44628,9 +44700,9 @@ /area/hallway/secondary/entry) "sIl" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Access"; - req_access_txt = "10" + name = "Engineering Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/space/nearstation) "sIq" = ( @@ -44664,8 +44736,7 @@ /area/engine/engineering) "sIT" = ( /obj/machinery/door/airlock/command{ - name = "Head of Personnel"; - req_access_txt = "57" + name = "Head of Personnel" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -44681,6 +44752,7 @@ }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/hop, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hop) "sIW" = ( @@ -44798,12 +44870,12 @@ }, /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Security Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel/dark, /area/security/brig) "sKt" = ( @@ -44942,8 +45014,7 @@ /area/science/xenobiology) "sON" = ( /obj/machinery/door/airlock/security{ - name = "Detective's Office"; - req_access_txt = "4" + name = "Detective's Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -44960,6 +45031,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/detective, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "sOU" = ( @@ -44993,7 +45065,7 @@ name = "Bar Shutters Control"; pixel_x = -4; pixel_y = 33; - req_access_txt = "25" + req_access = list("bar") }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -45147,8 +45219,7 @@ /area/hallway/secondary/entry) "sRP" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mining Dock"; - req_access_txt = "48" + name = "Mining Dock" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -45160,19 +45231,20 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "sSc" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/command{ - name = "Head of Personnel's Private Quarters"; - req_access_txt = "57" + name = "Head of Personnel's Private Quarters" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/hop, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "sSe" = ( @@ -45691,12 +45763,12 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/hatch{ - name = "Telecomms"; - req_one_access_txt = "19; 61" + name = "Telecomms" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "teO" = ( @@ -45899,8 +45971,7 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_interior"; - name = "Virology Interior Airlock"; - req_access_txt = "39" + name = "Virology Interior Airlock" }, /obj/structure/cable{ icon_state = "4-8" @@ -45925,6 +45996,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "tiJ" = ( @@ -46058,13 +46130,15 @@ /area/engine/atmos) "tkH" = ( /obj/machinery/door/window/westleft{ - name = "Test Chamber"; - req_access_txt = "55" + name = "Test Chamber" }, /obj/machinery/door/poddoor/preopen{ id = "xenocontainment"; name = "containment chamber blastdoor" }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/engine, /area/science/xenobiology) "tlj" = ( @@ -46441,12 +46515,12 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload Access"; - req_access_txt = "16" + name = "AI Upload Access" }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "tsu" = ( @@ -46480,12 +46554,12 @@ dir = 1 }, /obj/machinery/door/airlock/medical{ - name = "Medbay Reception"; - req_access_txt = "5" + name = "Medbay Reception" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "ttt" = ( @@ -46532,8 +46606,7 @@ "tub" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastright{ - name = "Brig Desk"; - req_access_txt = "2" + name = "Brig Desk" }, /obj/item/deskbell/preset/sec{ pixel_x = -5; @@ -46543,7 +46616,16 @@ id = "briggate"; name = "security shutters" }, -/turf/open/floor/plasteel/dark, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, +/turf/open/floor/plating, /area/security/brig) "tum" = ( /obj/effect/turf_decal/stripes/line, @@ -46676,9 +46758,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -46689,6 +46769,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plasteel, /area/maintenance/port/aft) "twP" = ( @@ -46731,7 +46812,8 @@ id = "roboticsprivacy"; name = "Desk Privacy Shutters Control"; pixel_x = 4; - pixel_y = 24 + pixel_y = 24; + req_access = list("robotics") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 5 @@ -46875,8 +46957,7 @@ /area/quartermaster/warehouse) "tAE" = ( /obj/machinery/door/airlock/security/glass{ - name = "Equipment Room"; - req_access_txt = "1" + name = "Equipment Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -46890,6 +46971,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel/showroomfloor, /area/security/main) "tAF" = ( @@ -47074,23 +47156,6 @@ /turf/open/floor/plasteel, /area/hydroponics) "tGn" = ( -/obj/machinery/button/holosign{ - id = "surgery_b"; - pixel_x = -36; - pixel_y = -10 - }, -/obj/machinery/light_switch{ - pixel_x = -26; - pixel_y = -9 - }, -/obj/machinery/button/door{ - id = "surgery_shutters"; - name = "Surgery shutters"; - pixel_x = -36; - pixel_y = -1; - req_access_txt = "45"; - req_one_access_txt = null - }, /obj/structure/table, /obj/item/clothing/gloves/color/latex, /obj/item/clothing/suit/apron/surgical, @@ -47098,6 +47163,18 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/machinery/button/door{ + id = "surgery_shutters"; + name = "Surgery shutters"; + pixel_x = -24; + pixel_y = 6; + req_access = list("surgery") + }, +/obj/machinery/button/holosign{ + id = "surgery_b"; + pixel_x = -24; + pixel_y = -6 + }, /turf/open/floor/plasteel/white, /area/medical/surgery) "tGN" = ( @@ -47525,7 +47602,8 @@ idDoor = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = -23; - pixel_y = 7 + pixel_y = 7; + req_access = list("ai_master") }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) @@ -47753,7 +47831,7 @@ name = "Psych Office Shutters Control"; pixel_x = -23; pixel_y = 22; - req_access_txt = "5" + req_access = list("psychology") }, /obj/effect/landmark/start/yogs/psychiatrist, /turf/open/floor/carpet, @@ -48040,8 +48118,7 @@ /area/security/courtroom) "ucJ" = ( /obj/machinery/door/airlock/research{ - name = "Robotics Lab"; - req_access_txt = "29" + name = "Robotics Lab" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -48059,6 +48136,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel/white, /area/science/robotics/lab) "uda" = ( @@ -48105,8 +48183,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/maintenance_hatch{ - name = "MiniSat Maintenance"; - req_access_txt = "65" + name = "MiniSat Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -48114,6 +48191,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/satellite) "udT" = ( @@ -48148,8 +48226,10 @@ dir = 8 }, /obj/machinery/door/window/northleft{ - name = "Secure Board Storage"; - req_access_txt = "53" + name = "Secure Board Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 1 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) @@ -48183,7 +48263,7 @@ name = "Armory Shutters"; pixel_x = -5; pixel_y = -25; - req_access_txt = "3" + req_access = list("armory") }, /obj/machinery/light_switch{ pixel_x = 8; @@ -48488,8 +48568,7 @@ dir = 4 }, /obj/machinery/door/airlock/security/glass{ - name = "Long-Term Cell 2"; - req_access_txt = "2" + name = "Long-Term Cell 2" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -48497,6 +48576,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "uls" = ( @@ -48557,6 +48637,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/plasteel/stairs/goon/wood_stairs_middle, /area/library) "ung" = ( @@ -48748,9 +48829,7 @@ /turf/open/floor/circuit/telecomms/server, /area/ai_monitored/turret_protected/ai) "urb" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable{ icon_state = "1-2" }, @@ -48758,6 +48837,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "urf" = ( @@ -48774,7 +48854,7 @@ name = "Paramedic Staging Area Shutters"; pixel_x = 26; pixel_y = 6; - req_access_txt = "69" + req_access = list("paramedic") }, /obj/machinery/computer/med_data{ dir = 8 @@ -49257,14 +49337,14 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/door_timer{ - id = "Cell 1"; - name = "Cell 1"; - pixel_x = -32 - }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/machinery/door_timer{ + id = "Cell 2"; + name = "Cell 2"; + pixel_x = -32 + }, /turf/open/floor/plasteel, /area/security/brig) "uBW" = ( @@ -49362,13 +49442,12 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "uEe" = ( -/obj/machinery/door/airlock/mining/glass{ - name = "Mining Dock"; - req_access_txt = "48" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/door/airlock/mining/glass{ + name = "Freight Mining Airlock" + }, /turf/open/floor/plasteel/dark, /area/quartermaster/warehouse) "uEj" = ( @@ -49467,8 +49546,7 @@ "uEU" = ( /obj/machinery/door/airlock/highsecurity{ id_tag = "ai_core_airlock_exterior"; - name = "AI Core"; - req_access_txt = "65" + name = "AI Core" }, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/cable/yellow{ @@ -49489,6 +49567,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "uEW" = ( @@ -49763,7 +49842,8 @@ id = "researchprivate"; name = "Desk Privacy Shutters Control"; pixel_x = 24; - pixel_y = -4 + pixel_y = -4; + req_access = list("science") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 @@ -50009,8 +50089,7 @@ /area/teleporter) "uRc" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_access_txt = "50" + name = "Cargo Office" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -50028,6 +50107,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/office) "uRe" = ( @@ -50331,11 +50411,6 @@ /obj/structure/plasticflaps{ opacity = 1 }, -/obj/machinery/door/window/southleft{ - dir = 4; - name = "Virology"; - req_one_access_txt = "39;24" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -50404,8 +50479,7 @@ "uYN" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -50420,6 +50494,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "uZf" = ( @@ -50448,8 +50523,7 @@ /area/ai_monitored/turret_protected/ai_upload) "uZV" = ( /obj/machinery/door/airlock/research{ - name = "Xenobiology Lab"; - req_access_txt = "55" + name = "Xenobiology Lab" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -50467,6 +50541,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/white, /area/science/xenobiology) "uZX" = ( @@ -50485,11 +50560,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/window/brigdoor/westleft{ - id = "Cell 1"; - name = "Cell 1"; - req_access_txt = "1" - }, /obj/structure/cable{ icon_state = "1-4" }, @@ -50506,6 +50576,11 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/machinery/door/window/brigdoor/security/cell{ + id = "Cell 1"; + name = "Cell 1"; + dir = 8 + }, /turf/open/floor/plasteel, /area/security/brig) "vam" = ( @@ -50766,13 +50841,15 @@ id = "giftshop"; name = "Gift Shop Internal Shutters"; pixel_x = 26; - pixel_y = 24 + pixel_y = 24; + req_access = list("clerk") }, /obj/machinery/button/door{ id = "giftshop_ext"; name = "Gift Shop External Shutters"; pixel_x = 40; - pixel_y = 24 + pixel_y = 24; + req_access = list("clerk") }, /obj/structure/table/wood, /obj/machinery/power/apc{ @@ -51022,8 +51099,7 @@ /area/engine/engineering) "vkv" = ( /obj/machinery/door/airlock/security{ - name = "Interrogation"; - req_access_txt = "63" + name = "Interrogation" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -51040,6 +51116,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/interrogation) "vkF" = ( @@ -51329,9 +51406,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/science) "vrN" = ( @@ -51358,8 +51435,7 @@ "vsP" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/effect/mapping_helpers/airlock/unres{ dir = 8 @@ -51373,6 +51449,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "vsV" = ( @@ -51543,8 +51620,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload"; - req_access_txt = "16" + name = "AI Upload" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -51555,6 +51631,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai_upload) "vwf" = ( @@ -51849,12 +51926,12 @@ /area/crew_quarters/dorms) "vBw" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineering Access"; - req_access_txt = "10" + name = "Engineering Access" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/space/nearstation) "vBx" = ( @@ -51941,8 +52018,7 @@ /area/maintenance/aft) "vDt" = ( /obj/machinery/door/airlock/command{ - name = "Teleport Access"; - req_access_txt = "17" + name = "Teleport Access" }, /obj/structure/cable{ icon_state = "1-2" @@ -51957,6 +52033,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/command/teleporter, /turf/open/floor/plasteel/dark, /area/teleporter) "vEE" = ( @@ -52476,8 +52553,7 @@ /area/hallway/secondary/entry) "vQo" = ( /obj/machinery/door/airlock/command/glass{ - name = "Chief Medical Officer"; - req_access_txt = "40" + name = "Chief Medical Officer" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -52501,8 +52577,7 @@ /area/crew_quarters/heads/cmo) "vQE" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 @@ -52510,6 +52585,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "vQL" = ( @@ -52958,13 +53034,11 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/aft) "wcC" = ( @@ -53064,9 +53138,9 @@ }, /obj/machinery/door/airlock/security/glass{ name = "Armory"; - req_access_txt = "3"; security_level = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "wfc" = ( @@ -53107,9 +53181,7 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "wgw" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable{ icon_state = "4-8" }, @@ -53122,6 +53194,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore) "wgO" = ( @@ -53272,8 +53345,7 @@ /area/engine/atmos) "wkP" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -53293,6 +53365,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "wkW" = ( @@ -53698,7 +53771,7 @@ pixel_x = 7; pixel_y = 4 }, -/turf/open/floor/carpet/black, +/turf/open/floor/plating, /area/crew_quarters/bar) "wuw" = ( /obj/machinery/status_display, @@ -53745,12 +53818,20 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "wvm" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "shipbreaking"; - name = "shipbreaking recycler conveyer" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/plating/airless, -/area/space) +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos, +/turf/open/floor/plating, +/area/maintenance/aft) "wvo" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -53839,12 +53920,14 @@ dir = 1; icon_state = "right"; layer = 3.1; - name = "Upload Console Window"; - req_access_txt = "16" + name = "Upload Console Window" }, /obj/machinery/computer/upload/ai{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 1 + }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "wwU" = ( @@ -53873,8 +53956,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/window/southright{ - name = "Chemistry Desk"; - req_access_txt = "33" + name = "Chemistry Desk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "chemistryshutter"; @@ -53884,6 +53966,7 @@ pixel_x = 8; pixel_y = 5 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry, /turf/open/floor/plating, /area/medical/chemistry) "wxH" = ( @@ -54223,8 +54306,7 @@ "wDY" = ( /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_interior"; - name = "Physical Core Access"; - req_one_access_txt = "30;70" + name = "Physical Core Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -54238,6 +54320,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plating, /area/ai_monitored/secondarydatacore) "wEh" = ( @@ -54285,9 +54368,7 @@ /turf/open/floor/plasteel/dark, /area/chapel/office) "wEG" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "6;12;50" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable{ icon_state = "4-8" }, @@ -54493,7 +54574,8 @@ /obj/machinery/button/door{ id = "lawyerprivate"; pixel_x = 24; - pixel_y = -8 + pixel_y = -8; + req_access = list("lawyer") }, /turf/open/floor/wood, /area/lawoffice) @@ -54645,8 +54727,7 @@ "wNt" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Desk"; - req_access_txt = "24" + name = "Atmospherics Desk" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -54671,6 +54752,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos) "wNT" = ( @@ -54951,6 +55033,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) "wTs" = ( @@ -54998,9 +55081,9 @@ "wUd" = ( /obj/machinery/door/airlock/external{ name = "Mining Dock Airlock"; - req_access_txt = "48"; shuttledocked = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "wUo" = ( @@ -55012,7 +55095,7 @@ "wUE" = ( /obj/machinery/power/apc{ areastring = "/area/escapepodbay"; - name = "Podbay APC"; + name = "Shipbreaking Bay APC"; pixel_y = -23 }, /obj/structure/cable{ @@ -55217,8 +55300,7 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_exterior"; - name = "Virology Exterior Airlock"; - req_access_txt = "39" + name = "Virology Exterior Airlock" }, /obj/structure/cable{ icon_state = "4-8" @@ -55232,7 +55314,7 @@ idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_y = -24; - req_access_txt = "39" + req_access = list("virology") }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -55247,6 +55329,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "wZP" = ( @@ -55327,10 +55410,10 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/external{ - name = "AISat External Access"; - req_one_access_txt = "32;19" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/aft) "xaR" = ( @@ -55575,10 +55658,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore) "xed" = ( @@ -55654,20 +55736,19 @@ /area/crew_quarters/toilet) "xgy" = ( /obj/machinery/door/airlock/research{ - name = "Kill Chamber"; - req_access_txt = "55" + name = "Kill Chamber" }, /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plating, /area/science/xenobiology) "xgz" = ( /obj/machinery/door/airlock/command/glass{ - name = "Head of Security"; - req_access_txt = "58" + name = "Head of Security" }, /obj/structure/cable{ icon_state = "1-2" @@ -55685,6 +55766,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/security/hos, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "xgN" = ( @@ -56049,9 +56131,13 @@ /turf/open/floor/catwalk_floor/telecomms, /area/ai_monitored/turret_protected/ai) "xnG" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" +/obj/machinery/door/firedoor/border_only{ + dir = 4 }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/aft) "xnI" = ( @@ -56163,7 +56249,7 @@ /area/maintenance/port/fore) "xpi" = ( /obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;35" + name = "Library Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -56174,6 +56260,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/library, /turf/open/floor/plating, /area/maintenance/central) "xpz" = ( @@ -56369,8 +56457,7 @@ /area/hallway/secondary/exit/departure_lounge) "xsT" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Maintenance"; - req_access_txt = "48" + name = "Mining Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -56380,6 +56467,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plating, /area/maintenance/starboard) "xti" = ( @@ -56494,8 +56582,7 @@ dir = 8 }, /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_access_txt = "50" + name = "Cargo Office" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -56503,6 +56590,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/sorting) "xwK" = ( @@ -56688,8 +56776,7 @@ dir = 4 }, /obj/machinery/door/airlock/security/glass{ - name = "Long-Term Cell 1"; - req_access_txt = "2" + name = "Long-Term Cell 1" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -56697,6 +56784,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "xzn" = ( @@ -57194,9 +57282,7 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "xLq" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ @@ -57207,6 +57293,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/aft) "xMj" = ( @@ -57225,8 +57312,7 @@ dir = 4 }, /obj/machinery/door/airlock/atmos/glass{ - name = "Distribution Loop"; - req_access_txt = "24" + name = "Distribution Loop" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -57242,6 +57328,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos) "xMH" = ( @@ -57322,8 +57409,7 @@ /area/engine/engineering) "xOh" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Isolation A"; - req_access_txt = "39" + name = "Isolation A" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor/border_only{ @@ -57334,6 +57420,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/green/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "xOp" = ( @@ -57347,8 +57434,7 @@ /area/science/xenobiology) "xPl" = ( /obj/machinery/door/airlock/maintenance{ - name = "Holodeck Maintenance"; - req_access_txt = "12" + name = "Holodeck Maintenance" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -57362,6 +57448,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "xPn" = ( @@ -57505,8 +57592,10 @@ network = list("ss13","Secure") }, /obj/machinery/door/window/eastright{ - name = "Secure Board Storage"; - req_access_txt = "53" + name = "Secure Board Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/secure_tech{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) @@ -57524,8 +57613,7 @@ dir = 8 }, /obj/machinery/door/airlock/medical/glass{ - name = "Chemistry Lab"; - req_access_txt = "5; 33" + name = "Chemistry Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -57546,6 +57634,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/chemorange/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, /turf/open/floor/plasteel/white, /area/medical/chemistry) "xRt" = ( @@ -57807,8 +57896,7 @@ dir = 4 }, /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_access_txt = "10" + name = "Engineering" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -57817,17 +57905,18 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "xXG" = ( /obj/machinery/door/airlock/security/glass{ - name = "Equipment Room"; - req_access_txt = "1" + name = "Equipment Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel/showroomfloor, /area/security/main) "xXK" = ( @@ -57981,11 +58070,12 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "ycu" = ( @@ -58417,15 +58507,14 @@ dir = 1 }, /obj/machinery/door/airlock/command/glass{ - name = "EVA Storage"; - req_access_txt = "18" + name = "EVA Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "ylV" = ( /obj/machinery/door/airlock{ - name = "Law Office"; - req_access_txt = "38" + name = "Law Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -58438,6 +58527,7 @@ }, /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/lawyer, /turf/open/floor/wood, /area/lawoffice) @@ -77357,7 +77447,7 @@ uBm uBm uBm ocx -nGX +dKX sGJ sGJ mLc @@ -78373,7 +78463,7 @@ uBm wyp uBm ocx -nGX +dKX sGJ sGJ oDZ @@ -79383,7 +79473,7 @@ hIt goc sGJ sGJ -mlJ +mkT gQb uBm uxG @@ -80892,7 +80982,7 @@ ylr ylr ylr rLR -dKX +cCP rLR qgC ltM @@ -86049,7 +86139,7 @@ bHj bHj bHj xSu -ylr +xSu akr rhx oDt @@ -86071,7 +86161,7 @@ ylr qER qER ylr -ylr +mVy ylr ylr ylr @@ -86214,10 +86304,10 @@ bUu fHL dZE xAI -vXz -vXz +jbc +qHq oyr -vXz +qHq jol afm xgc @@ -86303,9 +86393,6 @@ xSu bHj bHj bHj -xSu -ylr -ylr akr akr kal @@ -86318,8 +86405,8 @@ vWp nWK vTB bXq -vWp -jbc +euj +abe bXq rjZ vWp @@ -86328,6 +86415,9 @@ ylr ylr qER ylr +mVy +ylr +ylr ylr ylr ylr @@ -86569,8 +86659,8 @@ vWp bXq bXq vdH -euj -abe +udm +fBr jzz rDM vWp @@ -86823,8 +86913,8 @@ aOL deB elw qdc -udm -fBr +fsl +fsl qdc hVn vWp @@ -87839,8 +87929,8 @@ aOL iKs elw qdc -mIs -gxT +fsl +fnu qdc utB vWp @@ -88093,8 +88183,8 @@ vWp bXq bXq bkH -vuQ -kVw +mIs +gxT xSB yeL vWp @@ -88347,8 +88437,8 @@ vWp mfn cUH bXq -vWp -fnu +vuQ +kVw bXq kak vWp @@ -88953,7 +89043,7 @@ tGT tGT tGT bHj -wvm +oBF ylr ylr ylr @@ -90317,7 +90407,7 @@ uUa uiP iUz naB -qHq +cel gRy fwX fRQ @@ -99504,7 +99594,7 @@ oPY gQT gQT aWb -wcv +wvm tJI dNe dNe @@ -99744,7 +99834,7 @@ hwJ ijq ijq xbB -mkT +kXo eJH gyq uJr @@ -103030,7 +103120,7 @@ ddn vra vBx mzt -fsl +voA iLt cVD qEj diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm index bf67d74263d1..a70eb34e3fa3 100644 --- a/_maps/map_files/GaxStation/GaxStation.dmm +++ b/_maps/map_files/GaxStation/GaxStation.dmm @@ -111,8 +111,7 @@ /area/engine/engineering) "add" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" + name = "Bridge" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -137,6 +136,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "ado" = ( @@ -233,8 +233,7 @@ /area/crew_quarters/kitchen) "afD" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Launch Room Access"; - req_access_txt = "7" + name = "Toxins Launch Room Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ @@ -250,6 +249,7 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel/white, /area/science/mixing) "afH" = ( @@ -545,37 +545,34 @@ name = "CMO Privacy Shutters Control"; pixel_x = 23; pixel_y = -10; - req_access_txt = "40" + req_access = list("medical") }, /obj/machinery/button/door{ id = "cloning_shutters"; name = "cloning shutters"; pixel_x = 33; pixel_y = 10; - req_access_txt = "5; 68"; - req_one_access_txt = null + req_access = list("medical") }, /obj/machinery/button/door{ id = "genetics_shutters"; name = "genetics shutters"; pixel_x = 33; pixel_y = -10; - req_access_txt = "5; 9; 68"; - req_one_access_txt = null + req_access = list("medical") }, /obj/machinery/button/door{ id = "chemistry_shutters"; name = "Chemistry shutters"; pixel_x = 36; - req_one_access_txt = "5; 33" + req_access = list("medical") }, /obj/machinery/button/door{ id = "surgery_shutters"; name = "Surgery shutters"; pixel_x = 23; pixel_y = 10; - req_access_txt = "45"; - req_one_access_txt = null + req_access = list("medical") }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) @@ -1214,8 +1211,7 @@ /area/hallway/primary/central) "aEA" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Maintenance"; - req_access_txt = "48" + name = "Mining Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -1223,6 +1219,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plating, /area/maintenance/port/aft) "aEH" = ( @@ -1451,8 +1448,7 @@ /area/security/brig) "aKK" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -1472,6 +1468,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "aKO" = ( @@ -1647,13 +1644,13 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_interior"; - name = "Virology Interior Airlock"; - req_access_txt = "39" + name = "Virology Interior Airlock" }, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "aPw" = ( @@ -1705,8 +1702,7 @@ /area/hallway/primary/starboard) "aQq" = ( /obj/machinery/door/airlock/command/glass{ - name = "EVA Storage"; - req_access_txt = "18" + name = "EVA Storage" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -1726,6 +1722,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "aQF" = ( @@ -2098,6 +2095,14 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/filled/corner/lower, +/obj/machinery/door/window/eastright{ + base_state = "left"; + icon_state = "left"; + name = "Security Delivery" + }, +/obj/effect/mapping_helpers/windoor/access/all/security/basic{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/processing) "aZG" = ( @@ -2179,8 +2184,7 @@ "bbE" = ( /obj/machinery/door/airlock/research{ id_tag = "RoboticsFoyer"; - name = "Mech Bay"; - req_one_access_txt = "29;75" + name = "Mech Bay" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -2192,6 +2196,7 @@ dirx = 5; diry = -1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/science/robotics/lab) "bbS" = ( @@ -2219,8 +2224,7 @@ dir = 4 }, /obj/machinery/door/airlock/medical{ - name = "Operating Theatre"; - req_access_txt = "45" + name = "Operating Theatre" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -2229,6 +2233,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/holosign/surgery, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /turf/open/floor/plasteel/white, /area/medical/surgery) "bco" = ( @@ -2269,8 +2274,7 @@ base_state = "right"; dir = 8; icon_state = "right"; - name = "Isolation B"; - req_access_txt = "39" + name = "Isolation B" }, /obj/effect/turf_decal/trimline/green/filled/line/lower, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -2279,6 +2283,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/virology{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "bdl" = ( @@ -2373,6 +2380,7 @@ /obj/effect/turf_decal/trimline/red/corner{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bfb" = ( @@ -2981,11 +2989,11 @@ /area/engine/engineering) "bwQ" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/department/science) "bxx" = ( @@ -3124,8 +3132,7 @@ /area/maintenance/port/aft) "bCH" = ( /obj/machinery/door/airlock/security{ - name = "Interrogation"; - req_access_txt = "63" + name = "Interrogation" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -3139,6 +3146,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/main) "bDb" = ( @@ -3335,20 +3343,19 @@ /area/medical/medbay/lobby) "bGF" = ( /obj/machinery/door/airlock/external{ - name = "Security Escape Airlock"; - req_access_txt = "2" + name = "Security Escape Airlock" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/hallway/secondary/exit) "bGP" = ( /obj/machinery/door/airlock{ - name = "Theatre Backstage"; - req_access_txt = "46" + name = "Theatre Backstage" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -3356,6 +3363,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /turf/open/floor/wood, /area/crew_quarters/theatre) "bGV" = ( @@ -3399,8 +3407,7 @@ /area/security/checkpoint/supply) "bHK" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -3408,6 +3415,8 @@ icon_state = "1-2" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "bHY" = ( @@ -3522,8 +3531,7 @@ /area/maintenance/starboard/fore) "bKD" = ( /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -3534,6 +3542,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/engineering) "bKU" = ( @@ -3604,7 +3613,6 @@ "bOF" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2"; shuttledocked = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -3612,6 +3620,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/security/processing) "bOI" = ( @@ -3735,8 +3744,7 @@ /area/maintenance/port/aft) "bQE" = ( /obj/machinery/door/airlock/command/glass{ - name = "Head of Security"; - req_access_txt = "58" + name = "Head of Security" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -3754,6 +3762,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/hos, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hos) "bQI" = ( @@ -3918,8 +3927,7 @@ /area/security/brig) "bTE" = ( /obj/machinery/door/airlock/highsecurity{ - name = "SMES"; - req_one_access_txt = "11;32" + name = "SMES" }, /obj/structure/cable{ icon_state = "1-2" @@ -3928,6 +3936,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel/dark, /area/engine/engine_smes) "bTR" = ( @@ -3977,8 +3986,7 @@ /area/hallway/primary/starboard) "bUw" = ( /obj/machinery/door/airlock/engineering{ - name = "AI Ship Access"; - req_access_txt = "65" + name = "AI Ship Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -3986,6 +3994,8 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/engineering) "bUP" = ( @@ -4066,7 +4076,7 @@ name = "Virology Access Console"; pixel_x = -23; pixel_y = 24; - req_access_txt = "39" + req_access = list("virology") }, /obj/structure/disposalpipe/segment{ dir = 10 @@ -4711,14 +4721,14 @@ name = "Privacy Shutters Control"; pixel_x = 6; pixel_y = 25; - req_access_txt = "57" + req_access = list("hop") }, /obj/machinery/button/door{ id = "hopqueue"; name = "Queue Shutters Control"; pixel_x = -4; pixel_y = 25; - req_access_txt = "57" + req_access = list("hop") }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) @@ -4757,7 +4767,8 @@ id = "giftshop"; name = "Gift Shop Internal Shutters"; pixel_x = 1; - pixel_y = 23 + pixel_y = 23; + req_access = list("clerk") }, /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/five, @@ -5020,13 +5031,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/department/science) "cxG" = ( @@ -5066,12 +5076,14 @@ /obj/machinery/door/window/westleft{ dir = 4; layer = 3.1; - name = "Cyborg Upload Console Window"; - req_access_txt = "16" + name = "Cyborg Upload Console Window" }, /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 4 + }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "cyn" = ( @@ -5080,7 +5092,7 @@ name = "Disposal Vent Control"; pixel_x = 4; pixel_y = -25; - req_access_txt = "12" + req_access = list("maint_tunnels") }, /obj/machinery/button/massdriver{ id = "trash"; @@ -5096,8 +5108,7 @@ "cyo" = ( /obj/machinery/door/airlock/research{ id_tag = "RoboticsFoyer"; - name = "Robotics Surgery Access"; - req_one_access_txt = "29;75" + name = "Robotics Lab" }, /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 4 @@ -5109,6 +5120,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/science/robotics/lab) "cyw" = ( @@ -5225,8 +5237,7 @@ dir = 4 }, /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -5234,6 +5245,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/engineering) "cAG" = ( @@ -5499,8 +5511,11 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "cES" = ( +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/plasteel/stairs/goon/dark_stairs_wide{ - dir = 8 + dir = 4 }, /area/bridge) "cEZ" = ( @@ -5639,9 +5654,11 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/window/northleft{ - req_access_txt = "1"; name = "Brig Desk" }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 1 + }, /turf/open/floor/plating, /area/security/brig) "cIZ" = ( @@ -5667,7 +5684,6 @@ /turf/open/floor/plating, /area/storage/tech) "cJd" = ( -/obj/structure/cable, /turf/open/floor/mech_bay_recharge_floor, /area/science/robotics/lab) "cJt" = ( @@ -5711,8 +5727,7 @@ /area/crew_quarters/heads/hos) "cKN" = ( /obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_access_txt = "27" + name = "Crematorium Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -5721,6 +5736,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plating, /area/chapel/office) "cKZ" = ( @@ -5792,12 +5808,12 @@ /area/hallway/secondary/service) "cMQ" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/aft) "cNu" = ( @@ -5913,8 +5929,7 @@ /area/engine/atmos/storage) "cPG" = ( /obj/machinery/door/airlock/atmos{ - name = "Tanks and Filtration"; - req_access_txt = "24" + name = "Tanks and Filtration" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -5935,12 +5950,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/distro) "cPL" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mining Dock"; - req_access_txt = "48" + name = "Mining Dock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -5955,6 +5970,7 @@ dir = 8 }, /obj/effect/turf_decal/stripes/corner, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "cPM" = ( @@ -5981,6 +5997,14 @@ }, /turf/open/floor/plasteel/white, /area/medical/paramedic) +"cQr" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/ramp_corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "cQK" = ( /obj/structure/cable{ icon_state = "1-2" @@ -6113,6 +6137,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/turf_decal/ramp_corner{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/bridge) "cVa" = ( @@ -6140,8 +6167,7 @@ /area/crew_quarters/heads/hos) "cVM" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Launch Room"; - req_access_txt = "7" + name = "Toxins Launch Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -6155,6 +6181,7 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel, /area/science/mixing) "cVQ" = ( @@ -6167,6 +6194,9 @@ /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 1 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "cWe" = ( @@ -6178,8 +6208,7 @@ /area/quartermaster/storage) "cWh" = ( /obj/machinery/door/airlock/maintenance{ - name = "Cargo Bay Maintenance"; - req_access_txt = "31" + name = "Cargo Bay Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -6191,6 +6220,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/maintenance/aft) "cWt" = ( @@ -6221,8 +6251,7 @@ /area/medical/sleeper) "cWD" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/structure/cable{ @@ -6231,6 +6260,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "cXc" = ( @@ -6384,8 +6415,7 @@ "dal" = ( /obj/machinery/door/airlock/research/glass{ name = "Kill Chamber"; - normalspeed = 0; - req_access_txt = "55" + normalspeed = 0 }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -6399,6 +6429,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "dao" = ( @@ -6421,15 +6452,14 @@ /turf/open/floor/plasteel/white, /area/medical/storage) "daP" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/hydroponics/garden) "dbb" = ( @@ -6472,8 +6502,7 @@ "dcq" = ( /obj/machinery/door/airlock/security{ aiControlDisabled = 1; - name = "Prisoner Transfer Centre"; - req_access_txt = "2" + name = "Prisoner Transfer Centre" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -6484,6 +6513,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/execution/transfer) "dcD" = ( @@ -6502,7 +6532,7 @@ name = "Chemistry shutters"; pixel_x = 26; pixel_y = 7; - req_one_access_txt = "5; 33" + req_access = list("chemistry") }, /obj/machinery/chem_master, /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ @@ -6662,14 +6692,11 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "dhw" = ( -/obj/machinery/door/morgue{ - name = "Private Study"; - req_access_txt = "37" - }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/machinery/door/morgue/curator, /turf/open/floor/plating, /area/library) "dhK" = ( @@ -6710,8 +6737,7 @@ /area/medical/chemistry) "dim" = ( /obj/machinery/door/airlock/research{ - name = "Xenobiology Lab"; - req_access_txt = "55" + name = "Xenobiology Lab" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -6730,6 +6756,8 @@ }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/science, +/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, /turf/open/floor/plasteel/white, /area/science/xenobiology) "div" = ( @@ -6786,10 +6814,7 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "diO" = ( -/obj/machinery/door/airlock/vault{ - req_access_txt = "53" - }, -/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/vault, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ @@ -6803,6 +6828,8 @@ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/any/command/vault, +/obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) "djb" = ( @@ -6847,7 +6874,7 @@ name = "Armory Shutters"; pixel_x = -24; pixel_y = 7; - req_access_txt = "3" + req_access = list("armory") }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -6971,8 +6998,7 @@ base_state = "left"; dir = 2; icon_state = "left"; - name = "Chemistry Desk"; - req_access_txt = "33" + name = "Chemistry Desk" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -6986,6 +7012,7 @@ pixel_x = 8; pixel_y = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry, /turf/open/floor/plating, /area/medical/chemistry) "dmY" = ( @@ -7304,6 +7331,9 @@ /area/security/checkpoint/medical) "dxA" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/bridge) "dxH" = ( @@ -7341,7 +7371,7 @@ id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_x = 24; - req_access_txt = "19" + req_access = list("eva") }, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) @@ -7770,6 +7800,18 @@ /obj/structure/grille/broken, /turf/open/floor/plating, /area/maintenance/port/aft) +"dHv" = ( +/obj/machinery/door/airlock/external{ + name = "Labor Camp Shuttle Airlock"; + shuttledocked = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/plating, +/area/security/processing) "dHA" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, @@ -7965,7 +8007,8 @@ id = "lawyer_blast"; name = "Privacy Shutters"; pixel_x = 25; - pixel_y = 8 + pixel_y = 8; + req_access = list("sec_basic") }, /obj/structure/table/wood, /obj/machinery/photocopier/faxmachine{ @@ -8284,8 +8327,7 @@ /area/science/mixing) "dWf" = ( /obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" + name = "Supply Dock Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -8293,6 +8335,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/quartermaster/storage) "dWF" = ( @@ -8658,8 +8701,7 @@ /obj/machinery/door/window/northright{ dir = 4; name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "5" + red_alert_access = 1 }, /obj/structure/table/glass, /obj/item/storage/firstaid/toxin{ @@ -8671,6 +8713,9 @@ pixel_x = -3; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/sleeper) "efl" = ( @@ -8858,8 +8903,7 @@ /area/hallway/primary/central) "ekN" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, /obj/structure/cable{ icon_state = "1-2" @@ -8870,6 +8914,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ela" = ( @@ -9523,8 +9568,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/medical{ - name = "Operating Theatre"; - req_access_txt = "45" + name = "Operating Theatre" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 @@ -9533,6 +9577,7 @@ dir = 8 }, /obj/machinery/holosign/surgery, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /turf/open/floor/plasteel/white, /area/medical/sleeper) "exW" = ( @@ -9563,8 +9608,7 @@ "eyp" = ( /obj/machinery/door/window/southright{ dir = 8; - name = "Bar Door"; - req_one_access_txt = "25;28" + name = "Bar Door" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -9572,6 +9616,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/service/bar{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "eyx" = ( @@ -9644,11 +9691,11 @@ "eAe" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2"; shuttledocked = 1 }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/security/processing) "eAn" = ( @@ -9737,7 +9784,7 @@ name = "Secure Storage Toggle"; pixel_x = -8; pixel_y = -23; - req_access_txt = "11" + req_access = list("engine_equip") }, /obj/structure/closet/radiation{ anchored = 1 @@ -9803,8 +9850,7 @@ /area/crew_quarters/dorms) "eDH" = ( /obj/machinery/door/airlock/research{ - name = "Nanite Laboratory"; - req_one_access_txt = "7;47;29" + name = "Nanite Laboratory" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -9816,6 +9862,7 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/dark, /area/science/nanite) "eDL" = ( @@ -9831,19 +9878,18 @@ icon_state = "1-2" }, /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel, /area/clerk) "eEd" = ( /obj/machinery/door/airlock{ - name = "Kitchen Cold Room"; - req_access_txt = "28" + name = "Kitchen Cold Room" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -9852,6 +9898,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) "eEe" = ( @@ -9934,8 +9981,7 @@ /area/security/prison) "eGu" = ( /obj/machinery/door/airlock{ - name = "Private Restroom"; - req_access_txt = "20" + name = "Private Restroom" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -10083,7 +10129,7 @@ name = "Warehouse Door Control"; pixel_x = -25; pixel_y = 7; - req_access_txt = "31" + req_access = list("cargo") }, /obj/machinery/camera{ c_tag = "Cargo Bay East"; @@ -10103,13 +10149,13 @@ /area/hydroponics/garden) "eKx" = ( /obj/machinery/door/airlock/external{ - name = "Escape Pod Three"; - req_access_txt = "63" + name = "Escape Pod Three" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/prison) "eKF" = ( @@ -10153,7 +10199,7 @@ normaldoorcontrol = 1; pixel_x = -6; pixel_y = -2; - req_access_txt = "5" + req_access = list("medical") }, /obj/item/storage/pencil_holder/crew, /turf/open/floor/plasteel/white, @@ -10178,11 +10224,11 @@ /area/solar/starboard/fore) "eLS" = ( /obj/machinery/door/airlock/external{ - name = "Security Escape Airlock"; - req_access_txt = "2" + name = "Security Escape Airlock" }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/hallway/secondary/exit) "eLZ" = ( @@ -10259,14 +10305,14 @@ /area/maintenance/department/science) "eMT" = ( /obj/machinery/door/airlock{ - name = "Bar Access"; - req_access_txt = "25" + name = "Bar Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/wood, /area/crew_quarters/bar) "eNb" = ( @@ -10366,8 +10412,7 @@ dir = 4 }, /obj/machinery/door/airlock/command{ - name = "Command Tool Storage"; - req_access_txt = "19" + name = "Command Tool Storage" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = 2; @@ -10379,6 +10424,7 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "eOX" = ( @@ -10531,8 +10577,7 @@ /area/bridge/meeting_room) "eRY" = ( /obj/machinery/door/airlock/maintenance{ - name = "Engineering Maintenance"; - req_access_txt = "10" + name = "Engineering Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -10540,6 +10585,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/department/engine) "eSb" = ( @@ -10789,7 +10835,7 @@ name = "Incinerator Access Console"; pixel_x = -24; pixel_y = -6; - req_one_access_txt = "12" + req_access = list("atmospherics") }, /obj/machinery/button/ignition{ id = "Incinerator"; @@ -10958,14 +11004,15 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "feN" = ( @@ -10988,13 +11035,13 @@ /area/engine/foyer) "ffj" = ( /obj/machinery/door/airlock/security{ - name = "Detective's Office"; - req_access_txt = "4" + name = "Detective's Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/detective, /turf/open/floor/wood, /area/security/detectives_office) "ffr" = ( @@ -11172,9 +11219,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "24" + name = "Atmospherics External Airlock" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) "fjr" = ( @@ -11259,8 +11306,16 @@ "flO" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ - name = "Hydroponics Desk"; - req_one_access_txt = "30;35" + name = "Hydroponics Desk" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 8 }, /turf/open/floor/plasteel, /area/hydroponics) @@ -11533,7 +11588,7 @@ name = "Kitchen Shutters Control"; pixel_x = -1; pixel_y = -24; - req_access_txt = "28" + req_access = list("kitchen") }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -11652,8 +11707,7 @@ /area/maintenance/solars/port/aft) "fxo" = ( /obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Maintenance"; - req_access_txt = "24" + name = "Atmospherics Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -11664,6 +11718,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/port/aft) "fxy" = ( @@ -11759,8 +11814,7 @@ /area/ai_monitored/storage/eva) "fzA" = ( /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -11782,12 +11836,12 @@ diry = -4 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/foyer) "fzH" = ( /obj/machinery/door/airlock/medical{ - name = "Paramedic Staging Area"; - req_access_txt = "69" + name = "Paramedic Staging Area" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -11800,6 +11854,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plasteel/white, /area/medical/paramedic) "fzI" = ( @@ -11828,7 +11883,7 @@ name = "Virology Access Button"; pixel_x = 22; pixel_y = 1; - req_access_txt = "39" + req_access = list("virology") }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, @@ -12042,8 +12097,7 @@ }, /obj/effect/turf_decal/trimline/brown/filled/line/lower, /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_access_txt = "50" + name = "Cargo Office" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -12057,6 +12111,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/office) "fEj" = ( @@ -12122,10 +12177,6 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "fES" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Hydroponics"; - req_access_txt = "35" - }, /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 8 }, @@ -12136,6 +12187,10 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/machinery/door/airlock/glass{ + name = "Hydroponics" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "fET" = ( @@ -12278,6 +12333,9 @@ /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/light, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/escapepodbay) "fIC" = ( @@ -12692,8 +12750,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Mech Bay Maintenance"; - req_one_access_txt = "29;75" + name = "Mech Bay Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -12707,6 +12764,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plating, /area/maintenance/department/science) "fTL" = ( @@ -13152,14 +13210,19 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 6 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/bridge) "gfu" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ dir = 2; - name = "Cargo Desk"; - req_access_txt = "31" + name = "Cargo Desk" }, /obj/item/deskbell/preset/supply{ pixel_x = 8; @@ -13169,6 +13232,11 @@ pixel_x = 5; pixel_y = -4 }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/supply/general, /turf/open/floor/plating, /area/quartermaster/office) "gfF" = ( @@ -13427,12 +13495,12 @@ dir = 8 }, /obj/machinery/door/airlock/grunge{ - name = "Mass Driver"; - req_access_txt = "22" + name = "Mass Driver" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plating, /area/chapel/office) "glL" = ( @@ -13834,8 +13902,7 @@ /area/medical/storage) "gvW" = ( /obj/machinery/door/airlock/command/glass{ - name = "EVA Storage"; - req_access_txt = "18" + name = "EVA Storage" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -13852,18 +13919,18 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "gwb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) "gwk" = ( @@ -13909,9 +13976,19 @@ /turf/open/floor/plasteel, /area/teleporter) "gyj" = ( -/obj/structure/sign/poster/contraband/ambrosia_vulgaris, -/turf/open/floor/plasteel, -/area/hallway/secondary/exit) +/obj/effect/turf_decal/bot, +/obj/structure/rack, +/obj/item/tank/internals/oxygen, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/bag/sheetsnatcher, +/obj/item/melee/sledgehammer, +/obj/item/storage/bag/trash, +/obj/item/broom, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/escapepodbay) "gyJ" = ( /obj/structure/window/reinforced{ dir = 1 @@ -14035,8 +14112,7 @@ /area/ai_monitored/storage/eva) "gBR" = ( /obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance"; - req_one_access_txt = "1; 63" + name = "Security Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -14044,6 +14120,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plating, /area/maintenance/department/bridge) "gCc" = ( @@ -14115,7 +14193,7 @@ name = "Secondary AI Core Access Button"; pixel_x = 11; pixel_y = -22; - req_access_txt = "30" + req_access = list("rnd_servers") }, /obj/machinery/doorButtons/access_button{ idDoor = "secondary_aicore_exterior"; @@ -14123,7 +14201,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -10; pixel_y = -22; - req_access_txt = "30" + req_access = list("rnd_servers") }, /obj/machinery/doorButtons/airlock_controller{ idExterior = "secondary_aicore_exterior"; @@ -14131,7 +14209,7 @@ idSelf = "secondary_aicore_controller"; name = "Secondary AI Core Access Console"; pixel_y = -24; - req_access_txt = "30" + req_access = list("rnd_servers") }, /turf/open/floor/plating, /area/ai_monitored/secondarydatacore) @@ -14139,9 +14217,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -14157,6 +14233,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "gFS" = ( @@ -14341,8 +14418,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/command/glass{ - name = "Research Director"; - req_access_txt = "30" + name = "Research Director" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -14356,6 +14432,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/rd, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/hor) "gIY" = ( @@ -14478,12 +14555,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" + name = "Shipbreaking Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/ramp_middle, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/department/eva) "gNJ" = ( @@ -14506,8 +14585,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/command{ - name = "Conference Room"; - req_access_txt = "19" + name = "Conference Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -14521,6 +14599,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge/meeting_room) "gOA" = ( @@ -14593,7 +14672,12 @@ /obj/effect/turf_decal/trimline/red/arrow_ccw{ dir = 4 }, -/turf/open/floor/plasteel/stairs/goon/dark_stairs_alone, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, +/turf/open/floor/plasteel/stairs/goon/dark_stairs_alone{ + dir = 1 + }, /area/hallway/secondary/entry) "gRV" = ( /obj/machinery/atmospherics/pipe/layer_manifold{ @@ -14645,7 +14729,7 @@ name = "Loading Doors"; pixel_x = -8; pixel_y = -24; - req_access_txt = "31" + req_access = list("cargo_bay") }, /obj/machinery/button/door{ id = "QMLoaddoor"; @@ -14653,7 +14737,7 @@ name = "Loading Doors"; pixel_x = 8; pixel_y = -24; - req_access_txt = "31" + req_access = list("cargo_bay") }, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -14783,7 +14867,7 @@ name = "Armory Shutters"; pixel_x = 26; pixel_y = 7; - req_access_txt = "3" + req_access = list("armory") }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -14983,10 +15067,6 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "hdd" = ( -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, @@ -15163,9 +15243,12 @@ }, /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_exterior"; - name = "Physical Core Access"; - req_one_access_txt = "30, 70" + name = "Server Room" }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers, /turf/open/floor/plating, /area/ai_monitored/secondarydatacore) "hiw" = ( @@ -15183,7 +15266,7 @@ /obj/machinery/button/door{ id = "teleshutter"; name = "Teleporter Shutter Control"; - req_access_txt = "19" + req_access = list("teleporter") }, /turf/closed/wall/r_wall, /area/teleporter) @@ -15203,14 +15286,16 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/effect/turf_decal/ramp_corner{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "hjs" = ( /obj/machinery/door/window/northleft{ dir = 4; name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "5" + red_alert_access = 1 }, /obj/structure/table/glass, /obj/item/storage/firstaid/fire{ @@ -15222,6 +15307,9 @@ pixel_x = -3; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/sleeper) "hjv" = ( @@ -15506,7 +15594,6 @@ "hpl" = ( /obj/machinery/door/airlock/external{ name = "Mining Dock Airlock"; - req_access_txt = "48"; shuttledocked = 1 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -15518,6 +15605,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "hpm" = ( @@ -15806,16 +15894,13 @@ /turf/open/floor/wood, /area/library) "hvc" = ( -/obj/machinery/door/morgue{ - name = "Confession Booth (Chaplain)"; - req_access_txt = "22" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/machinery/door/morgue/chaplain, /turf/open/floor/plasteel/dark, /area/chapel/main) "hvC" = ( @@ -15938,6 +16023,10 @@ "hzb" = ( /obj/structure/closet/secure_closet/brig, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/machinery/airalarm{ + pixel_y = -24; + dir = 1 + }, /turf/open/floor/plasteel, /area/security/prison) "hzo" = ( @@ -15999,13 +16088,6 @@ /obj/structure/plasticflaps{ opacity = 1 }, -/obj/machinery/door/window/eastright{ - base_state = "left"; - dir = 8; - icon_state = "left"; - name = "Security Delivery"; - req_access_txt = "1" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -16342,9 +16424,9 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "12" + name = "Shipbreaking External Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/escapepodbay) "hGw" = ( @@ -16712,7 +16794,8 @@ idSelf = "toxins_access_control"; name = "Toxins airlock control"; pixel_x = 24; - pixel_y = 24 + pixel_y = 24; + req_access = list("toxins") }, /obj/machinery/doorButtons/access_button{ idDoor = "toxins_airlock_interior"; @@ -16720,19 +16803,20 @@ layer = 3.1; name = "Toxins airlock control"; pixel_x = -24; - pixel_y = 24 + pixel_y = 24; + req_access = list("toxins") }, /turf/open/floor/engine, /area/science/mixing/chamber) "hSs" = ( /obj/machinery/door/airlock{ - name = "Custodial Closet"; - req_access_txt = "26" + name = "Custodial Closet" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/plasteel, /area/janitor) "hSt" = ( @@ -16858,8 +16942,7 @@ /area/science/mixing) "hUQ" = ( /obj/machinery/door/airlock/research{ - name = "Xenobiology Lab"; - req_access_txt = "55" + name = "Xenobiology Lab" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -16882,6 +16965,7 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/white, /area/science/xenobiology) "hVc" = ( @@ -17013,8 +17097,10 @@ base_state = "right"; dir = 8; icon_state = "right"; - name = "Containment Pen 2"; - req_access_txt = "55" + name = "Containment Pen 2" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -17299,13 +17385,13 @@ /area/hallway/secondary/exit) "ihc" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Maintenance"; - req_access_txt = "12;24" + name = "Atmospherics Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) "ihd" = ( @@ -17402,8 +17488,7 @@ }, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -17421,6 +17506,7 @@ color = "#99ccff"; dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "ikb" = ( @@ -17473,8 +17559,7 @@ name = "privacy shutters"; pixel_x = -22; pixel_y = 23; - req_access_txt = "69"; - req_one_access_txt = null + req_access = list("paramedic") }, /turf/open/floor/plasteel/white, /area/medical/paramedic) @@ -17486,8 +17571,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/command{ - name = "Command Tool Storage"; - req_access_txt = "19" + name = "Command Tool Storage" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = -2; @@ -17497,6 +17581,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "ilz" = ( @@ -17619,6 +17704,13 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/door/window/southleft{ + dir = 8; + name = "Virology" + }, +/obj/effect/mapping_helpers/windoor/access/all/medical/virology{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "ioL" = ( @@ -17953,8 +18045,7 @@ /obj/machinery/door/window/northleft{ dir = 4; name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "5" + red_alert_access = 1 }, /obj/structure/table/glass, /obj/item/storage/firstaid/o2{ @@ -17969,6 +18060,9 @@ /obj/structure/sign/departments/medbay/alt{ pixel_x = -33 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/sleeper) "iwN" = ( @@ -18029,7 +18123,8 @@ id = "briggate"; name = "Desk Shutters"; pixel_x = -26; - pixel_y = 6 + pixel_y = 6; + req_access = list("security") }, /obj/structure/cable{ icon_state = "1-2" @@ -18309,7 +18404,7 @@ name = "Secondary AI Core Access Button"; pixel_x = 10; pixel_y = -22; - req_access_txt = "30" + req_access = list("rnd_servers") }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/secondarydatacore) @@ -18436,7 +18531,6 @@ "iKb" = ( /obj/machinery/door/airlock/highsecurity{ name = "Secure Tech Storage"; - req_access_txt = "76"; security_level = 6 }, /obj/effect/mapping_helpers/airlock/locked, @@ -18450,6 +18544,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/secure_tech, /turf/open/floor/plasteel/dark, /area/storage/tech) "iKo" = ( @@ -18498,7 +18593,7 @@ name = "Mixing Room Vent Control"; pixel_x = -25; pixel_y = 5; - req_access_txt = "7" + req_access = list("toxins") }, /obj/machinery/button/ignition{ id = "mixingsparker"; @@ -18597,8 +18692,8 @@ id = "robotics"; name = "Shutters Control Button"; pixel_x = -26; - pixel_y = 8; - req_one_access_txt = "29;75" + pixel_y = 4; + req_access = list("robotics") }, /obj/machinery/camera{ c_tag = "Robotics Lab - South"; @@ -18628,7 +18723,8 @@ dir = 1 }, /obj/machinery/light_switch{ - pixel_x = -24 + pixel_x = -24; + pixel_y = -6 }, /turf/open/floor/plasteel, /area/science/robotics/lab) @@ -18773,7 +18869,7 @@ name = "Virology Access Button"; pixel_x = -10; pixel_y = -22; - req_access_txt = "39" + req_access = list("virology") }, /obj/machinery/doorButtons/access_button{ idDoor = "virology_airlock_interior"; @@ -18781,7 +18877,7 @@ name = "Virology Access Button"; pixel_x = 22; pixel_y = 10; - req_access_txt = "39" + req_access = list("virology") }, /turf/open/floor/plasteel/white, /area/medical/virology) @@ -19007,8 +19103,7 @@ /area/hallway/primary/starboard) "iWT" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -19023,6 +19118,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/lab) "iXw" = ( @@ -19031,12 +19127,12 @@ dir = 2; icon_state = "right"; name = "Brig Infirmary"; - red_alert_access = 1; - req_access_txt = "5" + red_alert_access = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/blue/filled/corner/lower, +/obj/effect/mapping_helpers/windoor/access/all/security/brig_phys, /turf/open/floor/plasteel/white, /area/security/brig) "iXH" = ( @@ -19360,8 +19456,7 @@ id = "medpriv_shutters"; name = "medbay storage shutters"; pixel_x = -24; - req_access_txt = "5"; - req_one_access_txt = null + req_access = list("medical") }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) @@ -19858,8 +19953,10 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Containment Pen 2"; - req_access_txt = "55" + name = "Containment Pen 2" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -20012,8 +20109,7 @@ base_state = "left"; dir = 1; icon_state = "left"; - name = "Chemistry Desk"; - req_access_txt = "33" + name = "Chemistry Desk" }, /obj/machinery/door/poddoor/preopen{ id = "chemistry_shutters"; @@ -20023,6 +20119,13 @@ pixel_x = -8; pixel_y = -3 }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry{ + dir = 1 + }, /turf/open/floor/plating, /area/medical/chemistry) "jAf" = ( @@ -20197,13 +20300,12 @@ "jCA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/aft) "jCE" = ( @@ -20217,8 +20319,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/research{ - name = "Mech Bay"; - req_one_access_txt = "29;75" + name = "Mech Bay" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = -5; @@ -20234,6 +20335,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/science/robotics/lab) "jCS" = ( @@ -20374,6 +20476,9 @@ /obj/effect/turf_decal/trimline/secred/warning/lower{ dir = 4 }, +/obj/effect/turf_decal/ramp_corner{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/bridge) "jHj" = ( @@ -20593,8 +20698,7 @@ }, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/effect/mapping_helpers/airlock/unres{ dir = 8 @@ -20603,6 +20707,7 @@ color = "#99ccff"; dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "jOc" = ( @@ -20666,13 +20771,13 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/engineering{ - name = "Port Quarter Solar Access"; - req_access_txt = "10" + name = "Port Quarter Solar Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "jPl" = ( @@ -20718,6 +20823,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/aft) "jRd" = ( @@ -20948,8 +21056,7 @@ /area/engine/foyer) "jWg" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator"; - req_access_txt = "11" + name = "Gravity Generator" }, /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/firedoor/border_only{ @@ -20961,6 +21068,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/engine, /area/engine/gravity_generator) "jWj" = ( @@ -20996,7 +21104,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/stairs/goon/stairs_middle, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, +/turf/open/floor/plasteel/stairs/goon/stairs_middle{ + dir = 1 + }, /area/hallway/secondary/entry) "jXr" = ( /obj/effect/spawner/structure/window/reinforced/shutter, @@ -21006,9 +21119,7 @@ /turf/open/floor/plating, /area/maintenance/disposal/incinerator) "jXz" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -21027,6 +21138,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "jXL" = ( @@ -21140,6 +21252,9 @@ /obj/effect/turf_decal/trimline/white/filled/line/lower{ dir = 1 }, +/obj/effect/turf_decal/ramp_corner{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "kbY" = ( @@ -21341,7 +21456,7 @@ name = "Bridge Blast Door Control"; pixel_x = -7; pixel_y = -34; - req_access_txt = "19" + req_access = list("command") }, /obj/structure/chair/comfy/black{ dir = 4; @@ -21518,8 +21633,7 @@ /area/chapel/office) "kmd" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/structure/cable{ @@ -21528,6 +21642,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "kmh" = ( @@ -21600,8 +21716,7 @@ /area/maintenance/starboard/fore) "knr" = ( /obj/machinery/door/airlock/maintenance{ - name = "Teleporter Maintenance"; - req_access_txt = "17" + name = "Teleporter Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -21614,6 +21729,7 @@ dirx = 4; diry = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/teleporter, /turf/open/floor/plating, /area/maintenance/central/secondary) "knX" = ( @@ -21628,8 +21744,7 @@ /area/medical/medbay/lobby) "kov" = ( /obj/machinery/door/airlock/maintenance{ - name = "Research Maintenance"; - req_one_access_txt = "7;47;29" + name = "Research Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -21640,6 +21755,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plating, /area/maintenance/department/science/central) "kpN" = ( @@ -21726,8 +21842,7 @@ /area/clerk) "krv" = ( /obj/machinery/door/airlock/security/glass{ - name = "Long-Term Cell 2"; - req_access_txt = "2" + name = "Long-Term Cell 2" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -21741,6 +21856,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "kst" = ( @@ -21858,8 +21974,7 @@ name = "Surgery shutters"; pixel_x = 26; pixel_y = 6; - req_access_txt = "45"; - req_one_access_txt = null + req_access = list("surgery") }, /obj/machinery/button/holosign{ id = "surgery"; @@ -21959,8 +22074,7 @@ dir = 4 }, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Treatment"; - req_access_txt = "5" + name = "Medbay Treatment" }, /obj/effect/mapping_helpers/airlock/unres{ dir = 8 @@ -21969,6 +22083,7 @@ color = "#99ccff"; dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "kxF" = ( @@ -22070,12 +22185,12 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "kBK" = ( @@ -22118,12 +22233,12 @@ "kEh" = ( /obj/machinery/mass_driver{ dir = 1; - id = "chapelgun" + id = "chapelgun"; + name = "Holy Driver" }, /obj/machinery/door/window{ dir = 8; - name = "Mass Driver"; - req_access_txt = "22" + name = "Mass Driver" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -22131,6 +22246,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 8 + }, /turf/open/floor/plating, /area/chapel/office) "kEF" = ( @@ -22225,8 +22343,7 @@ dir = 4 }, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Treatment"; - req_access_txt = "5" + name = "Medbay Treatment" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -22247,6 +22364,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "kGT" = ( @@ -22377,15 +22495,14 @@ /turf/open/floor/engine, /area/engine/engineering) "kJq" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/department/eva) "kJw" = ( @@ -22477,12 +22594,12 @@ dir = 8 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "12" + name = "Shipbreaking External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/escapepodbay) "kMo" = ( @@ -22554,8 +22671,7 @@ /area/bridge/meeting_room) "kOt" = ( /obj/machinery/door/airlock{ - name = "Hydroponics Backroom"; - req_access_txt = "35" + name = "Hydroponics Backroom" }, /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 4 @@ -22570,12 +22686,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "kOA" = ( /obj/machinery/door/airlock/security{ - name = "Labor Shuttle"; - req_access_txt = "63" + name = "Labor Shuttle" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -22591,6 +22707,7 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/processing) "kOZ" = ( @@ -22916,9 +23033,9 @@ dir = 1 }, /obj/machinery/door/airlock/medical{ - name = "Morgue"; - req_access_txt = "6" + name = "Morgue" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/plasteel/dark, /area/medical/morgue) "kZP" = ( @@ -23043,11 +23160,12 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "lbS" = ( @@ -23251,8 +23369,7 @@ /area/science/robotics/lab) "lfW" = ( /obj/machinery/door/airlock/maintenance{ - name = "Captain's Office Maintenance"; - req_access_txt = "20" + name = "Captain's Office Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -23264,6 +23381,7 @@ dirx = -4; diry = -1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/plating, /area/maintenance/central/secondary) "lgt" = ( @@ -23282,9 +23400,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -23294,12 +23410,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/department/science) "lgL" = ( /obj/machinery/door/airlock/command{ - name = "Teleport Access"; - req_access_txt = "17" + name = "Teleport Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -23322,6 +23438,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/teleporter, /turf/open/floor/plasteel, /area/teleporter) "lhi" = ( @@ -23423,8 +23540,7 @@ /area/science/mixing) "ljd" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics"; - req_access_txt = "24" + name = "Atmospherics" }, /obj/structure/cable{ icon_state = "1-2" @@ -23440,6 +23556,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/engineering) "ljj" = ( @@ -23556,14 +23673,20 @@ "lmr" = ( /obj/machinery/door/window/westleft{ dir = 1; - name = "Hydroponics Desk"; - req_one_access_txt = "30;35" + name = "Hydroponics Desk" }, /obj/structure/table/reinforced, /obj/item/deskbell/preset/hydroponics{ pixel_x = -8; pixel_y = -2 }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 1 + }, /turf/open/floor/plating, /area/hydroponics) "lmw" = ( @@ -23638,13 +23761,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock{ - name = "Law Office"; - req_access_txt = "38" + name = "Law Office" }, /obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/service/lawyer, /turf/open/floor/plasteel, /area/lawoffice) "lpt" = ( @@ -23671,8 +23794,7 @@ dir = 4 }, /obj/machinery/door/airlock/security/glass{ - name = "Transfer Chamber"; - req_access_txt = "2" + name = "Transfer Chamber" }, /obj/structure/cable{ icon_state = "4-8" @@ -23683,6 +23805,7 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/security/execution/transfer) "lqS" = ( @@ -23707,8 +23830,7 @@ "lrP" = ( /obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; - name = "Supermatter Chamber"; - req_access_txt = "10" + name = "Supermatter Chamber" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -23719,6 +23841,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/supermatter) "lsK" = ( @@ -23959,8 +24082,7 @@ /area/hydroponics/garden) "lxD" = ( /obj/machinery/door/airlock/security/glass{ - name = "Brig Desk"; - req_access_txt = "1" + name = "Brig Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -23972,6 +24094,7 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel/dark, /area/security/brig) "lxG" = ( @@ -24012,18 +24135,17 @@ autoclose = 0; heat_proof = 1; id_tag = "toxins_airlock_exterior"; - name = "Mixing Room Exterior Airlock"; - req_access_txt = "8" + name = "Mixing Room Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/engine, /area/science/mixing/chamber) "lyq" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" + name = "Engineering External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -24034,6 +24156,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "lys" = ( @@ -24271,8 +24394,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/security{ - name = "Security Checkpoint"; - req_access_txt = "1" + name = "Security Checkpoint" }, /obj/structure/cable{ icon_state = "1-2" @@ -24285,6 +24407,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/checkpoint/customs) "lEH" = ( @@ -24555,8 +24679,11 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "lMp" = ( +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/plasteel/stairs/goon/dark_stairs_wide2{ - dir = 8 + dir = 4 }, /area/bridge) "lMu" = ( @@ -24967,6 +25094,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "lVT" = ( @@ -25064,8 +25192,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ - name = "Cargo Bay Maintenance"; - req_access_txt = "31" + name = "Cargo Bay Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -25076,6 +25203,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/maintenance/port/aft) "lZt" = ( @@ -25314,6 +25442,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/department/bridge) "mfS" = ( @@ -25411,12 +25542,12 @@ autoclose = 0; heat_proof = 1; id_tag = "toxins_airlock_interior"; - name = "Mixing Room Interior Airlock"; - req_access_txt = "8" + name = "Mixing Room Interior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/engine, /area/science/mixing/chamber) "mjc" = ( @@ -25473,9 +25604,9 @@ "mki" = ( /obj/machinery/door/window/westleft{ dir = 2; - name = "Atmospherics Canister Storage"; - req_access_txt = "24" + name = "Atmospherics Canister Storage" }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos, /turf/open/floor/plasteel/dark, /area/engine/atmos/storage) "mko" = ( @@ -25483,8 +25614,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance/external{ - name = "mass driver intersection"; - req_access_txt = "12" + name = "Mass Driver Intersection" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -25504,6 +25634,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "mky" = ( @@ -25605,9 +25736,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/highsecurity{ - name = "SMES"; - req_one_access_txt = "11;32" + name = "SMES" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel/dark, /area/engine/engine_smes) "mmV" = ( @@ -25847,8 +25978,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/research{ - name = "Toxins Lab"; - req_access_txt = "7" + name = "Toxins Lab" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -25863,6 +25993,7 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel/white, /area/science/mixing) "msJ" = ( @@ -25883,8 +26014,7 @@ /area/quartermaster/office) "mtb" = ( /obj/machinery/door/airlock/security/glass{ - name = "Brig Control"; - req_access_txt = "3" + name = "Brig Control" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -25902,6 +26032,7 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel, /area/security/warden) "mtf" = ( @@ -25926,13 +26057,13 @@ /area/hallway/primary/starboard) "mtW" = ( /obj/machinery/door/airlock/maintenance{ - name = "Nanite Laboratory Maintenance"; - req_one_access_txt = "7;47;29" + name = "Nanite Laboratory Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plating, /area/maintenance/department/science/central) "muA" = ( @@ -25982,7 +26113,7 @@ /area/security/brig) "mvV" = ( /obj/machinery/door/airlock/public/glass{ - name = "Escape Podbay" + name = "Shipbreaking Bay" }, /obj/structure/cable{ icon_state = "0-4" @@ -26011,6 +26142,10 @@ /obj/effect/turf_decal/trimline/white/filled/corner/lower{ dir = 1 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plasteel, /area/escapepodbay) "mwk" = ( @@ -26128,14 +26263,10 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/effect/turf_decal/ramp_middle{ + dir = 1 }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/stairs/goon/stairs_alone, /area/escapepodbay) "myr" = ( /obj/structure/cable{ @@ -26326,7 +26457,8 @@ id = "hosspace"; name = "Space Shutters Control"; pixel_x = -24; - pixel_y = 8 + pixel_y = 8; + req_access = list("security") }, /obj/machinery/light_switch{ pixel_x = -24; @@ -26340,8 +26472,7 @@ /area/crew_quarters/bar) "mFc" = ( /obj/machinery/door/airlock/engineering{ - name = "Tech Storage"; - req_access_txt = "23" + name = "Tech Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -26361,6 +26492,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /turf/open/floor/plasteel/dark, /area/storage/tech) "mFg" = ( @@ -26595,12 +26727,12 @@ /area/science/robotics/lab) "mMR" = ( /obj/machinery/door/airlock/maintenance_hatch{ - name = "Disposals Access"; - req_access_txt = "12" + name = "Disposals Access" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/aft) "mMU" = ( @@ -26824,6 +26956,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "mRV" = ( @@ -26856,12 +26991,12 @@ /area/chapel/main) "mSy" = ( /obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" + name = "Supply Dock Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/quartermaster/storage) "mSF" = ( @@ -27197,13 +27332,15 @@ "neu" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ - name = "Brig Desk"; - req_access_txt = "1" + name = "Brig Desk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "briggate"; name = "security shutters" }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, /turf/open/floor/plating, /area/security/brig) "new" = ( @@ -27280,9 +27417,7 @@ /turf/open/floor/plasteel, /area/security/processing) "ngZ" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12:36" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -27301,6 +27436,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/general, /turf/open/floor/plating, /area/maintenance/starboard/fore) "nhc" = ( @@ -27407,6 +27544,11 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/office) +"njz" = ( +/obj/effect/spawner/structure/window/reinforced/shutter, +/obj/effect/turf_decal/ramp_middle, +/turf/open/floor/plating, +/area/maintenance/department/bridge) "njB" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ dir = 1 @@ -27476,8 +27618,11 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/plasteel/stairs/goon/dark_stairs_wide2{ - dir = 8 + dir = 4 }, /area/bridge) "nlR" = ( @@ -27500,8 +27645,7 @@ /area/security/checkpoint/supply) "nmu" = ( /obj/machinery/door/airlock/command{ - name = "Captain's Office"; - req_access_txt = "20" + name = "Captain's Office" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -27525,6 +27669,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "nmx" = ( @@ -27782,17 +27927,17 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "24" + name = "Atmospherics External Airlock" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) "ntC" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/department/science) "nub" = ( @@ -27996,8 +28141,7 @@ dir = 4 }, /obj/machinery/door/airlock/research/glass{ - name = "Genetics Research"; - req_access_txt = "5; 9; 68" + name = "Genetics Research" }, /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 4 @@ -28021,12 +28165,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/medical/genetics) "nzj" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -28035,19 +28179,24 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "nzG" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ dir = 2; - name = "Cargo Desk"; - req_access_txt = "31" + name = "Cargo Desk" }, /obj/item/deskbell/preset/supply{ pixel_x = 8; pixel_y = 9 }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/supply/general, /turf/open/floor/plating, /area/quartermaster/office) "nzI" = ( @@ -28124,8 +28273,7 @@ name = "cloning shutters"; pixel_x = -25; pixel_y = 9; - req_access_txt = "5; 68"; - req_one_access_txt = null + req_access = list("cloning") }, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) @@ -28202,8 +28350,7 @@ /area/hallway/primary/central) "nCw" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -28220,6 +28367,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/science) "nCy" = ( @@ -28297,8 +28445,7 @@ /area/hallway/primary/central) "nEW" = ( /obj/machinery/door/airlock/engineering{ - name = "Starboard Bow Solar Access"; - req_access_txt = "10" + name = "Starboard Bow Solar Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -28309,6 +28456,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "nFB" = ( @@ -28575,8 +28723,7 @@ dir = 8 }, /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -28587,6 +28734,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "nKG" = ( @@ -28666,6 +28814,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/bridge) "nMW" = ( @@ -29115,7 +29266,7 @@ name = "Bar Shutters Control"; pixel_x = -8; pixel_y = 22; - req_access_txt = "25" + req_access = list("bar") }, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) @@ -29981,8 +30132,7 @@ /area/hallway/primary/central) "ozS" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "65" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -29990,6 +30140,8 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plating, /area/engine/engineering) "ozU" = ( @@ -30213,10 +30365,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/maintenance{ - name = "Library Maintenance"; - req_one_access_txt = "12;37" + name = "Library Maintenance" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/library, /turf/open/floor/plating, /area/maintenance/starboard/fore) "oIe" = ( @@ -30571,8 +30724,7 @@ }, /obj/machinery/door/window/westleft{ dir = 2; - name = "Paramedic Desk"; - req_access_txt = "69" + name = "Paramedic Desk" }, /obj/item/deskbell/preset/paramedic{ pixel_x = 9; @@ -30582,6 +30734,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/medical/paramedic, /turf/open/floor/plating, /area/medical/paramedic) "oQr" = ( @@ -30620,8 +30773,7 @@ /area/medical/paramedic) "oRe" = ( /obj/machinery/door/airlock/public/glass{ - name = "Chapel Office"; - req_access_txt = "22" + name = "Chapel Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -30629,12 +30781,16 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/office) "oRf" = ( /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 4 }, +/obj/effect/turf_decal/ramp_corner{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "oRt" = ( @@ -31038,9 +31194,7 @@ /turf/open/floor/engine, /area/engine/supermatter) "peq" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -31051,6 +31205,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos, /turf/open/floor/plating, /area/maintenance/port/aft) "peJ" = ( @@ -31099,6 +31255,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/bridge) "pgd" = ( @@ -31302,14 +31461,16 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ dir = 8; - name = "Engineering Desk"; - req_access_txt = "10" + name = "Engineering Desk" }, /obj/item/deskbell/preset/engi{ pixel_x = 8; pixel_y = -3 }, /obj/item/storage/pencil_holder/crew, +/obj/effect/mapping_helpers/windoor/access/all/engineering/general{ + dir = 8 + }, /turf/open/floor/plating, /area/engine/foyer) "pjL" = ( @@ -31394,8 +31555,7 @@ /area/security/main) "pmk" = ( /obj/machinery/door/airlock/security{ - name = "Labor Shuttle"; - req_access_txt = "2" + name = "Labor Shuttle" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -31413,6 +31573,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/processing) "pmr" = ( @@ -31430,8 +31591,7 @@ name = "privacy shutters"; pixel_x = -55; pixel_y = 6; - req_access_txt = "5"; - req_one_access_txt = null + req_access = list("medical") }, /turf/open/floor/plasteel/white, /area/medical/storage) @@ -31631,8 +31791,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -31644,6 +31803,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/checkpoint/auxiliary) "pqj" = ( @@ -31860,8 +32021,7 @@ /area/hydroponics/garden) "pxj" = ( /obj/machinery/door/airlock/external{ - name = "Escape Pod Three"; - req_access_txt = "63" + name = "Escape Pod Three" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -31875,6 +32035,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/prison) "pxk" = ( @@ -31887,7 +32048,7 @@ name = "E.V.A. Storage Shutter Control"; pixel_x = -24; pixel_y = 8; - req_access_txt = "19" + req_access = list("eva") }, /obj/machinery/light_switch{ pixel_x = -24; @@ -32001,8 +32162,7 @@ /obj/machinery/door/window{ base_state = "right"; icon_state = "right"; - name = "Core Modules"; - req_access_txt = "20" + name = "Core Modules" }, /obj/machinery/power/apc/highcap/five_k{ areastring = "/area/ai_monitored/turret_protected/ai_upload"; @@ -32021,6 +32181,7 @@ /obj/effect/spawner/lootdrop/aimodule_harmless, /obj/item/aiModule/core/freeformcore, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "pBa" = ( @@ -32042,8 +32203,7 @@ /area/hallway/primary/starboard) "pBD" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/structure/cable{ icon_state = "4-8" @@ -32064,6 +32224,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "pBF" = ( @@ -32116,8 +32277,7 @@ /area/science/lab) "pCl" = ( /obj/machinery/door/airlock/command{ - name = "Head of Personnel"; - req_access_txt = "57" + name = "Head of Personnel" }, /obj/structure/cable{ icon_state = "4-8" @@ -32141,6 +32301,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/service/hop, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "pCr" = ( @@ -32185,9 +32346,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "8;12" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) "pEG" = ( @@ -32218,8 +32379,7 @@ /area/hallway/secondary/entry) "pFT" = ( /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload"; - req_access_txt = "16" + name = "AI Upload" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -32233,6 +32393,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "pGA" = ( @@ -32273,8 +32434,7 @@ /area/library) "pHK" = ( /obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance"; - req_one_access_txt = "1; 63" + name = "Security Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -32285,6 +32445,8 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plating, /area/maintenance/starboard/fore) "pHQ" = ( @@ -32400,8 +32562,7 @@ base_state = "rightsecure"; dir = 4; icon_state = "rightsecure"; - name = "Head of Personnel's Desk"; - req_access_txt = "57" + name = "Head of Personnel's Desk" }, /obj/machinery/flasher{ id = "hopflash"; @@ -32415,6 +32576,9 @@ pixel_x = -8; pixel_y = -4 }, +/obj/effect/mapping_helpers/windoor/access/all/service/hop{ + dir = 4 + }, /turf/open/floor/plating, /area/crew_quarters/heads/hop) "pKU" = ( @@ -32983,9 +33147,7 @@ /turf/open/floor/plasteel, /area/teleporter) "pXP" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -32995,6 +33157,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/hydroponics/garden) "pXU" = ( @@ -33019,8 +33182,7 @@ /area/medical/storage) "pYt" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" + name = "Bridge" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -33054,6 +33216,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "pYB" = ( @@ -33167,13 +33330,13 @@ /area/hallway/secondary/entry) "qcr" = ( /obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "63" + name = "Security External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plating, /area/security/prison) "qcv" = ( @@ -33304,8 +33467,7 @@ }, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -33317,6 +33479,7 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "qfo" = ( @@ -33492,15 +33655,15 @@ /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "qiY" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos, /turf/open/floor/plating, /area/maintenance/department/engine) "qja" = ( @@ -33579,8 +33742,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance/external{ - name = "mass driver intersection"; - req_access_txt = "12" + name = "Mass Driver Intersection" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -33600,6 +33762,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "qlc" = ( @@ -33746,8 +33909,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ dir = 8; - name = "Atmospherics Desk"; - req_access_txt = "24" + name = "Atmospherics Desk" }, /obj/item/deskbell/preset/atmos{ pixel_x = 8; @@ -33755,6 +33917,15 @@ }, /obj/item/paper_bin, /obj/item/pen, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos{ + dir = 8 + }, /turf/open/floor/plating, /area/engine/atmos/storage) "qnX" = ( @@ -33818,8 +33989,7 @@ "qpx" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "innerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -33830,6 +34000,7 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "qpJ" = ( @@ -33950,8 +34121,7 @@ /area/maintenance/port/aft) "qwa" = ( /obj/machinery/door/airlock/security{ - name = "Detective's Office"; - req_access_txt = "4" + name = "Detective's Office" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -33971,6 +34141,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/security/detective, /turf/open/floor/wood, /area/security/detectives_office) "qwt" = ( @@ -34026,11 +34197,11 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_exterior"; - name = "Virology Exterior Airlock"; - req_access_txt = "39" + name = "Virology Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "qxw" = ( @@ -34053,8 +34224,7 @@ /area/engine/gravity_generator) "qxH" = ( /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -34072,13 +34242,14 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 5 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "qxJ" = ( /obj/structure/table, /obj/machinery/computer/security/telescreen{ desc = "Used for watching the RD's goons from the safety of your own office."; - dir = 4; + dir = 8; name = "Research Monitor"; network = list("rd"); pixel_y = 2 @@ -34201,7 +34372,7 @@ name = "Toxins Mixing Room Access Console"; pixel_x = -24; pixel_y = 8; - req_one_access_txt = "8" + req_access = list("toxins") }, /obj/machinery/light_switch{ pixel_x = -24; @@ -34348,6 +34519,16 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/line, +/obj/machinery/computer/pod/old{ + density = 0; + icon = 'icons/obj/airlock_machines.dmi'; + icon_state = "airlock_control_standby"; + id = "chapelgun"; + name = "Mass Driver Controller"; + pixel_x = -24; + req_access = list("chapel_office"); + pixel_y = -4 + }, /turf/open/floor/plating, /area/chapel/office) "qIO" = ( @@ -34358,6 +34539,9 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/bridge) "qJl" = ( @@ -34368,8 +34552,7 @@ dir = 4 }, /obj/machinery/door/airlock/research{ - name = "Toxins Storage"; - req_access_txt = "8" + name = "Toxins Storage" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -34380,6 +34563,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins_storage, /turf/open/floor/plasteel, /area/science/storage) "qJo" = ( @@ -34524,9 +34708,7 @@ /turf/open/space/basic, /area/solar/starboard/aft) "qPM" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -34548,6 +34730,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/department/science) "qPP" = ( @@ -34572,7 +34756,9 @@ /obj/effect/turf_decal/ramp_middle{ dir = 1 }, -/turf/open/floor/plasteel/stairs/goon/stairs_middle, +/turf/open/floor/plasteel/stairs/goon/stairs_middle{ + dir = 1 + }, /area/hydroponics/garden) "qQC" = ( /obj/machinery/navbeacon{ @@ -34590,7 +34776,7 @@ name = "Radiation Shutters Control"; pixel_x = -24; pixel_y = -8; - req_access_txt = "10" + req_access = list("engineering") }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -34637,7 +34823,7 @@ normaldoorcontrol = 1; pixel_x = -26; pixel_y = 5; - req_access_txt = "63" + req_access = list("security") }, /obj/machinery/button/door{ id = "outerbrig"; @@ -34645,7 +34831,7 @@ normaldoorcontrol = 1; pixel_x = -26; pixel_y = -5; - req_access_txt = "63" + req_access = list("security") }, /obj/structure/cable{ icon_state = "1-2" @@ -34691,6 +34877,9 @@ /turf/open/floor/plasteel, /area/security/prison) "qSn" = ( +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/stairs/goon/stairs_wide{ dir = 1 }, @@ -34717,8 +34906,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower, /obj/machinery/door/airlock/medical{ id_tag = "GeneticsDoor"; - name = "Cloning"; - req_access_txt = "5; 68" + name = "Cloning" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -34741,6 +34929,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cloning, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "qTj" = ( @@ -34804,7 +34993,8 @@ idSelf = "incinerator_access_control"; name = "Incinerator airlock control"; pixel_x = 22; - pixel_y = -10 + pixel_y = -10; + req_access = list("atmospherics") }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -34834,8 +35024,7 @@ "qVY" = ( /obj/machinery/door/window/southleft{ dir = 1; - name = "Test Chamber"; - req_access_txt = "55" + name = "Test Chamber" }, /obj/effect/turf_decal/loading_area, /obj/machinery/atmospherics/pipe/simple/orange/visible, @@ -34843,6 +35032,9 @@ id = "misclab"; name = "test chamber blast door" }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "qWh" = ( @@ -34867,8 +35059,7 @@ /area/engine/atmos/distro) "qXf" = ( /obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_access_txt = "27" + name = "Crematorium Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -34878,6 +35069,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plating, /area/maintenance/starboard/fore) "qXw" = ( @@ -34932,8 +35124,7 @@ /obj/machinery/door/window/northright{ dir = 4; name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "5" + red_alert_access = 1 }, /obj/structure/table/glass, /obj/item/storage/firstaid/brute{ @@ -34945,6 +35136,9 @@ pixel_x = -3; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/sleeper) "qZz" = ( @@ -35117,7 +35311,7 @@ /obj/machinery/power/apc{ areastring = "/area/escapepodbay"; dir = 1; - name = "Podbay APC"; + name = "Shipbreaking Bay"; pixel_y = 23 }, /obj/structure/cable{ @@ -35174,6 +35368,10 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 5 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/plasteel/dark, /area/bridge) "rdP" = ( @@ -35207,8 +35405,7 @@ "reE" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -35221,6 +35418,7 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "rfi" = ( @@ -35292,8 +35490,7 @@ /area/hallway/primary/fore) "rgl" = ( /obj/machinery/door/airlock/security/glass{ - name = "Long-Term Cell 1"; - req_access_txt = "2" + name = "Long-Term Cell 1" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -35307,6 +35504,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "rgP" = ( @@ -35385,8 +35583,7 @@ /area/quartermaster/office) "riA" = ( /obj/machinery/door/airlock/command/glass{ - name = "Chief Medical Officer"; - req_access_txt = "40" + name = "Chief Medical Officer" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -35408,6 +35605,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) "rjf" = ( @@ -35692,9 +35890,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "2-4" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -35730,8 +35925,7 @@ /area/science/storage) "rqW" = ( /obj/machinery/door/airlock/security/glass{ - name = "Equipment Room"; - req_access_txt = "1" + name = "Equipment Room" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -35748,6 +35942,7 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel/showroomfloor, /area/security/main) "rra" = ( @@ -35770,9 +35965,10 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "65" + name = "Engineering External Access" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plating, /area/engine/engineering) "rrx" = ( @@ -35834,8 +36030,7 @@ base_state = "left"; dir = 2; icon_state = "left"; - name = "Robotics Desk"; - req_one_access_txt = "29;75" + name = "Robotics Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -35853,6 +36048,7 @@ pixel_x = -10; pixel_y = 12 }, +/obj/effect/mapping_helpers/windoor/access/all/science/robotics, /turf/open/floor/plating, /area/science/robotics/lab) "rsW" = ( @@ -35924,7 +36120,8 @@ layer = 3.1; name = "Incinerator airlock control"; pixel_x = -22; - pixel_y = 10 + pixel_y = 10; + req_access = list("atmospherics") }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -35973,8 +36170,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/westright{ dir = 1; - name = "Security Checkpoint"; - req_access_txt = "1" + name = "Security Checkpoint" }, /obj/item/paper_bin{ pixel_x = 1; @@ -35985,6 +36181,12 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/any/security/detective{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/any/security/general{ + dir = 1 + }, /turf/open/floor/plating, /area/security/checkpoint/customs) "rvK" = ( @@ -36176,8 +36378,7 @@ base_state = "right"; dir = 8; icon_state = "right"; - name = "Isolation A"; - req_access_txt = "39" + name = "Isolation A" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -36185,6 +36386,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/virology{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "rBc" = ( @@ -36675,8 +36879,7 @@ /area/medical/medbay/central) "rNW" = ( /obj/machinery/door/window/southleft{ - name = "Test Chamber"; - req_access_txt = "55" + name = "Test Chamber" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/orange/visible, @@ -36684,6 +36887,7 @@ id = "misclab"; name = "test chamber blast door" }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio, /turf/open/floor/engine, /area/science/xenobiology) "rOc" = ( @@ -36798,8 +37002,7 @@ /area/security/main) "rQq" = ( /obj/machinery/door/airlock/command{ - name = "Captain's Quarters"; - req_access_txt = "20" + name = "Captain's Quarters" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -36810,6 +37013,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) "rQZ" = ( @@ -36909,8 +37113,7 @@ }, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -36932,6 +37135,7 @@ /obj/effect/turf_decal/trimline/chemorange/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "rUk" = ( @@ -37242,8 +37446,7 @@ /area/engine/atmos/distro) "scr" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -37264,6 +37467,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/lab) "scs" = ( @@ -37289,7 +37493,7 @@ name = "Warehouse Door Control"; pixel_x = 25; pixel_y = 7; - req_access_txt = "31" + req_access = list("cargo") }, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, @@ -37455,8 +37659,7 @@ name = "genetics shutters"; pixel_x = -25; pixel_y = 9; - req_access_txt = "5; 9; 68"; - req_one_access_txt = null + req_access = list("genetics") }, /turf/open/floor/plasteel/white, /area/medical/genetics) @@ -37815,8 +38018,7 @@ /area/hallway/primary/starboard) "srl" = ( /obj/machinery/door/airlock/maintenance{ - name = "Bar Maintenance"; - req_access_txt = "25" + name = "Bar Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -37828,6 +38030,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plating, /area/maintenance/starboard/fore) "ssc" = ( @@ -37847,12 +38050,12 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Chemistry Lab Maintenance"; - req_access_txt = "5; 33" + name = "Chemistry Lab Maintenance" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, /turf/open/floor/plating, /area/maintenance/department/medical/central) "ssn" = ( @@ -37968,6 +38171,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 }, +/obj/effect/turf_decal/ramp_corner{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/bridge) "sup" = ( @@ -37984,8 +38190,7 @@ dir = 4 }, /obj/machinery/door/airlock/mining/glass{ - name = "Quartermaster"; - req_access_txt = "41" + name = "Quartermaster" }, /obj/structure/cable{ icon_state = "2-4" @@ -38003,18 +38208,19 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, /turf/open/floor/plasteel, /area/quartermaster/qm) "sus" = ( /obj/machinery/door/window/westleft{ dir = 2; - name = "Monkey Pen"; - req_access_txt = "9" + name = "Monkey Pen" }, /obj/effect/turf_decal/trimline/purple/filled/corner/lower, /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/medical/genetics) "suz" = ( @@ -38102,8 +38308,7 @@ /area/hallway/primary/starboard) "sxT" = ( /obj/machinery/door/airlock/medical{ - name = "Morgue"; - req_access_txt = "45;5" + name = "Morgue" }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 8 @@ -38126,6 +38331,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/plasteel/dark, /area/medical/morgue) "sxY" = ( @@ -38162,6 +38368,9 @@ /obj/machinery/door/window/southleft{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/virology{ + dir = 8 + }, /turf/open/floor/grass, /area/medical/virology) "szl" = ( @@ -38529,17 +38738,17 @@ /area/medical/surgery) "sKH" = ( /obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "63" + name = "Security External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plating, /area/security/prison) "sKP" = ( /obj/machinery/door/airlock/mining{ - req_access_txt = "48" + name = "Mining Bay" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -38556,6 +38765,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "sLi" = ( @@ -38659,8 +38869,7 @@ /area/quartermaster/storage) "sNN" = ( /obj/machinery/door/airlock{ - name = "Crematorium"; - req_access_txt = "27" + name = "Crematorium" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -38677,6 +38886,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plasteel/dark, /area/chapel/office) "sOb" = ( @@ -38701,8 +38911,7 @@ "sOU" = ( /obj/machinery/door/window/southright{ dir = 8; - name = "Research and Development Desk"; - req_access_txt = "7" + name = "Research and Development Desk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "rnd"; @@ -38717,6 +38926,15 @@ pixel_x = -10; pixel_y = 12 }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/all/science/general{ + dir = 8 + }, /turf/open/floor/plating, /area/science/lab) "sPf" = ( @@ -38815,8 +39033,7 @@ /area/medical/virology) "sQI" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Chemistry Lab"; - req_access_txt = "5; 33" + name = "Chemistry Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -38840,6 +39057,7 @@ /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, /turf/open/floor/plasteel/white, /area/medical/chemistry) "sQP" = ( @@ -39014,7 +39232,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/airalarm{ +/obj/machinery/airalarm/engine{ dir = 4; pixel_x = -24 }, @@ -39127,7 +39345,8 @@ "sYa" = ( /obj/machinery/quantumpad{ map_pad_id = "vaulttoai"; - map_pad_link_id = "aitovault" + map_pad_link_id = "aitovault"; + name = "AI Satellite Transport" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 @@ -39152,8 +39371,7 @@ /area/quartermaster/warehouse) "sYQ" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Maintenance"; - req_access_txt = "12;24" + name = "Atmospherics Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -39166,6 +39384,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/department/security) "sYY" = ( @@ -39178,13 +39397,14 @@ name = "Prison Wing Lockdown"; pixel_x = -27; pixel_y = 8; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/door{ id = "Secure Gate"; name = "Cell Shutters"; pixel_x = -27; - pixel_y = -2 + pixel_y = -2; + req_access = list("brig") }, /obj/structure/chair/office/dark, /turf/open/floor/plasteel/showroomfloor, @@ -39209,7 +39429,7 @@ name = "Cell 1 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "PCell 1"; @@ -39254,13 +39474,13 @@ /area/security/main) "tal" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/aft) "tar" = ( @@ -39332,9 +39552,7 @@ /turf/open/floor/plasteel, /area/crew_quarters/bar) "tcS" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -39353,6 +39571,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) "tda" = ( @@ -39388,7 +39608,8 @@ id = "disposalshutters"; name = "disposals shutter control"; pixel_x = -24; - pixel_y = 9 + pixel_y = 9; + req_access = list("cargo") }, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -39761,8 +39982,7 @@ /area/maintenance/starboard/fore) "toK" = ( /obj/machinery/door/airlock{ - name = "Service Hall"; - req_access_txt = "79" + name = "Service Hall" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -39779,6 +39999,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service, /turf/open/floor/plasteel, /area/hallway/secondary/service) "toM" = ( @@ -40100,7 +40321,7 @@ name = "Cell 2 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -40239,8 +40460,16 @@ "tCk" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/westright{ - name = "Hydroponics Desk"; - req_one_access_txt = "30;35" + name = "Hydroponics Desk" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 8 }, /turf/open/floor/plasteel, /area/hydroponics) @@ -40374,8 +40603,7 @@ /area/maintenance/starboard/fore) "tHe" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -40383,6 +40611,8 @@ icon_state = "1-2" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "tHs" = ( @@ -40810,8 +41040,7 @@ /area/library) "tSs" = ( /obj/machinery/door/airlock/command/glass{ - name = "Chief Engineer"; - req_access_txt = "56" + name = "Chief Engineer" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -40837,6 +41066,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/ce, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) "tSU" = ( @@ -40914,8 +41144,7 @@ /area/medical/chemistry) "tUy" = ( /obj/machinery/door/airlock/maintenance{ - name = "Conference Room Maintenance"; - req_access_txt = "19" + name = "Conference Room Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -40930,6 +41159,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plating, /area/bridge/meeting_room) "tUT" = ( @@ -40960,8 +41190,7 @@ /area/science/xenobiology) "tVs" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_one_access_txt = "10;32" + name = "Engineering" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -40989,6 +41218,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel, /area/engine/foyer) "tVz" = ( @@ -41271,12 +41502,13 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_one_access_txt = "5;12" + name = "Medbay Maintenance" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plating, /area/maintenance/department/medical/central) "ucL" = ( @@ -41335,14 +41567,14 @@ name = "Turbine Vent Control"; pixel_x = -25; pixel_y = 8; - req_access_txt = "12" + req_access = list("atmospherics") }, /obj/machinery/button/door{ id = "auxincineratorvent"; name = "Auxiliary Vent Control"; pixel_x = -25; pixel_y = -9; - req_access_txt = "12" + req_access = list("atmospherics") }, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -41451,8 +41683,7 @@ /area/crew_quarters/bar) "uhi" = ( /obj/machinery/door/airlock/maintenance{ - name = "Custodial Maintenance"; - req_access_txt = "26" + name = "Custodial Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -41464,6 +41695,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/plating, /area/maintenance/starboard/fore) "uhN" = ( @@ -41545,8 +41777,7 @@ /area/maintenance/disposal/incinerator) "ukx" = ( /obj/machinery/door/airlock/medical{ - name = "Paramedic Staging Area"; - req_access_txt = "69" + name = "Paramedic Staging Area" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -41564,6 +41795,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plasteel/white, /area/medical/paramedic) "ukY" = ( @@ -41656,8 +41888,7 @@ /area/crew_quarters/heads/hop) "umn" = ( /obj/machinery/door/airlock/engineering{ - name = "AI Ship Access"; - req_one_access_txt = "10;17;61" + name = "AI Ship Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -41672,6 +41903,9 @@ dir = 8 }, /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/satellite/teleporter) "umy" = ( @@ -41697,8 +41931,7 @@ /area/hallway/secondary/entry) "uni" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics"; - req_access_txt = "24" + name = "Atmospherics" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -41722,6 +41955,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/storage) "unn" = ( @@ -41759,14 +41993,14 @@ /area/quartermaster/storage) "upl" = ( /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload Access"; - req_access_txt = "16" + name = "AI Upload Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "uqi" = ( @@ -41918,6 +42152,13 @@ }, /turf/open/space/basic, /area/solar/port/aft) +"uwC" = ( +/obj/effect/turf_decal/trimline/white/filled/corner/lower{ + dir = 1 + }, +/obj/effect/turf_decal/ramp_middle, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "uwH" = ( /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 8 @@ -42130,8 +42371,7 @@ /area/hallway/primary/starboard) "uCM" = ( /obj/machinery/door/airlock/research{ - name = "Genetics Research Access"; - req_access_txt = "9" + name = "Genetics Research Access" }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 8 @@ -42143,6 +42383,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/medical/genetics) "uCP" = ( @@ -42320,8 +42561,10 @@ "uGY" = ( /obj/machinery/door/window/northright{ dir = 4; - name = "Library Desk Door"; - req_access_txt = "37" + name = "Library Desk Door" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/library{ + dir = 4 }, /turf/open/floor/wood, /area/library) @@ -42752,13 +42995,13 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ - name = "EVA Maintenance"; - req_access_txt = "18" + name = "EVA Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plating, /area/maintenance/department/eva) "uRb" = ( @@ -42794,10 +43037,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/research/glass{ - name = "Secondary AI Core"; - normalspeed = 0; - req_access_txt = "47" +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers, +/obj/machinery/door/airlock/command{ + name = "R&D Servers and Networking" }, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) @@ -42969,8 +43211,7 @@ /area/engine/engineering) "uWk" = ( /obj/machinery/door/airlock{ - name = "Service Hall"; - req_access_txt = "79" + name = "Service Hall" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -42978,6 +43219,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service, /turf/open/floor/plasteel, /area/hallway/secondary/service) "uWs" = ( @@ -43060,11 +43302,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/window/southleft{ - dir = 4; - name = "Virology"; - req_one_access_txt = "39;24" - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -43085,8 +43322,7 @@ /area/hallway/primary/central) "uZq" = ( /obj/machinery/door/window/southleft{ - name = "Armory"; - req_access_txt = "3" + name = "Armory" }, /obj/structure/cable{ icon_state = "1-2" @@ -43096,6 +43332,7 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/effect/mapping_helpers/windoor/access/all/security/armory, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "uZr" = ( @@ -43267,9 +43504,9 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/medical{ - name = "Medbay Storage"; - req_access_txt = "5" + name = "Medbay Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/storage) "vdo" = ( @@ -43300,6 +43537,10 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"vdy" = ( +/obj/effect/turf_decal/ramp_middle, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "vdK" = ( /obj/machinery/light_switch{ pixel_x = 24; @@ -43418,7 +43659,7 @@ name = "Transfer Area Lockdown"; pixel_x = -25; pixel_y = 5; - req_access_txt = "2" + req_access = list("brig") }, /obj/structure/table/optable, /obj/item/storage/backpack/duffelbag/sec/surgery{ @@ -43461,6 +43702,9 @@ /obj/structure/railing, /obj/structure/table/reinforced, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, +/obj/effect/turf_decal/ramp_corner{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/bridge) "vgJ" = ( @@ -43533,7 +43777,7 @@ name = "Shutters Control Button"; pixel_x = -7; pixel_y = -24; - req_access_txt = "47" + req_access = list("science") }, /turf/open/floor/plasteel/white, /area/science/lab) @@ -43944,14 +44188,16 @@ "vrw" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastright{ - name = "Brig Desk"; - req_access_txt = "2" + name = "Brig Desk" }, /obj/item/restraints/handcuffs, /obj/machinery/door/poddoor/shutters/preopen{ id = "briggate"; name = "security shutters" }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, /turf/open/floor/plating, /area/security/brig) "vry" = ( @@ -44032,7 +44278,7 @@ id = "armory_eva"; name = "Armory Shutters"; pixel_x = 24; - req_access_txt = "3" + req_access = list("security") }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, @@ -44124,10 +44370,10 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "8;12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/aft) "vwY" = ( @@ -44560,8 +44806,7 @@ /area/science/mixing) "vJz" = ( /obj/machinery/door/airlock/security{ - name = "Security Office"; - req_one_access_txt = "1;4" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -44585,6 +44830,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/main) "vJK" = ( @@ -44640,9 +44887,7 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) "vKU" = ( -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, +/obj/structure/closet/secure_closet/bar, /obj/item/gun/ballistic/shotgun/doublebarrel, /turf/open/floor/wood, /area/crew_quarters/bar) @@ -44683,7 +44928,7 @@ name = "Test Chamber Blast Doors"; pixel_x = -7; pixel_y = 8; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/item/paper_bin{ pixel_x = 4; @@ -44773,8 +45018,7 @@ /area/crew_quarters/dorms) "vMZ" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -44786,6 +45030,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "vNb" = ( @@ -44813,9 +45058,9 @@ /obj/machinery/door/window/southleft{ base_state = "right"; icon_state = "right"; - name = "Armory"; - req_access_txt = "3" + name = "Armory" }, +/obj/effect/mapping_helpers/windoor/access/all/security/armory, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "vNF" = ( @@ -44880,12 +45125,14 @@ dir = 4; icon_state = "right"; layer = 3.1; - name = "Upload Console Window"; - req_access_txt = "16" + name = "Upload Console Window" }, /obj/structure/cable{ icon_state = "2-8" }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 4 + }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "vPc" = ( @@ -45233,6 +45480,15 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) +"vZA" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/ramp_middle, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "vZM" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner/lower{ dir = 4 @@ -45515,6 +45771,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/bridge) "wgK" = ( @@ -45595,8 +45854,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/plasteel/stairs/goon/stairs_alone{ - dir = 8 + dir = 4 }, /area/escapepodbay) "wiA" = ( @@ -45745,13 +46007,13 @@ dir = 8 }, /obj/machinery/door/airlock/medical{ - name = "Medbay Reception"; - req_access_txt = "5" + name = "Medbay Reception" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "wmT" = ( @@ -45789,13 +46051,13 @@ frequency = 1449; heat_proof = 1; id_tag = "incinerator_airlock_exterior"; - name = "Incinerator Exterior Airlock"; - req_access_txt = "32" + name = "Incinerator Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "wnQ" = ( @@ -45944,7 +46206,8 @@ /obj/machinery/button/door{ id = "kanyewest"; name = "Privacy Shutters"; - pixel_y = -24 + pixel_y = -24; + req_access = list("detective") }, /turf/open/floor/wood, /area/security/detectives_office) @@ -46037,12 +46300,14 @@ "wte" = ( /obj/machinery/door/window/southleft{ dir = 8; - name = "Mass Driver Door"; - req_access_txt = "7" + name = "Mass Driver Door" }, /obj/effect/turf_decal/loading_area{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/toxins{ + dir = 8 + }, /turf/open/floor/plasteel, /area/science/mixing) "wtt" = ( @@ -46050,6 +46315,9 @@ /obj/effect/turf_decal/trimline/red/arrow_ccw{ dir = 1 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/plasteel/stairs/goon/dark_stairs_alone{ dir = 4 }, @@ -46177,8 +46445,10 @@ /obj/machinery/door/firedoor/border_only, /obj/item/storage/pencil_holder/crew, /obj/machinery/door/window/northright{ - name = "Brig Desk"; - req_access_txt = "1" + name = "Brig Desk" + }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 1 }, /turf/open/floor/plating, /area/security/brig) @@ -46310,12 +46580,12 @@ "wCe" = ( /obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; - name = "Supermatter Chamber"; - req_access_txt = "10" + name = "Supermatter Chamber" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/engine/supermatter) "wCx" = ( @@ -46518,8 +46788,7 @@ /area/lawoffice) "wIb" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -46527,6 +46796,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/engine, /area/engine/engineering) "wIc" = ( @@ -46580,8 +46850,7 @@ base_state = "left"; dir = 8; icon_state = "left"; - name = "Genetics Desk"; - req_access_txt = "5; 9; 68" + name = "Genetics Desk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "genetics_shutters"; @@ -46591,6 +46860,9 @@ pixel_x = 8; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/science/genetics{ + dir = 8 + }, /turf/open/floor/plating, /area/medical/genetics) "wIy" = ( @@ -47203,6 +47475,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, +/obj/effect/turf_decal/ramp_middle, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "wYp" = ( @@ -47231,9 +47507,12 @@ }, /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_interior"; - name = "Physical Core Access"; - req_one_access_txt = "30, 70" + name = "Server Room" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers, /turf/open/floor/plating, /area/ai_monitored/secondarydatacore) "wYP" = ( @@ -47368,8 +47647,7 @@ /area/crew_quarters/heads/hor) "xbm" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics"; - req_access_txt = "24" + name = "Atmospherics" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -47393,6 +47671,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/storage) "xbr" = ( @@ -47490,8 +47769,7 @@ /obj/machinery/door/window/westleft{ dir = 2; name = "Brig Infirmary"; - red_alert_access = 1; - req_access_txt = "5" + red_alert_access = 1 }, /obj/structure/closet/crate/freezer/blood, /obj/machinery/iv_drip, @@ -47503,6 +47781,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, +/obj/effect/mapping_helpers/windoor/access/all/security/brig_phys, /turf/open/floor/plasteel/white, /area/security/brig) "xeH" = ( @@ -47642,18 +47921,20 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor{ dir = 1; - name = "Armory Desk"; - req_access_txt = "3" + name = "Armory Desk" }, /obj/machinery/door/window/southleft{ - name = "Reception Desk"; - req_access_txt = "63" + name = "Reception Desk" }, /obj/item/deskbell/preset/warden{ pixel_x = 10; pixel_y = -3 }, /obj/item/storage/pencil_holder/crew, +/obj/effect/mapping_helpers/windoor/access/all/security/basic, +/obj/effect/mapping_helpers/windoor/access/all/security/armory{ + dir = 1 + }, /turf/open/floor/plating, /area/security/warden) "xhD" = ( @@ -47685,16 +47966,17 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "xjg" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Service Door"; - req_one_access_txt = "35;28" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/machinery/door/airlock/glass{ + name = "Service Door" + }, +/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics, +/obj/effect/mapping_helpers/airlock/access/any/service/kitchen, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -47794,13 +48076,13 @@ /area/hallway/primary/central) "xkX" = ( /obj/machinery/door/airlock{ - name = "Kitchen"; - req_access_txt = "28" + name = "Kitchen" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -48095,6 +48377,15 @@ }, /turf/open/floor/plating, /area/maintenance/department/bridge) +"xsq" = ( +/obj/machinery/door/airlock/external{ + name = "Labor Camp Shuttle Airlock"; + shuttledocked = 1 + }, +/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/plating, +/area/security/processing) "xst" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -48159,6 +48450,9 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "xus" = ( +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/plasteel/stairs/goon/stairs2_wide{ dir = 1 }, @@ -48543,8 +48837,7 @@ /area/security/checkpoint/supply) "xED" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 @@ -48561,6 +48854,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/medical) "xEO" = ( @@ -48600,7 +48894,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -10; pixel_y = -22; - req_access_txt = "30" + req_access = list("rnd_servers") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -48799,8 +49093,7 @@ /area/hallway/secondary/exit) "xLC" = ( /obj/machinery/door/airlock{ - name = "Theatre Backstage"; - req_access_txt = "46" + name = "Theatre Backstage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -48812,6 +49105,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /turf/open/floor/plasteel, /area/crew_quarters/theatre) "xLG" = ( @@ -48967,9 +49261,9 @@ dir = 1 }, /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" + name = "Medbay Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/department/medical/central) "xOY" = ( @@ -49031,8 +49325,7 @@ /area/quartermaster/storage) "xPi" = ( /obj/machinery/door/airlock/engineering{ - name = "Starboard Quarter Solar Access"; - req_access_txt = "10" + name = "Starboard Quarter Solar Access" }, /obj/structure/cable{ icon_state = "1-2" @@ -49043,6 +49336,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "xPn" = ( @@ -49271,8 +49565,7 @@ /area/science/xenobiology) "xUK" = ( /obj/machinery/door/airlock/maintenance{ - name = "Kitchen Maintenance"; - req_access_txt = "28" + name = "Kitchen Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -49292,6 +49585,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plating, /area/crew_quarters/kitchen) "xUO" = ( @@ -49518,8 +49812,7 @@ /area/hallway/primary/central) "xZU" = ( /obj/machinery/door/airlock/maintenance{ - name = "Hydroponics Maintenance"; - req_access_txt = "35" + name = "Hydroponics Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -49531,6 +49824,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plating, /area/maintenance/starboard/fore) "xZY" = ( @@ -49679,13 +49973,29 @@ "ydm" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ - name = "Kitchen Window"; - req_access_txt = "28" + name = "Kitchen Window" }, /obj/machinery/door/window/eastleft{ dir = 8; - name = "Hydroponics Window"; - req_one_access_txt = "35" + name = "Hydroponics Window" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/any/service/hydroponics{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/any/service/hydroponics{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/any/service/kitchen{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/any/service/kitchen{ + dir = 8 }, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) @@ -49826,8 +50136,7 @@ /area/hallway/primary/central) "ygu" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prisoner Processing"; - req_access_txt = "2" + name = "Prisoner Processing" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -49851,6 +50160,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/processing) "ygz" = ( @@ -74268,9 +74578,9 @@ vRP vRP vRP vRP -eAe +xsq hII -bOF +dHv qfO hRF tdd @@ -92575,7 +92885,7 @@ vvd vmy vvd qSn -nPi +uwC vvd atx pnP @@ -92832,7 +93142,7 @@ qub wcy lzE jWH -lzE +vZA oAE nVD kMw @@ -93089,7 +93399,7 @@ mPt vvd vvd xus -vvd +vdy rRY atx pnP @@ -93814,7 +94124,7 @@ kxF mLh lWI kxF -gyj +kxF fpk kxF nsC @@ -94890,7 +95200,7 @@ rrI faQ btB wYh -aAR +cQr aAR blt aAR @@ -95611,7 +95921,7 @@ mfB vTL lRx taE -xRw +gyj iLQ xgP faH @@ -95910,7 +96220,7 @@ ajU dfE aLl aLl -xut +njz iNf xut aLl diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm index c858aaa01b93..3647c50c36c7 100644 --- a/_maps/map_files/IceMeta/IceMeta.dmm +++ b/_maps/map_files/IceMeta/IceMeta.dmm @@ -44,8 +44,7 @@ }, /obj/machinery/door/window/eastright{ dir = 2; - name = "Research and Development Desk"; - req_one_access_txt = "7;29" + name = "Research and Development Desk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "research_shutters"; @@ -60,7 +59,8 @@ pixel_y = 7 }, /obj/item/storage/pencil_holder/crew, -/turf/open/floor/plasteel/white, +/obj/effect/mapping_helpers/windoor/access/all/science/general, +/turf/open/floor/plating, /area/science/lab) "aaU" = ( /turf/open/floor/plasteel, @@ -85,13 +85,13 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/effect/turf_decal/siding/wideplating, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva) "abl" = ( @@ -129,7 +129,8 @@ /obj/machinery/button/door{ id = "telelab"; name = "Test Chamber Blast Doors"; - pixel_x = 23 + pixel_x = 23; + req_access = list("experimentation") }, /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -174,14 +175,15 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "aci" = ( @@ -477,11 +479,16 @@ }, /obj/machinery/door/window/brigdoor{ dir = 4; - name = "Security Desk"; - req_access_txt = "1" + name = "Security Desk" }, /obj/item/folder/red, /obj/item/pen, +/obj/effect/mapping_helpers/windoor/access/any/security/detective{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/any/security/general{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "agB" = ( @@ -531,9 +538,7 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "ahm" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "7;47;29;12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -543,6 +548,8 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/department/science/central) "ahq" = ( @@ -666,8 +673,7 @@ /area/maintenance/starboard/fore) "ajG" = ( /obj/machinery/door/airlock/command{ - name = "Council Chamber"; - req_access_txt = "19" + name = "Council Chamber" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -681,6 +687,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "ajK" = ( @@ -737,6 +744,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "akG" = ( @@ -860,8 +868,7 @@ /area/medical/virology) "anA" = ( /obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" + name = "Supply Dock Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -878,6 +885,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/quartermaster/storage) "anH" = ( @@ -960,6 +968,7 @@ /obj/structure/disposalpipe/junction/yjunction{ dir = 2 }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/port/fore) "aoB" = ( @@ -1263,7 +1272,7 @@ id = "detective_shutters"; name = "detective's office shutters control"; pixel_y = 26; - req_access_txt = "4" + req_access = list("detective") }, /obj/machinery/computer/security/wooden_tv{ pixel_x = 3; @@ -1527,8 +1536,7 @@ /area/library) "axC" = ( /obj/machinery/door/airlock/maintenance{ - name = "Storage Room"; - req_access_txt = "12" + name = "Storage Room" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -1536,6 +1544,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "axG" = ( @@ -1686,8 +1695,7 @@ /area/quartermaster/miningoffice) "azL" = ( /obj/machinery/door/airlock/maintenance{ - name = "Hydroponics Maintenance"; - req_access_txt = "35" + name = "Hydroponics Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -1695,6 +1703,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/maintenance/starboard) "azU" = ( @@ -1786,7 +1795,7 @@ /obj/structure/closet/crate/secure/weapon{ desc = "A secure clothing crate."; name = "formal uniform crate"; - req_access_txt = "3" + req_access = list("armory") }, /obj/item/clothing/under/rank/security/navyblue, /obj/item/clothing/under/rank/security/navyblue, @@ -1857,8 +1866,7 @@ /area/medical/virology) "aBu" = ( /obj/machinery/door/airlock{ - name = "Theatre Backstage"; - req_access_txt = "46" + name = "Theatre Backstage" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -1866,12 +1874,12 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /turf/open/floor/wood, /area/crew_quarters/theatre) "aBJ" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Isolation B"; - req_access_txt = "39" + name = "Isolation B" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1885,6 +1893,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/freezer, /area/medical/virology) "aCc" = ( @@ -2082,9 +2091,9 @@ /area/security/prison/hallway) "aFd" = ( /obj/machinery/door/window/southleft{ - name = "Court Cell"; - req_access_txt = "2" + name = "Court Cell" }, +/obj/effect/mapping_helpers/windoor/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/courtroom) "aFm" = ( @@ -2211,21 +2220,21 @@ "aGD" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/mining{ - name = "Cargo Bay"; - req_one_access_txt = "48;50" + name = "Cargo Bay" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/office) "aHc" = ( -/obj/structure/stairs/goon/wide/right{ +/obj/effect/turf_decal/ramp_middle{ dir = 1 }, -/obj/effect/turf_decal/ramp_middle{ +/obj/structure/stairs/wide_right{ dir = 1 }, /turf/open/floor/plating, @@ -2489,6 +2498,9 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/department/medical/central) "aLx" = ( @@ -2743,9 +2755,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/engineering/glass{ - name = "SMES Foyer"; - req_access_txt = "32" + name = "SMES Foyer" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engine_smes) "aPt" = ( @@ -2830,7 +2842,7 @@ id = "xenobio2"; name = "Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/structure/window/reinforced{ dir = 1 @@ -2845,8 +2857,7 @@ /area/science/xenobiology) "aQK" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_one_access_txt = "48;50" + name = "Cargo Office" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -2864,6 +2875,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/office) "aQN" = ( @@ -2874,8 +2886,7 @@ dir = 4 }, /obj/machinery/door/airlock/command{ - name = "Chief Medical Officer's Office"; - req_access_txt = "40" + name = "Chief Medical Officer's Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -2898,6 +2909,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/cmo) "aQV" = ( @@ -2905,6 +2917,9 @@ /obj/machinery/airalarm{ pixel_y = 24 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/wood, /area/crew_quarters/bar) "aQX" = ( @@ -3080,10 +3095,14 @@ }, /obj/machinery/door/window/westright{ dir = 2; - name = "Hydroponics Desk"; - req_access_txt = "35" + name = "Hydroponics Desk" }, -/turf/open/floor/plasteel, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics, +/turf/open/floor/plating, /area/hydroponics) "aTa" = ( /obj/item/storage/secure/safe{ @@ -3455,8 +3474,7 @@ /obj/machinery/door/window/westleft{ dir = 4; name = "Infirmary"; - red_alert_access = 1; - req_access_txt = "5" + red_alert_access = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -3467,6 +3485,9 @@ /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/security/brig_phys{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/security/brig) "aYI" = ( @@ -3533,8 +3554,7 @@ /area/hallway/primary/fore) "aZO" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mailroom"; - req_one_access_txt = "50" + name = "Mailroom" }, /obj/effect/turf_decal/delivery, /obj/structure/cable/yellow{ @@ -3555,6 +3575,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/sorting) "aZX" = ( @@ -3662,7 +3683,7 @@ name = "Warehouse Door Control"; pixel_x = 24; pixel_y = 28; - req_access_txt = "48" + req_access = list("cargo") }, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) @@ -3883,14 +3904,39 @@ autoclose = 0; heat_proof = 1; id_tag = "toxins_airlock_interior"; - name = "Mixing Room Interior Airlock"; - req_access_txt = "8" + name = "Mixing Room Interior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/engine, /area/science/mixing/chamber) +"bfu" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "MiniSat Maintenance" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/storage/satellite) "bfH" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=10.1-Central-from-Aft"; @@ -3963,7 +4009,7 @@ name = "Loading Doors"; pixel_x = -27; pixel_y = -5; - req_access_txt = "31" + req_access = list("cargo_bay") }, /obj/machinery/button/door{ id = "QMLoaddoor2"; @@ -3971,7 +4017,7 @@ name = "Loading Doors"; pixel_x = -27; pixel_y = 5; - req_access_txt = "31" + req_access = list("cargo_bay") }, /obj/machinery/computer/cargo{ dir = 4 @@ -4037,13 +4083,13 @@ /area/medical/sleeper) "bhX" = ( /obj/machinery/door/airlock/security{ - name = "Court Cell"; - req_access_txt = "63" + name = "Court Cell" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/brig) "bhZ" = ( @@ -4336,15 +4382,14 @@ /turf/open/floor/plasteel, /area/crew_quarters/dorms) "bmf" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "bmh" = ( @@ -4433,8 +4478,7 @@ /area/maintenance/starboard/aft) "boa" = ( /obj/machinery/door/airlock/maintenance{ - name = "Toxins Lab Maintenance"; - req_access_txt = "8" + name = "Toxins Lab Maintenance" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "toxins_blastdoor"; @@ -4446,6 +4490,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/science/toxins, /turf/open/floor/plating, /area/maintenance/starboard/aft) "bog" = ( @@ -4559,8 +4604,7 @@ /area/science/research) "bqh" = ( /obj/machinery/door/airlock/external{ - name = "MiniSat Space Access Airlock"; - req_one_access_txt = "65;19" + name = "MiniSat Space Access Airlock" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 @@ -4568,6 +4612,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plating, /area/aisat) "bqD" = ( @@ -4722,8 +4767,7 @@ /area/hallway/secondary/entry) "btb" = ( /obj/machinery/door/airlock/maintenance{ - name = "Cargo Bay Maintenance"; - req_one_access_txt = "31;48" + name = "Cargo Bay Maintenance" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -4734,17 +4778,19 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plating, /area/maintenance/port/fore) "btq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/corner{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/port/fore) +/area/maintenance/port/aft) "btz" = ( /obj/structure/table, /obj/item/storage/box/bodybags{ @@ -4774,9 +4820,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -4792,6 +4836,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, /area/maintenance/starboard/fore) "btW" = ( @@ -5046,8 +5092,7 @@ /area/crew_quarters/bar) "byR" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mailroom Maintenance"; - req_access_txt = "50" + name = "Mailroom Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -5058,6 +5103,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plating, /area/maintenance/port/fore) "byY" = ( @@ -5079,6 +5125,9 @@ /obj/machinery/light_switch{ pixel_y = 24 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/wood, /area/crew_quarters/bar) "bzh" = ( @@ -5161,12 +5210,13 @@ /area/hallway/secondary/entry) "bAk" = ( /obj/machinery/door/airlock/public/glass{ - name = "space-bridge access" + name = "External-Bridge Access" }, /obj/machinery/button/door{ id = "supplybridge"; - name = "Shuttle Bay Space Bridge Control"; - pixel_y = 27 + name = "Shuttle Bay External Bridge Control"; + pixel_y = 27; + req_access = list("external_airlocks") }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -5180,6 +5230,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "bAE" = ( @@ -5492,6 +5545,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base, /turf/open/floor/plating, /area/construction/mining/aux_base) "bFu" = ( @@ -5624,6 +5678,13 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/door/window/northright{ + dir = 8; + name = "delivery door" + }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/maintenance{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "bHp" = ( @@ -5739,8 +5800,7 @@ dir = 4 }, /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 1 @@ -5749,6 +5809,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "bJa" = ( @@ -5918,12 +5979,14 @@ "bLp" = ( /obj/machinery/door/window{ dir = 4; - name = "Mass Driver"; - req_access_txt = "22" + name = "Mass Driver" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/chapel/main) "bLt" = ( @@ -5931,8 +5994,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/engineering{ - name = "Starboard Bow Solar Access"; - req_access_txt = "10" + name = "Starboard Bow Solar Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor/border_only{ @@ -5940,6 +6002,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "bLw" = ( @@ -5969,8 +6032,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/research{ - name = "Toxins Lab"; - req_access_txt = "8" + name = "Toxins Lab" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "toxins_blastdoor"; @@ -5992,6 +6054,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel, /area/science/mixing) "bMl" = ( @@ -6199,8 +6262,7 @@ /area/engine/atmos/distro) "bPr" = ( /obj/machinery/door/airlock/command{ - name = "Council Chamber"; - req_access_txt = "19" + name = "Council Chamber" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -6212,6 +6274,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "bPD" = ( @@ -6377,8 +6440,7 @@ /area/medical/virology) "bRV" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics Monitoring"; - req_access_txt = "24" + name = "Atmospherics Monitoring" }, /obj/machinery/door/firedoor/border_only, /obj/structure/cable/yellow{ @@ -6398,18 +6460,21 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/distro) "bRZ" = ( /obj/machinery/light/small{ dir = 1 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/starboard) "bSj" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Mining Station Atmospherics"; - req_access_txt = "48" + name = "Mining Station Atmospherics" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -6417,6 +6482,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark/side{ dir = 8 }, @@ -6875,8 +6941,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/security/glass{ id_tag = "innerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -6885,6 +6950,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "bZt" = ( @@ -7003,8 +7069,7 @@ /area/hallway/primary/fore) "cbV" = ( /obj/machinery/door/airlock/security/glass{ - name = "Firing Range"; - req_one_access_txt = "1;4" + name = "Firing Range" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -7024,6 +7089,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/range) "cbY" = ( @@ -7144,6 +7211,7 @@ icon_state = "1-2" }, /obj/effect/spawner/lootdrop/maintenance, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/maintenance/port/fore) "cdr" = ( @@ -7202,14 +7270,13 @@ /area/maintenance/port) "cfs" = ( /obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Airlock" }, /obj/machinery/button/door{ id = "prison release"; name = "Labor Camp Shuttle Lockdown"; pixel_y = -25; - req_access_txt = "2" + req_access = list("brig") }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -7220,6 +7287,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/brig) "cfz" = ( @@ -7352,12 +7420,12 @@ /area/science/mixing) "chk" = ( /obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "1" + name = "Security External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/security/prison/hallway) "chl" = ( @@ -7404,7 +7472,8 @@ /obj/machinery/button/door{ id = "cmoprivacy"; name = "Privacy Shutters Control"; - pixel_x = -26 + pixel_x = -26; + req_access = list("medical") }, /obj/machinery/computer/operating{ dir = 4 @@ -7648,14 +7717,14 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva_secondary) "ckU" = ( @@ -7679,8 +7748,10 @@ /obj/effect/turf_decal/delivery, /obj/machinery/door/window/eastright{ dir = 1; - name = "Kitchen Delivery"; - req_access_txt = "28" + name = "Kitchen Delivery" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/kitchen{ + dir = 1 }, /turf/open/floor/plasteel{ dir = 1 @@ -7739,6 +7810,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_sat, /turf/open/floor/plasteel/dark, /area/aisat) "cmC" = ( @@ -7848,6 +7920,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/department/science/central) "coD" = ( @@ -7969,8 +8043,7 @@ /area/science/research) "crH" = ( /obj/machinery/door/airlock/command{ - name = "Captain's Quarters"; - req_access_txt = "20" + name = "Captain's Quarters" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -7990,6 +8063,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain/private) "crJ" = ( @@ -8110,8 +8184,7 @@ /area/maintenance/port/fore) "ctK" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_one_access_txt = "1;4" + name = "Security Office" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -8128,6 +8201,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/main) "cuc" = ( @@ -8269,14 +8344,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "20;12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "cvV" = ( @@ -8309,8 +8383,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/research{ - name = "Xenobiology Lab"; - req_access_txt = "47" + name = "Xenobiology Lab" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -8323,6 +8396,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/white, /area/science/xenobiology) "cwq" = ( @@ -8361,17 +8435,24 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"cxT" = ( +"cwR" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/effect/turf_decal/stripes/corner{ + dir = 4 }, -/turf/open/floor/plating{ - icon_state = "panelscorched" +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"cxT" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/area/maintenance/port) +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "cyj" = ( /obj/effect/turf_decal/plaque{ icon_state = "L4" @@ -8415,9 +8496,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -8433,6 +8512,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, /area/maintenance/starboard/fore) "czm" = ( @@ -8562,13 +8643,13 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - name = "Chapel Office Maintenance"; - req_one_access_txt = "22" + name = "Chapel Office Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plating, /area/maintenance/aft) "cBL" = ( @@ -8765,6 +8846,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "cEw" = ( @@ -8802,13 +8884,12 @@ /area/maintenance/port/fore) "cEJ" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;63;48;50" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "cFq" = ( @@ -8866,8 +8947,7 @@ /area/vacant_room/office) "cFV" = ( /obj/machinery/door/airlock/mining{ - name = "Cargo Bay"; - req_one_access_txt = "48;50" + name = "Cargo Bay" }, /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -8879,6 +8959,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/construction/storage_wing) "cGg" = ( @@ -9218,9 +9299,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ dir = 1 @@ -9424,8 +9502,7 @@ "cPq" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen #6"; - req_access_txt = "55" + name = "Containment Pen #6" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio6"; @@ -9440,6 +9517,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/engine, /area/science/xenobiology) "cPE" = ( @@ -9453,6 +9533,7 @@ dir = 4 }, /obj/machinery/space_heater, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/maintenance/port/fore) "cPS" = ( @@ -9629,8 +9710,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/security{ - name = "Security-Storage Backroom"; - req_access_txt = "63" + name = "Security-Storage Backroom" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -9644,6 +9724,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) "cTc" = ( @@ -9757,14 +9838,11 @@ }, /area/maintenance/port/fore) "cUk" = ( -/obj/machinery/door/morgue{ - name = "Private Study"; - req_access_txt = "37" - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/morgue/curator, /turf/open/floor/engine/cult, /area/library) "cUo" = ( @@ -10122,6 +10200,9 @@ /area/crew_quarters/heads/hor) "cZx" = ( /obj/machinery/chem_dispenser, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/wood, /area/medical/psych) "cZB" = ( @@ -10321,8 +10402,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/research{ - name = "Research and Development Lab"; - req_one_access_txt = "47" + name = "Research and Development Lab" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -10339,6 +10419,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/lab) "ddd" = ( @@ -10349,8 +10430,7 @@ /area/library) "ddi" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Dock Maintenance"; - req_access_txt = "48" + name = "Mining Dock Maintenance" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -10362,6 +10442,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plating, /area/maintenance/port/fore) "ddI" = ( @@ -10372,14 +10453,16 @@ layer = 3.1; name = "Toxins airlock control"; pixel_x = -24; - pixel_y = 24 + pixel_y = 24; + req_access = list("toxins") }, /obj/machinery/doorButtons/access_button{ idDoor = "toxins_airlock_exterior"; idSelf = "toxins_access_control"; name = "Toxins airlock control"; pixel_x = 24; - pixel_y = 24 + pixel_y = 24; + req_access = list("toxins") }, /turf/open/floor/engine, /area/science/mixing/chamber) @@ -10441,10 +10524,6 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "dfe" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Storage Room"; - req_access_txt = "12" - }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -10452,6 +10531,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Storage Room" + }, /turf/open/floor/plating, /area/maintenance/starboard) "dfv" = ( @@ -10490,10 +10572,10 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - name = "Labor Camp Maintenance"; - req_one_access_txt = "22" + name = "Labor Camp Maintenance" }, /obj/machinery/atmospherics/pipe/layer_manifold/visible, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/mine/laborcamp/security) "dge" = ( @@ -10510,6 +10592,9 @@ dir = 4 }, /obj/machinery/door/airlock/medical, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white, /area/mine/infirmary) "dgl" = ( @@ -10550,7 +10635,7 @@ name = "Engineering Secure Storage"; pixel_x = -24; pixel_y = -23; - req_access_txt = "11" + req_access = list("engine_equip") }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -10719,10 +10804,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock{ - name = "Service Hall"; - req_access_txt = "79" + name = "Service Hall" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/general, /turf/open/floor/plasteel, /area/hallway/secondary/service) "dko" = ( @@ -10831,21 +10916,31 @@ icon_state = "1-8" }, /obj/effect/landmark/blobstart, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/fore) "dma" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastright{ dir = 8; - name = "Genetics Desk"; - req_access_txt = "9" + name = "Genetics Desk" }, /obj/item/deskbell/preset/genetics{ pixel_x = 8; pixel_y = -3 }, -/obj/effect/turf_decal/tile/purple/fourcorners, -/turf/open/floor/plasteel/white, +/obj/effect/mapping_helpers/windoor/access/all/science/genetics{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plating, /area/medical/genetics) "dmh" = ( /obj/machinery/door/poddoor/preopen{ @@ -11188,9 +11283,6 @@ /turf/open/floor/plasteel/white, /area/science/research) "drz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -11291,8 +11383,7 @@ /area/security/prison) "dsR" = ( /obj/machinery/door/airlock/hatch{ - name = "MiniSat Foyer"; - req_one_access_txt = "65;19" + name = "MiniSat Foyer" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -11316,6 +11407,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/foyer) "dsX" = ( @@ -11427,8 +11521,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/virology/glass{ - name = "Containment Cells"; - req_access_txt = "39" + name = "Containment Cells" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -11445,6 +11538,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "dtY" = ( @@ -11539,8 +11633,7 @@ }, /obj/structure/window/reinforced, /obj/machinery/door/window/eastleft{ - name = "Mail"; - req_access_txt = "50" + name = "Mail" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -11571,13 +11664,13 @@ /area/aisat) "dvB" = ( /obj/machinery/door/airlock/security{ - name = "Court Cell"; - req_access_txt = "63" + name = "Court Cell" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/courtroom) "dvD" = ( @@ -11760,8 +11853,7 @@ dir = 8 }, /obj/machinery/door/airlock{ - name = "Hydroponics Backroom"; - req_access_txt = "35" + name = "Hydroponics Backroom" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -11774,6 +11866,7 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "dxf" = ( @@ -11981,7 +12074,7 @@ name = "Incinerator Access Console"; pixel_x = -25; pixel_y = -25; - req_one_access_txt = "12" + req_access = list("atmospherics") }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) @@ -12045,12 +12138,12 @@ dir = 10 }, /obj/machinery/door/window/southleft{ - name = "Cargo Disposal"; - req_one_access_txt = "50" + name = "Cargo Disposal" }, /obj/structure/window/reinforced{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/storage) "dBs" = ( @@ -12321,8 +12414,7 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Airlock" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 @@ -12330,6 +12422,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/mine/laborcamp) "dGp" = ( @@ -12579,8 +12672,7 @@ /area/security/warden) "dKO" = ( /obj/machinery/door/airlock/maintenance{ - name = "Brig Maintenance"; - req_one_access_txt = "63;12" + name = "Brig Maintenance" }, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -12594,6 +12686,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "dKS" = ( @@ -12618,16 +12711,16 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/mining{ - name = "Mining Office"; - req_access_txt = "48" + name = "Mining Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "dKX" = ( @@ -12752,8 +12845,7 @@ dir = 1 }, /obj/machinery/door/airlock/maintenance{ - name = "Disposal Conveyor Access"; - req_access_txt = "12" + name = "Disposal Conveyor Access" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -12761,6 +12853,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/disposal) "dMV" = ( @@ -12896,8 +12989,7 @@ /area/medical/psych) "dPS" = ( /obj/machinery/door/airlock/security{ - name = "Brig"; - req_access_txt = "63; 42" + name = "Courtroom" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -12905,6 +12997,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, /turf/open/floor/plasteel, /area/security/courtroom) "dPV" = ( @@ -12922,15 +13015,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;5;39;37;25;28" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "dQj" = ( @@ -12958,14 +13050,14 @@ dir = 8 }, /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, /obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 4 }, /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower, /obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/distro) "dQm" = ( @@ -13008,10 +13100,10 @@ /turf/open/floor/plasteel, /area/crew_quarters/locker) "dRf" = ( -/obj/structure/stairs/goon/wide/left{ +/obj/effect/turf_decal/ramp_middle{ dir = 1 }, -/obj/effect/turf_decal/ramp_middle{ +/obj/structure/stairs/wide_left{ dir = 1 }, /turf/open/floor/plating, @@ -13041,8 +13133,7 @@ /obj/machinery/door/window/northleft{ dir = 2; name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "5" + red_alert_access = 1 }, /obj/item/storage/firstaid/regular{ pixel_x = 6; @@ -13057,6 +13148,7 @@ pixel_x = -3; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general, /turf/open/floor/plasteel/dark, /area/medical/storage) "dRQ" = ( @@ -13243,6 +13335,9 @@ /area/medical/genetics) "dVd" = ( /obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "dVf" = ( @@ -13281,7 +13376,7 @@ name = "Warehouse Door Control"; pixel_x = -24; pixel_y = 28; - req_access_txt = "48" + req_access = list("cargo") }, /obj/effect/turf_decal/loading_area{ dir = 4 @@ -13582,8 +13677,7 @@ /obj/machinery/door/airlock/security{ aiControlDisabled = 1; id_tag = "prisonereducation"; - name = "Prisoner Education Chamber"; - req_access_txt = "3" + name = "Prisoner Education Chamber" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -13594,6 +13688,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/execution/education) "dZM" = ( @@ -13601,6 +13696,9 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/port) "eao" = ( @@ -13947,9 +14045,9 @@ dir = 8 }, /obj/machinery/door/window/brigdoor/southleft{ - name = "Filing Room"; - req_access_txt = "5" + name = "Filing Room" }, +/obj/effect/mapping_helpers/windoor/access/all/medical/psychology, /turf/open/floor/wood, /area/medical/psych) "egn" = ( @@ -13991,9 +14089,11 @@ dir = 1 }, /obj/machinery/door/airlock/medical/glass{ - name = "Infirmary"; - req_one_access_txt = "54;63" + name = "Infirmary" }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white, /area/mine/infirmary) "ehw" = ( @@ -14074,7 +14174,8 @@ name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_y = -25; - specialfunctions = 4 + specialfunctions = 4; + req_access = list("brig") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 @@ -14391,8 +14492,7 @@ /area/ai_monitored/turret_protected/ai) "eno" = ( /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload"; - req_access_txt = "16" + name = "AI Upload" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -14404,6 +14504,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "enq" = ( @@ -14672,7 +14773,7 @@ id = "council blast"; name = "Council Chamber Blast Door Control"; pixel_x = -28; - req_access_txt = "19" + req_access = list("command") }, /turf/open/floor/plasteel/dark, /area/bridge) @@ -14682,20 +14783,22 @@ id = "Prison Gate"; name = "Prison Wing Lockdown"; pixel_y = 7; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/door{ id = "Secure Gate"; name = "Cell Window Control"; pixel_x = -5; pixel_y = -3; - specialfunctions = 4 + specialfunctions = 4; + req_access = list("brig") }, /obj/machinery/button/door{ id = "briglockdown"; name = "Brig Lockdown Control"; pixel_x = 5; - pixel_y = -3 + pixel_y = -3; + req_access = list("brig") }, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -14828,8 +14931,7 @@ /area/solar/port/fore) "ete" = ( /obj/machinery/door/airlock/wood{ - name = "Psychiatrists office"; - req_access_txt = "5" + name = "Psychiatrists office" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -15027,8 +15129,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/virology{ - name = "Virology Access"; - req_access_txt = "39" + name = "Virology Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -15055,6 +15156,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "ewp" = ( @@ -15072,20 +15174,19 @@ /area/quartermaster/storage) "ewC" = ( /obj/machinery/door/airlock/maintenance{ - name = "Experimentation Lab Maintenance"; - req_one_access_txt = "8;70" + name = "Experimentation Lab Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/experimentation, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "ewK" = ( /obj/machinery/door/airlock/engineering{ - name = "Port Quarter Solar Access"; - req_access_txt = "10" + name = "Port Quarter Solar Access" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -15096,10 +15197,17 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "ewQ" = ( /obj/structure/closet/firecloset, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/central) "ewS" = ( @@ -15232,8 +15340,7 @@ /area/hallway/primary/starboard) "eyS" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_one_access_txt = "1;4" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -15242,6 +15349,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/main) "eyU" = ( @@ -15558,12 +15667,12 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva) "eEL" = ( @@ -15600,25 +15709,11 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "eFG" = ( -/obj/structure/closet/secure_closet{ - name = "psychiatrist locker"; - req_access_txt = "5" - }, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/mask/muzzle, -/obj/item/storage/pill_bottle/happiness, -/obj/item/storage/pill_bottle/dice, -/obj/item/storage/pill_bottle/happy{ - name = "happy pills bottle" - }, -/obj/item/storage/pill_bottle/lsd{ - name = "very happy pills bottle" - }, -/obj/item/storage/pill_bottle/psicodine, /obj/structure/window/reinforced/tinted{ dir = 8 }, /obj/effect/turf_decal/stripes/corner, +/obj/structure/closet/secure_closet/psych, /turf/open/floor/wood, /area/medical/psych) "eGr" = ( @@ -15721,7 +15816,7 @@ name = "Access Console"; pixel_x = -25; pixel_y = -25; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -15955,7 +16050,7 @@ name = "Bridge Access Blast Door Control"; pixel_x = -24; pixel_y = -24; - req_access_txt = "19" + req_access = list("command") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -16153,9 +16248,6 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "eOy" = ( @@ -16440,6 +16532,25 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"eUy" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/light_switch{ + pixel_x = -24; + pixel_y = -23 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ai_monitored/storage/satellite) "eUC" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -16741,6 +16852,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "fau" = ( @@ -16772,8 +16886,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ @@ -16782,6 +16895,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison/hallway) "faF" = ( @@ -17055,6 +17169,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "ffT" = ( @@ -17066,8 +17183,7 @@ /area/crew_quarters/heads/captain/private) "fgg" = ( /obj/machinery/door/airlock/engineering{ - name = "Telecomms Storage"; - req_access_txt = "61" + name = "Telecomms Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -17088,6 +17204,8 @@ dir = 1 }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tech_storage, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, /turf/open/floor/plasteel/dark/side{ dir = 8 }, @@ -17367,9 +17485,7 @@ /turf/open/floor/plating, /area/bridge) "fjl" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;5;39;6" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -17379,6 +17495,8 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plating, /area/maintenance/port/aft) "fjt" = ( @@ -17387,13 +17505,13 @@ /obj/machinery/door/window{ base_state = "right"; icon_state = "right"; - name = "Captain's Desk"; - req_access_txt = "20" + name = "Captain's Desk" }, /obj/structure/disposalpipe/segment, /obj/item/stamp/captain, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/windoor/access/all/command/captain, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "fju" = ( @@ -17553,8 +17671,7 @@ /area/science/xenobiology) "fml" = ( /obj/machinery/door/airlock/security/glass{ - name = "Brig Control"; - req_access_txt = "3" + name = "Brig Control" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -17566,6 +17683,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel, /area/security/warden) "fmn" = ( @@ -17627,8 +17745,7 @@ /area/maintenance/fore) "fmL" = ( /obj/machinery/door/airlock/security{ - name = "Evidence Storage"; - req_access_txt = "3" + name = "Evidence Storage" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -17642,6 +17759,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel/dark, /area/security/warden) "fmS" = ( @@ -17664,7 +17782,7 @@ id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_y = -24; - req_access_txt = "19" + req_access = list("command") }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -17783,6 +17901,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "foD" = ( @@ -17829,8 +17948,7 @@ /area/science/research) "fpu" = ( /obj/machinery/door/airlock/security{ - name = "Evidence Storage"; - req_one_access_txt = "1;4" + name = "Evidence Storage" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -17850,6 +17968,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel/dark, /area/security/warden) "fpx" = ( @@ -17934,9 +18054,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;47" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -17946,12 +18064,13 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/starboard/aft) "frI" = ( /obj/machinery/door/airlock/medical{ - name = "Locker Room"; - req_access_txt = "5" + name = "Locker Room" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -17962,6 +18081,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/storage/locker) "frV" = ( @@ -18076,8 +18196,7 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Core Modules"; - req_access_txt = "20" + name = "Core Modules" }, /obj/structure/window/reinforced, /obj/effect/spawner/lootdrop/aimodule_neutral, @@ -18086,6 +18205,9 @@ id = "AI"; pixel_y = 24 }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "fto" = ( @@ -18149,20 +18271,15 @@ /turf/open/floor/plating, /area/maintenance/fore) "fuF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "1-8" }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, -/area/maintenance/starboard/aft) +/area/maintenance/starboard) "fuT" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -18243,8 +18360,7 @@ /obj/machinery/door/window/northright{ dir = 2; name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "5" + red_alert_access = 1 }, /obj/item/storage/firstaid/regular{ pixel_x = 6; @@ -18262,6 +18378,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general, /turf/open/floor/plasteel/dark, /area/medical/storage) "fvW" = ( @@ -18371,6 +18488,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/prison/hallway) "fxN" = ( @@ -18445,8 +18563,7 @@ /area/ai_monitored/turret_protected/ai) "fyO" = ( /obj/machinery/door/airlock/medical{ - name = "Paramedic Staging Area"; - req_access_txt = "69" + name = "Paramedic Staging Area" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -18463,6 +18580,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plasteel/white, /area/medical/paramedic) "fyQ" = ( @@ -18549,8 +18667,7 @@ /area/hallway/primary/central) "fzp" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" + name = "Bridge" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ @@ -18560,6 +18677,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "fzs" = ( @@ -18578,7 +18696,7 @@ id = "xenobio8"; name = "Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -18650,7 +18768,7 @@ id = "research_shutters"; name = "research shutters control"; pixel_x = 28; - req_access_txt = "7" + req_access = list("science") }, /turf/open/floor/plasteel/white, /area/science/lab) @@ -18726,8 +18844,7 @@ icon_state = "4-8" }, /obj/machinery/door/window/brigdoor{ - name = "Command Desk"; - req_access_txt = "19" + name = "Command Desk" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -18736,6 +18853,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/warning/lower, +/obj/effect/mapping_helpers/windoor/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "fEr" = ( @@ -18752,13 +18870,13 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "fEF" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12;46" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/bar, /turf/open/floor/plating, /area/maintenance/starboard) "fEM" = ( @@ -18849,8 +18967,7 @@ }, /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -18859,6 +18976,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "fHo" = ( @@ -18955,21 +19073,19 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/trimline/yellow/filled/corner/lower{ +/obj/effect/turf_decal/stripes/corner{ dir = 1 }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "fIf" = ( -/obj/machinery/door/poddoor{ - id = "Podbaydoor"; - name = "Wilderness Access" +/obj/effect/turf_decal/stripes/corner{ + dir = 4 }, -/obj/structure/fans/tiny{ - resistance_flags = 115 +/turf/open/floor/plating{ + icon_state = "panelscorched" }, -/turf/open/floor/engine, -/area/escapepodbay) +/area/maintenance/port) "fIm" = ( /obj/item/crowbar, /turf/open/floor/plating{ @@ -19139,9 +19255,9 @@ icon_state = "1-2" }, /obj/machinery/door/window{ - name = "HoP's Desk"; - req_access_txt = "57" + name = "HoP's Desk" }, +/obj/effect/mapping_helpers/windoor/access/all/service/hop, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "fKY" = ( @@ -19333,8 +19449,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "CMO Maintenance"; - req_access_txt = "40" + name = "CMO's Office Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -19345,6 +19460,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, /turf/open/floor/plating, /area/maintenance/department/medical/central) "fNt" = ( @@ -19364,6 +19480,9 @@ pixel_y = -4 }, /obj/item/stack/sheet/metal/fifty, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "fNF" = ( @@ -19591,13 +19710,11 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/port) "fQZ" = ( /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -19608,6 +19725,8 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "fRa" = ( @@ -19728,7 +19847,8 @@ idSelf = "incinerator_access_control"; name = "Incinerator airlock control"; pixel_x = -22; - pixel_y = 22 + pixel_y = 22; + req_access = list("atmospherics") }, /obj/machinery/doorButtons/access_button{ idDoor = "incinerator_airlock_interior"; @@ -19736,7 +19856,8 @@ layer = 3.1; name = "Incinerator airlock control"; pixel_x = -22; - pixel_y = -21 + pixel_y = -21; + req_access = list("atmospherics") }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -19766,9 +19887,7 @@ /turf/closed/wall, /area/maintenance/port/aft) "fSQ" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -19776,6 +19895,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore) "fSW" = ( @@ -19794,6 +19914,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating{ icon_state = "platingdmg2" }, @@ -19938,8 +20061,7 @@ pixel_y = 9 }, /obj/machinery/door/window/eastright{ - name = "Chemistry Desk"; - req_access_txt = "5; 33" + name = "Chemistry Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -19951,7 +20073,10 @@ id = "chemistry_shutters"; name = "chemistry shutters" }, -/turf/open/floor/plasteel/white, +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry{ + dir = 4 + }, +/turf/open/floor/plating, /area/medical/chemistry) "fVS" = ( /obj/machinery/status_display/evac{ @@ -20286,10 +20411,7 @@ /turf/open/floor/plasteel, /area/hydroponics) "fZI" = ( -/obj/structure/closet/secure_closet{ - name = "contraband locker"; - req_access_txt = "3" - }, +/obj/structure/closet/secure_closet/contraband/armory, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "fZJ" = ( @@ -20319,8 +20441,7 @@ /area/crew_quarters/fitness/recreation) "gax" = ( /obj/machinery/door/airlock/command{ - name = "Captain's Quarters"; - req_access_txt = "20" + name = "Captain's Quarters" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -20330,16 +20451,19 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain/private) "gay" = ( /obj/machinery/door/window/eastleft{ base_state = "right"; icon_state = "right"; - name = "Deliveries"; - req_access_txt = "50" + name = "Deliveries" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/supply/general{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/sorting) "gaz" = ( @@ -20348,16 +20472,9 @@ /turf/open/floor/plasteel, /area/engine/atmos/distro) "gaF" = ( -/obj/structure/chair/office/dark, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/mob/living/simple_animal/crab/kreb{ - desc = "Here to lay down the hard claws of the law!"; - health = 50; - name = "Officer Kreb"; - real_name = "Officer Kreb" - }, /turf/open/floor/plasteel, /area/security/checkpoint/customs) "gbd" = ( @@ -20442,8 +20559,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/research/glass{ - name = "Robotics Lab"; - req_one_access_txt = "29;75" + name = "Robotics Lab" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -20451,6 +20567,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/science/robotics/mechbay) "gct" = ( @@ -20478,16 +20595,14 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "gdg" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Disposal Conveyor Access"; - req_access_txt = "12" - }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/effect/decal/cleanable/oil, /obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/port/fore) "gdm" = ( @@ -20792,9 +20907,9 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Medbay Security Post"; - req_access_txt = "63" + name = "Medbay Security Post" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/medical) "ghU" = ( @@ -20923,8 +21038,7 @@ "gjp" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -20939,16 +21053,15 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel{ dir = 1 }, /area/engine/engineering) "gjB" = ( /obj/machinery/door/airlock/public/glass{ - name = "Auxiliary Tool Storage"; - req_access_txt = "12" + name = "Auxiliary Tool Storage" }, -/obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/border_only{ @@ -20961,6 +21074,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plasteel, /area/storage/tools) "gjC" = ( @@ -21485,6 +21599,9 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "grl" = ( @@ -21522,6 +21639,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/port) "grK" = ( @@ -21576,14 +21694,14 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating{ icon_state = "panelscorched" }, /area/maintenance/port/fore) "gsL" = ( /obj/machinery/door/airlock/public/glass{ - name = "Chapel Office"; - req_access_txt = "22" + name = "Chapel Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -21591,6 +21709,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/office) "gsZ" = ( @@ -21600,14 +21719,14 @@ name = "Engineering Lockdown"; pixel_x = -24; pixel_y = -5; - req_access_txt = "10" + req_access = list("engineering") }, /obj/machinery/button/door{ id = "atmos"; name = "Atmospherics Lockdown"; pixel_x = -24; pixel_y = 5; - req_access_txt = "24" + req_access = list("engineering") }, /obj/machinery/light{ dir = 8 @@ -21765,9 +21884,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -21837,6 +21953,9 @@ /area/engine/atmos/distro) "gwH" = ( /obj/machinery/door/window/westright, +/obj/effect/mapping_helpers/windoor/access/all/command/captain{ + dir = 8 + }, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "gwV" = ( @@ -21877,13 +21996,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;22;25;37;38;46;70" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard) "gxI" = ( @@ -21929,7 +22047,7 @@ name = "Mech Bay Door Control"; pixel_x = 26; pixel_y = 6; - req_one_access_txt = "29;75" + req_access = list("robotics") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 @@ -21981,14 +22099,11 @@ /turf/open/floor/plasteel, /area/quartermaster/warehouse) "gyB" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/effect/turf_decal/stripes/corner{ + dir = 1 }, /turf/open/floor/plating, -/area/maintenance/starboard/aft) +/area/maintenance/starboard/secondary) "gyE" = ( /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower, /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom, @@ -22091,7 +22206,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/vacant_room/commissary) "gAa" = ( /obj/structure/closet/l3closet/virology, @@ -22516,8 +22631,7 @@ dir = 8 }, /obj/machinery/door/airlock/external{ - name = "MiniSat Space Access Airlock"; - req_one_access_txt = "65;19" + name = "MiniSat Space Access Airlock" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -22530,6 +22644,7 @@ pixel_x = 1; pixel_y = 32 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plating, /area/aisat) "gHr" = ( @@ -22563,8 +22678,7 @@ /area/hallway/secondary/exit/departure_lounge) "gHu" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Test Subject Cell"; - req_access_txt = "39" + name = "Test Subject Cell" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -22581,6 +22695,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/freezer, /area/medical/virology) "gIf" = ( @@ -22606,7 +22721,7 @@ name = "robotics shutters control"; pixel_x = -26; pixel_y = 26; - req_one_access_txt = "29;75" + req_access = list("robotics") }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -23343,8 +23458,7 @@ dir = 4 }, /obj/machinery/door/airlock/mining/glass{ - name = "Quartermaster"; - req_access_txt = "41" + name = "Quartermaster" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -23358,6 +23472,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, /turf/open/floor/plasteel, /area/quartermaster/qm) "gSh" = ( @@ -23500,8 +23615,7 @@ /area/quartermaster/storage) "gTY" = ( /obj/machinery/door/airlock/medical{ - name = "Locker Room"; - req_access_txt = "5" + name = "Locker Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -23512,6 +23626,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/storage/locker) "gUe" = ( @@ -23590,21 +23705,22 @@ id = "secentranceflasher"; name = "Brig Entrance Flash Control"; pixel_x = -24; - pixel_y = 24; - req_access_txt = "1" + pixel_y = 24 }, /obj/machinery/button/door{ id = "Secure Gate"; name = "Cell Window Control"; pixel_x = 5; pixel_y = 27; - specialfunctions = 4 + specialfunctions = 4; + req_access = list("security") }, /obj/machinery/button/door{ id = "briglockdown"; name = "Brig Lockdown Control"; pixel_x = 5; - pixel_y = 37 + pixel_y = 37; + req_access = list("security") }, /obj/machinery/light/small{ dir = 1 @@ -23616,7 +23732,7 @@ normaldoorcontrol = 1; pixel_x = -5; pixel_y = 37; - req_access_txt = "63" + req_access = list("security") }, /obj/machinery/button/door{ desc = "A remote control switch for the medbay foyer."; @@ -23625,7 +23741,7 @@ normaldoorcontrol = 1; pixel_x = -5; pixel_y = 27; - req_access_txt = "63" + req_access = list("security") }, /turf/open/floor/plasteel/dark, /area/security/brig) @@ -23636,15 +23752,14 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/aft) "gUW" = ( @@ -23695,8 +23810,7 @@ /area/aisat) "gVE" = ( /obj/machinery/door/airlock/medical{ - name = "Medbay Break Room"; - req_access_txt = "5" + name = "Medbay Break Room" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -23717,6 +23831,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -24046,10 +24161,6 @@ /turf/open/floor/wood, /area/library) "haO" = ( -/obj/machinery/door/airlock{ - name = "Theatre Stage"; - req_one_access_txt = "12;46" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -24059,6 +24170,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/airlock/maintenance{ + name = "Theatre Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/theatre, /turf/open/floor/plating, /area/maintenance/starboard) "haS" = ( @@ -24079,6 +24195,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "hbq" = ( @@ -24161,7 +24280,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -23; pixel_y = -24; - req_one_access_txt = "30;70" + req_access = list("ai_sat") }, /obj/machinery/doorButtons/access_button{ idDoor = "secondary_aicore_interior"; @@ -24169,7 +24288,7 @@ name = "Secondary AI Core Access Button"; pixel_x = 23; pixel_y = 23; - req_one_access_txt = "30;70" + req_access = list("ai_sat") }, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) @@ -24298,11 +24417,11 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/machinery/door/airlock/research/glass{ - name = "Secondary AI Core"; - normalspeed = 0; - req_one_access_txt = "47;70" +/obj/machinery/door/airlock/command/glass{ + id_tag = "secondary_aicore_exterior"; + name = "AI Networking" }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel, /area/ai_monitored/secondarydatacore) "hfk" = ( @@ -24374,15 +24493,11 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "hgm" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/effect/turf_decal/stripes/corner{ - dir = 1 + dir = 8 }, /turf/open/floor/plating, -/area/ai_monitored/storage/satellite) +/area/maintenance/starboard) "hgt" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -24409,8 +24524,7 @@ /area/crew_quarters/fitness/recreation) "hgX" = ( /obj/machinery/door/airlock/medical{ - name = "Paramedic Staging Area"; - req_access_txt = "69" + name = "Paramedic Staging Area" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -24425,6 +24539,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plasteel/white, /area/medical/paramedic) "hhc" = ( @@ -24463,9 +24578,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/aft) "hhy" = ( @@ -24546,7 +24660,7 @@ name = "Toxins Mixing Room Access Console"; pixel_x = -24; pixel_y = 8; - req_one_access_txt = "8" + req_access = list("toxins") }, /turf/open/floor/plasteel/white, /area/science/mixing) @@ -25131,14 +25245,14 @@ /area/mine/maintenance) "htl" = ( /obj/machinery/door/airlock/maintenance{ - name = "Vacant Office Maintenance"; - req_access_txt = "32" + name = "Vacant Office Maintenance" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/plating, /area/maintenance/port) "htp" = ( @@ -25288,8 +25402,7 @@ }, /obj/machinery/door/airlock/medical/glass{ id_tag = "CloningDoor"; - name = "Cloning Lab"; - req_access_txt = "5; 68" + name = "Cloning Lab" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -25313,6 +25426,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cloning, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "hvt" = ( @@ -25482,13 +25596,13 @@ /area/mine/maintenance) "hxE" = ( /obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_one_access_txt = "27" + name = "Crematorium Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plating, /area/maintenance/aft) "hxH" = ( @@ -25684,7 +25798,8 @@ id = "cmoprivacy"; name = "Privacy Shutters Control"; pixel_x = 26; - pixel_y = 4 + pixel_y = 4; + req_access = list("medical") }, /obj/machinery/camera{ c_tag = "CMO's Office"; @@ -25701,8 +25816,7 @@ /area/security/checkpoint/customs) "hBi" = ( /obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance"; - req_one_access_txt = "1;4" + name = "Security Maintenance" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -25712,6 +25826,8 @@ }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plating, /area/maintenance/fore) "hBk" = ( @@ -25769,6 +25885,13 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/department/science/central) +"hCo" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard) "hCu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -25851,18 +25974,20 @@ /turf/open/floor/plasteel/white/corner, /area/quartermaster/sorting) "hDE" = ( -/obj/machinery/door/window/eastleft{ - req_access_txt = "48" - }, -/obj/machinery/door/window/westleft{ - req_access_txt = "48" - }, +/obj/machinery/door/window/eastleft, +/obj/machinery/door/window/westleft, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/supply/mining_station{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/all/supply/mining_station{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/mine/maintenance) "hDS" = ( @@ -26183,13 +26308,11 @@ /area/escapepodbay) "hIK" = ( /obj/machinery/door/window/brigdoor{ - name = "Justice Chamber"; - req_access_txt = "3" + name = "Justice Chamber" }, /obj/machinery/door/window/brigdoor{ dir = 1; - name = "Justice Chamber"; - req_access_txt = "3" + name = "Justice Chamber" }, /obj/machinery/door/poddoor/preopen{ id = "executionfireblast" @@ -26201,6 +26324,10 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/security/brig, +/obj/effect/mapping_helpers/windoor/access/all/security/brig{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/security/execution/education) "hIL" = ( @@ -26275,8 +26402,7 @@ "hJq" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -26293,6 +26419,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel{ dir = 1 }, @@ -26325,9 +26452,7 @@ /turf/open/floor/carpet, /area/crew_quarters/heads/hop) "hJK" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;27;37" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -26338,6 +26463,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "hJW" = ( @@ -26622,8 +26748,7 @@ /area/security/range) "hOw" = ( /obj/machinery/door/window/southleft{ - name = "Maximum Security Test Chamber"; - req_access_txt = "55" + name = "Maximum Security Test Chamber" }, /obj/machinery/door/poddoor/preopen{ id = "Xenolab"; @@ -26636,6 +26761,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio, /turf/open/floor/engine, /area/science/xenobiology) "hOH" = ( @@ -26741,15 +26867,14 @@ /turf/open/floor/carpet, /area/crew_quarters/bar) "hPY" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;27;37" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "hQf" = ( @@ -26871,7 +26996,7 @@ /obj/item/radio/intercom{ pixel_x = -29 }, -/obj/effect/turf_decal/trimline/yellow/filled/corner/lower{ +/obj/effect/turf_decal/stripes/corner{ dir = 8 }, /turf/open/floor/plasteel, @@ -27210,9 +27335,6 @@ /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -27273,8 +27395,7 @@ /area/bridge) "ibA" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -27282,6 +27403,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/mine/living_quarters) "ibB" = ( @@ -27976,8 +28098,7 @@ /area/security/brig) "inY" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Maintenance"; - req_access_txt = "12;24" + name = "Atmospherics Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -27988,6 +28109,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/port/fore) "ioh" = ( @@ -28123,7 +28245,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/vacant_room/commissary) "iqo" = ( /obj/structure/cable/yellow{ @@ -28188,7 +28310,7 @@ }, /obj/machinery/door/poddoor{ id = "Podbaydoor"; - name = "Wilderness Access" + name = "Shipbreaking External Access" }, /turf/open/floor/engine, /area/escapepodbay) @@ -28235,8 +28357,7 @@ base_state = "right"; dir = 8; icon_state = "right"; - name = "Containment Pen #5"; - req_access_txt = "55" + name = "Containment Pen #5" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio1"; @@ -28251,6 +28372,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/engine, /area/science/xenobiology) "irC" = ( @@ -28315,20 +28439,19 @@ /area/mine/break_room) "ise" = ( /obj/machinery/door/window{ - name = "Captain's Desk"; - req_access_txt = "20" + name = "Captain's Desk" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/windoor/access/all/command/captain, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "isi" = ( /obj/structure/table/glass, /obj/machinery/door/window/westleft{ dir = 1; - name = "First-Aid Supplies"; - req_access_txt = "5" + name = "First-Aid Supplies" }, /obj/structure/window/reinforced{ dir = 8 @@ -28349,6 +28472,9 @@ pixel_x = -1; pixel_y = -1 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/medical/storage) "isB" = ( @@ -28466,8 +28592,7 @@ /area/medical/morgue) "iuw" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Launch Room Access"; - req_access_txt = "8" + name = "Toxins Launch Room Access" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "toxins_blastdoor"; @@ -28486,6 +28611,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel, /area/maintenance/department/science) "iuy" = ( @@ -28602,6 +28728,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "ivv" = ( @@ -28889,7 +29016,7 @@ id = "xenobio6"; name = "Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/structure/table/reinforced, /obj/effect/turf_decal/stripes/line{ @@ -28963,8 +29090,7 @@ /area/hydroponics) "iAk" = ( /obj/machinery/door/airlock/atmos{ - name = "Tanks and Filtration"; - req_access_txt = "24" + name = "Tanks and Filtration" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -28986,6 +29112,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/distro) "iAo" = ( @@ -29319,8 +29446,7 @@ "iFF" = ( /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_interior"; - name = "Physical Core Access"; - req_one_access_txt = "30, 70" + name = "Networking Chamber Access" }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ @@ -29331,6 +29457,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) "iFQ" = ( @@ -29366,13 +29493,16 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;47" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/department/science) "iFX" = ( @@ -29605,9 +29735,9 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Maintenance"; - req_access_txt = "24" + name = "Atmospherics Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/starboard) "iJV" = ( @@ -29708,8 +29838,7 @@ /area/mine/eva) "iLX" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Infirmary"; - req_one_access_txt = "54;63" + name = "Infirmary" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -29726,6 +29855,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white/side{ dir = 4 }, @@ -29775,10 +29907,6 @@ /turf/closed/wall, /area/security/courtroom) "iMH" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Service Door"; - req_access_txt = "35;79" - }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -29790,6 +29918,10 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock{ + name = "Hydroponics" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "iMQ" = ( @@ -29886,7 +30018,8 @@ id = "Skynet_launch"; name = "Mech Bay Door Control"; pixel_x = -26; - pixel_y = 6 + pixel_y = 6; + req_access = list("robotics") }, /obj/machinery/light_switch{ pixel_x = -23; @@ -30096,9 +30229,7 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/locker) "iRj" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -30109,6 +30240,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "iRt" = ( @@ -30147,16 +30279,15 @@ "iRQ" = ( /obj/machinery/door/window/southright{ dir = 4; - name = "Engineering Deliveries"; - req_access_txt = "10" + name = "Engineering Deliveries" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/engineering/general{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/engineering) "iSc" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -30218,7 +30349,8 @@ /obj/machinery/button/door{ id = "chapel_shutters_parlour"; name = "chapel shutters control"; - pixel_y = -25 + pixel_y = -25; + req_access = list("chapel_office") }, /turf/open/floor/plasteel/dark, /area/chapel/main) @@ -30376,8 +30508,7 @@ base_state = "right"; dir = 8; icon_state = "right"; - name = "Containment Pen #3"; - req_access_txt = "55" + name = "Containment Pen #3" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio2"; @@ -30392,6 +30523,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/engine, /area/science/xenobiology) "iWt" = ( @@ -30464,9 +30598,7 @@ /turf/open/floor/plasteel, /area/mine/eva) "iXd" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;27;37" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -30474,6 +30606,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "iXu" = ( @@ -30807,8 +30940,7 @@ autoclose = 0; heat_proof = 1; id_tag = "toxins_airlock_exterior"; - name = "Mixing Room Exterior Airlock"; - req_access_txt = "8" + name = "Mixing Room Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -30819,6 +30951,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/engine, /area/science/mixing/chamber) "jbj" = ( @@ -30961,8 +31094,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/security{ - name = "Detective's Office"; - req_access_txt = "4" + name = "Detective's Office" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -30976,6 +31108,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/detective, /turf/open/floor/plasteel, /area/security/detectives_office) "jdM" = ( @@ -31004,8 +31137,7 @@ /area/chapel/main) "jer" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Desk"; - req_access_txt = "5" + name = "Medbay Desk" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -31019,6 +31151,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "jev" = ( @@ -31035,9 +31168,9 @@ /obj/machinery/door/window/westleft{ dir = 2; layer = 3.1; - name = "Cyborg Upload Console Window"; - req_access_txt = "16" + name = "Cyborg Upload Console Window" }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "jeO" = ( @@ -31108,13 +31241,12 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "jfW" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;27" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "jgd" = ( @@ -31229,8 +31361,7 @@ /area/mine/maintenance) "jhh" = ( /obj/machinery/door/airlock/security/glass{ - name = "Long-Term Cell 1"; - req_access_txt = "2" + name = "Long-Term Cell 1" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -31242,6 +31373,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "jhi" = ( @@ -31356,8 +31488,7 @@ dir = 4 }, /obj/machinery/door/airlock/grunge{ - name = "Morgue"; - req_access_txt = "5" + name = "Morgue" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -31374,6 +31505,7 @@ /obj/effect/turf_decal/trimline/blue/filled/end/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/plasteel/dark, /area/medical/morgue) "jju" = ( @@ -31417,8 +31549,7 @@ "jky" = ( /obj/machinery/button/flasher{ id = "holdingflash"; - pixel_y = -26; - req_access_txt = "1" + pixel_y = -26 }, /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/trimline/secred/filled/line/lower, @@ -31598,7 +31729,7 @@ name = "Secondary AI Core Access Console"; pixel_x = -24; pixel_y = -25; - req_one_access_txt = "30;70" + req_access = list("ai_sat") }, /obj/machinery/doorButtons/access_button{ idDoor = "secondary_aicore_interior"; @@ -31606,7 +31737,7 @@ name = "Secondary AI Core Access Button"; pixel_x = -33; pixel_y = -23; - req_one_access_txt = "30;70" + req_access = list("ai_sat") }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/secondarydatacore) @@ -31722,14 +31853,14 @@ /area/vacant_room/commissary) "jpE" = ( /obj/machinery/door/airlock/grunge{ - name = "Genetics"; - req_access_txt = "9" + name = "Genetics" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/trimline/purple/filled/end/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/medical/genetics) "jpL" = ( @@ -31871,9 +32002,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, @@ -32084,8 +32212,7 @@ name = "bridge blast door" }, /obj/machinery/door/airlock/command/glass{ - name = "Bridge Access"; - req_access_txt = "19" + name = "Bridge Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -32097,6 +32224,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "jtL" = ( @@ -32110,7 +32238,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ dir = 8 }, @@ -32243,10 +32370,10 @@ /turf/open/floor/plasteel/vaporwave, /area/storage/art) "jvC" = ( -/obj/structure/stairs/goon/wide/right{ +/obj/effect/turf_decal/ramp_middle{ dir = 1 }, -/obj/effect/turf_decal/ramp_middle{ +/obj/structure/stairs/wide_right{ dir = 1 }, /turf/open/floor/plating, @@ -32331,6 +32458,7 @@ /obj/structure/sign/warning/electricshock{ pixel_x = 32 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/maintenance/starboard/aft) "jxP" = ( @@ -32611,8 +32739,7 @@ "jBg" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastright{ - name = "Research and Development Desk"; - req_one_access_txt = "7;29" + name = "Research and Development Desk" }, /obj/item/folder/white{ pixel_x = 4; @@ -32637,7 +32764,10 @@ pixel_x = -7; pixel_y = -3 }, -/turf/open/floor/plasteel/white, +/obj/effect/mapping_helpers/windoor/access/all/science/general{ + dir = 4 + }, +/turf/open/floor/plating, /area/science/lab) "jBl" = ( /obj/effect/turf_decal/trimline/blue/filled/end{ @@ -32726,8 +32856,7 @@ /area/medical/virology) "jDh" = ( /obj/machinery/door/airlock/security/glass{ - name = "Long-Term Cell 3"; - req_access_txt = "2" + name = "Long-Term Cell 3" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -32739,6 +32868,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "jDq" = ( @@ -32825,8 +32955,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/command{ - name = "Head of Security's Office"; - req_access_txt = "58" + name = "Head of Security's Office" }, /obj/structure/cable/yellow{ icon_state = "1-8" @@ -32840,6 +32969,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/hos, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "jEB" = ( @@ -32915,13 +33045,15 @@ pixel_y = 24 }, /obj/machinery/door/window/westleft{ - name = "Medical Delivery"; - req_access_txt = "5" + name = "Medical Delivery" }, /obj/structure/window, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/medical/sleeper) "jFI" = ( @@ -32951,10 +33083,6 @@ /obj/machinery/door/poddoor/preopen{ id = "executionfireblast" }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/security/execution/education) "jGi" = ( @@ -32983,8 +33111,7 @@ dir = 4 }, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Treatment"; - req_access_txt = "5" + name = "Medbay Treatment" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -32999,6 +33126,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "jGE" = ( @@ -33347,6 +33475,21 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/engine/engineering) +"jKN" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ai_monitored/storage/satellite) "jKY" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /obj/structure/cable{ @@ -33449,9 +33592,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ dir = 1 }, @@ -33978,13 +34118,13 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/siding/wideplating{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva_secondary) "jVw" = ( @@ -33996,7 +34136,7 @@ id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_x = 30; - req_access_txt = "19" + req_access = list("eva") }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ @@ -34012,9 +34152,7 @@ }, /area/maintenance/port) "jVO" = ( -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, +/obj/structure/closet/secure_closet/bar, /obj/item/gun/ballistic/shotgun/doublebarrel, /turf/open/floor/wood, /area/crew_quarters/bar) @@ -34140,8 +34278,7 @@ /area/crew_quarters/kitchen) "jXH" = ( /obj/machinery/door/airlock/security/glass{ - name = "Long-Term Cell 2"; - req_access_txt = "2" + name = "Long-Term Cell 2" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -34156,6 +34293,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "jXO" = ( @@ -34300,7 +34438,7 @@ /obj/structure/closet/crate/secure{ desc = "A secure crate containing various materials for building a customised test-site."; name = "Test Site Materials Crate"; - req_access_txt = "8" + req_access = list("science") }, /obj/machinery/light/small{ dir = 1 @@ -34319,9 +34457,6 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, @@ -34469,7 +34604,7 @@ name = "Bridge Access Blast Door Control"; pixel_x = 24; pixel_y = -24; - req_access_txt = "19" + req_access = list("command") }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 @@ -34672,8 +34807,7 @@ /area/ai_monitored/turret_protected/ai) "kgg" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Storage"; - req_access_txt = "32" + name = "Engineering Storage" }, /obj/effect/turf_decal/bot{ dir = 1 @@ -34693,6 +34827,7 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel{ dir = 1 }, @@ -34720,8 +34855,7 @@ name = "bridge blast door" }, /obj/machinery/door/airlock/command/glass{ - name = "Bridge Access"; - req_access_txt = "19" + name = "Bridge Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -34733,6 +34867,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "kgz" = ( @@ -34873,8 +35008,7 @@ /area/construction/storage_wing) "kiq" = ( /obj/machinery/door/airlock/research{ - name = "Robotics Lab"; - req_one_access_txt = "29;75" + name = "Robotics Lab" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -34891,6 +35025,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/science/robotics/lab) "kiN" = ( @@ -34925,8 +35060,7 @@ /area/hallway/primary/port) "kjc" = ( /obj/machinery/door/airlock/medical{ - name = "Patient Room B"; - req_access_txt = "45" + name = "Patient Room B" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -34947,6 +35081,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /turf/open/floor/plasteel/white, /area/medical/surgery) "kjg" = ( @@ -34970,7 +35105,7 @@ id = "prison release"; name = "Labor Camp Shuttle Lockdown"; pixel_x = -25; - req_access_txt = "2" + req_access = list("brig") }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only, @@ -35000,8 +35135,7 @@ icon_state = "1-8" }, /obj/machinery/door/airlock/security/glass{ - name = "Gear Room"; - req_one_access_txt = "1;4" + name = "Gear Room" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -35016,6 +35150,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel, /area/security/main) "kjO" = ( @@ -35204,7 +35339,7 @@ name = "Transit Tube Lockdown"; pixel_x = -24; pixel_y = -5; - req_access_txt = "19" + req_access = list("engineering") }, /obj/machinery/button/door{ desc = "A remote control-switch for secure storage."; @@ -35212,7 +35347,7 @@ name = "Engineering Secure Storage"; pixel_x = -24; pixel_y = 5; - req_access_txt = "11" + req_access = list("engineering") }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 @@ -35355,7 +35490,6 @@ /turf/open/floor/plasteel, /area/storage/tools) "kpy" = ( -/obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, @@ -35380,12 +35514,14 @@ base_state = "right"; dir = 8; icon_state = "right"; - name = "Containment Pen #6"; - req_access_txt = "55" + name = "Containment Pen #6" }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "kpZ" = ( @@ -35641,7 +35777,7 @@ name = "Virology Access Console"; pixel_x = 26; pixel_y = 26; - req_access_txt = "39" + req_access = list("virology") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -35904,6 +36040,7 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/maintenance/fore) "kyD" = ( @@ -36084,14 +36221,14 @@ }, /obj/machinery/door/airlock/research{ id_tag = "ResearchInt"; - name = "Research Division"; - req_one_access_txt = "47" + name = "Research Division" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel, /area/science/research) "kBn" = ( @@ -36159,8 +36296,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ dir = 2; - name = "Chemistry Desk"; - req_access_txt = "5; 33" + name = "Chemistry Desk" }, /obj/item/folder/white{ pixel_x = 4; @@ -36178,11 +36314,8 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/tile/neutral/fourcorners{ - alpha = 220; - color = "#F29A4D" - }, -/turf/open/floor/plasteel/white, +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry, +/turf/open/floor/plating, /area/medical/chemistry) "kCt" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -36300,8 +36433,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/mining{ - name = "Cargo Bay"; - req_one_access_txt = "48;50" + name = "Cargo Bay" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -36311,6 +36443,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/office) "kDD" = ( @@ -36356,8 +36489,7 @@ /area/quartermaster/sorting) "kEO" = ( /obj/machinery/door/airlock/maintenance{ - name = "Tool Storage Maintenance"; - req_access_txt = "12" + name = "Tool Storage Maintenance" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -36371,6 +36503,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "kFi" = ( @@ -36430,7 +36563,7 @@ id = "xenobio3"; name = "Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/structure/window/reinforced{ dir = 1 @@ -36515,8 +36648,7 @@ /area/maintenance/starboard) "kGm" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -36531,6 +36663,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel, /area/security/brig) "kGq" = ( @@ -36671,8 +36804,10 @@ "kIc" = ( /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ - name = "Coffin Storage"; - req_access_txt = "22" + name = "Coffin Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 4 }, /turf/open/floor/plating, /area/chapel/main) @@ -36686,8 +36821,7 @@ /area/security/prison) "kIh" = ( /obj/machinery/door/airlock/hatch{ - name = "MiniSat Antechamber"; - req_one_access_txt = "65;19" + name = "MiniSat Antechamber" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -36711,6 +36845,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/foyer) "kIs" = ( @@ -36770,8 +36907,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/virology{ - name = "Virology Access"; - req_access_txt = "39" + name = "Virology Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -36783,6 +36919,8 @@ dir = 1 }, /obj/effect/turf_decal/trimline/green/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, +/obj/effect/mapping_helpers/airlock/access/any/medical/virology, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "kJa" = ( @@ -36994,9 +37132,7 @@ /turf/open/floor/engine/plasma, /area/engine/atmos/distro) "kLJ" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -37004,6 +37140,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "kLZ" = ( @@ -37185,7 +37322,15 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, +/obj/structure/table/reinforced, +/obj/item/paper, +/obj/effect/mapping_helpers/windoor/access/any/security/detective{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/any/security/general{ + dir = 1 + }, +/turf/open/floor/plating, /area/hallway/primary/port) "kPy" = ( /obj/machinery/light/small, @@ -37244,7 +37389,6 @@ /turf/open/floor/wood, /area/library) "kQA" = ( -/obj/machinery/door/airlock/public, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -37267,6 +37411,10 @@ /obj/effect/turf_decal/trimline/secred/warning/lower/corner{ dir = 8 }, +/obj/machinery/door/airlock/public/glass{ + name = "Shipbreaking Bay" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plasteel, /area/escapepodbay) "kQR" = ( @@ -37368,8 +37516,7 @@ /area/escapepodbay) "kSO" = ( /obj/machinery/door/airlock/grunge{ - name = "Vacant Office"; - req_access_txt = "32" + name = "Vacant Office" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable/yellow{ @@ -37381,6 +37528,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/wood, /area/vacant_room/office) "kTj" = ( @@ -37580,13 +37728,13 @@ /area/maintenance/central) "kWI" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Station Maintenance"; - req_access_txt = "48" + name = "Mining Station Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark, /area/mine/maintenance) "kWK" = ( @@ -37609,8 +37757,7 @@ /area/quartermaster/warehouse) "kWS" = ( /obj/machinery/door/airlock/maintenance{ - name = "Chapel Maintenance"; - req_one_access_txt = "12;22" + name = "Chapel Maintenance" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -37619,6 +37766,8 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/chapel_office, /turf/open/floor/plating, /area/maintenance/aft) "kXo" = ( @@ -37806,7 +37955,8 @@ idDoor = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 9; - pixel_y = 25 + pixel_y = 25; + req_access = list("ai_master") }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) @@ -37814,8 +37964,7 @@ /obj/machinery/door/airlock/external{ glass = 1; name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" + opacity = 0 }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -37824,6 +37973,7 @@ dir = 8 }, /obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plating, /area/mine/storage) "laU" = ( @@ -38057,13 +38207,13 @@ /area/medical/medbay/central) "lfj" = ( /obj/machinery/door/airlock/mining{ - name = "Mining Station Storage"; - req_access_txt = "48" + name = "Mining Station Storage" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark/side, /area/mine/maintenance) "lfp" = ( @@ -38311,8 +38461,7 @@ /obj/machinery/door/window/northleft{ dir = 4; name = "RCD Storage"; - pixel_x = 1; - req_access_txt = "19" + pixel_x = 1 }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -38322,6 +38471,9 @@ /obj/machinery/light{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/command/eva{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "ljH" = ( @@ -38446,7 +38598,7 @@ id = "armory"; name = "Armory Shutters"; pixel_x = 28; - req_access_txt = "3" + req_access = list("armory") }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -38467,9 +38619,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;47" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -38482,6 +38632,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "lkV" = ( @@ -38527,8 +38679,7 @@ /area/mine/production) "llh" = ( /obj/machinery/door/airlock{ - name = "Bar Storage"; - req_access_txt = "25" + name = "Bar Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -38536,6 +38687,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plasteel, /area/crew_quarters/bar) "lll" = ( @@ -38630,8 +38782,7 @@ /area/crew_quarters/heads/captain/private) "lmr" = ( /obj/machinery/door/airlock/maintenance{ - name = "Detective Maintenance"; - req_access_txt = "4" + name = "Detective Maintenance" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -38641,6 +38792,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, /turf/open/floor/plating, /area/maintenance/fore) "lmx" = ( @@ -38706,12 +38858,13 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "lns" = ( @@ -38822,8 +38975,7 @@ /area/hallway/primary/fore) "loO" = ( /obj/machinery/door/airlock/security{ - name = "Interrogation Monitoring"; - req_one_access_txt = "1;4" + name = "Interrogation Monitoring" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -38831,6 +38983,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel/grimy, /area/security/interrogation) "loT" = ( @@ -38891,8 +39045,7 @@ /area/library) "lqj" = ( /obj/machinery/door/airlock/security{ - name = "Interrogation"; - req_access_txt = "63" + name = "Interrogation" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -38909,6 +39062,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/interrogation) "lqk" = ( @@ -38920,7 +39074,7 @@ id = "aux_base_shutters"; name = "Public Shutters Control"; pixel_y = -24; - req_one_access_txt = "32;47;48" + req_access = list("aux_base") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -38967,8 +39121,7 @@ name = "bridge blast door" }, /obj/machinery/door/airlock/command/glass{ - name = "Bridge Access"; - req_access_txt = "19" + name = "Bridge Access" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -38985,6 +39138,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "lrR" = ( @@ -39142,10 +39296,10 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/mine/laborcamp) "luA" = ( @@ -39219,7 +39373,7 @@ name = "Disposal Vent Control"; pixel_x = -25; pixel_y = 4; - req_access_txt = "12" + req_access = list("maint_tunnels") }, /obj/machinery/button/massdriver{ id = "trash"; @@ -39271,9 +39425,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "lwo" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;5" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -39283,6 +39435,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/medical/sleeper) "lwr" = ( @@ -39500,9 +39653,15 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "lBl" = ( -/obj/effect/turf_decal/stripes/line, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plating, -/area/maintenance/starboard/aft) +/area/maintenance/port/fore) "lBt" = ( /obj/machinery/holopad, /turf/open/floor/plasteel, @@ -39556,8 +39715,7 @@ /area/hallway/secondary/entry) "lCz" = ( /obj/machinery/door/airlock/research/glass{ - name = "Genetics Lab"; - req_access_txt = "5; 9; 68" + name = "Genetics Lab" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -39581,6 +39739,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/medical/genetics) "lCC" = ( @@ -39611,8 +39770,7 @@ /area/mine/eva) "lDx" = ( /obj/machinery/door/airlock/mining{ - name = "Mining Station Storage"; - req_access_txt = "48" + name = "Mining Station Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -39629,6 +39787,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/production) "lDE" = ( @@ -39638,9 +39797,6 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, @@ -39753,13 +39909,13 @@ /obj/machinery/door/airlock/research{ glass = 1; name = "Slime Euthanization Chamber"; - opacity = 0; - req_access_txt = "55" + opacity = 0 }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/white, /area/science/xenobiology) "lFE" = ( @@ -39914,10 +40070,8 @@ /area/ai_monitored/secondarydatacore) "lHP" = ( /obj/machinery/door/airlock/security{ - name = "Customs Desk"; - req_access_txt = "1" + name = "Customs Desk" }, -/obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/border_only{ @@ -39930,6 +40084,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/checkpoint/customs) "lHV" = ( @@ -40213,7 +40369,8 @@ id = "hosprivacy"; name = "Privacy Shutters Control"; pixel_x = 26; - pixel_y = -26 + pixel_y = -26; + req_access = list("security") }, /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -32 @@ -40222,8 +40379,7 @@ /area/crew_quarters/heads/hos) "lLf" = ( /obj/machinery/door/airlock/command{ - name = "Corporate Showroom"; - req_access_txt = "19" + name = "Corporate Showroom" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -40231,6 +40387,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/wood, /area/bridge/showroom/corporate) "lLh" = ( @@ -40703,13 +40860,13 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/command{ - name = "Corporate Showroom"; - req_access_txt = "19" + name = "Corporate Showroom" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/wood, /area/bridge/showroom/corporate) "lSD" = ( @@ -40767,8 +40924,7 @@ dir = 4 }, /obj/machinery/door/airlock/medical/glass{ - name = "Chemistry Lab"; - req_access_txt = "5; 33" + name = "Chemistry Lab" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -40779,6 +40935,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, /turf/open/floor/plasteel/white, /area/medical/chemistry) "lTE" = ( @@ -40828,6 +40985,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "lTU" = ( @@ -40869,8 +41032,7 @@ "lUr" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen #2"; - req_access_txt = "55" + name = "Containment Pen #2" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio8"; @@ -40885,6 +41047,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/engine, /area/science/xenobiology) "lUs" = ( @@ -40924,8 +41089,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/research{ - name = "Toxins Storage"; - req_access_txt = "8" + name = "Toxins Storage" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "toxins_blastdoor"; @@ -40937,6 +41101,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins_storage, /turf/open/floor/plasteel, /area/science/storage) "lVh" = ( @@ -41211,6 +41376,9 @@ /obj/machinery/door/airlock/medical{ name = "Recovery Room" }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plasteel/white/side{ dir = 4 }, @@ -41261,8 +41429,7 @@ /area/hallway/primary/aft) "lYQ" = ( /obj/machinery/door/airlock/command{ - name = "Command Desk"; - req_access_txt = "19" + name = "Command Desk" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -41270,6 +41437,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "lYW" = ( @@ -41352,7 +41520,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/trimline/yellow/warning/lower{ +/obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/plasteel/dark, @@ -41425,6 +41593,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "mbw" = ( @@ -41530,7 +41701,7 @@ /obj/structure/closet/crate/secure{ desc = "A secure crate containing various materials for building a customised test-site."; name = "Firing Range Gear Crate"; - req_access_txt = "1" + req_access = list("sec_basic") }, /obj/machinery/power/apc{ areastring = "/area/security/range"; @@ -41697,10 +41868,6 @@ /turf/open/floor/plating, /area/mine/storage) "meG" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Crematorium"; - req_access_txt = "22;27" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -41713,6 +41880,10 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, +/obj/machinery/door/airlock{ + name = "Crematorium" + }, /turf/open/floor/plasteel/dark, /area/chapel/office) "meR" = ( @@ -41925,7 +42096,7 @@ id = "emt_shutters"; name = "Paramedic Staging Area Shutters"; pixel_x = 28; - req_access_txt = "69" + req_access = list("paramedic") }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 @@ -42062,6 +42233,15 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/checkpoint/medical) +"mjN" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/fore) "mjX" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -42087,6 +42267,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/hallway/primary/central) "mkm" = ( @@ -42123,14 +42306,14 @@ name = "Queue Shutters Control"; pixel_x = 25; pixel_y = -36; - req_access_txt = "28" + req_access = list("hop") }, /obj/machinery/button/door{ id = "hop"; name = "Privacy Shutters Control"; pixel_x = 25; pixel_y = -26; - req_access_txt = "28" + req_access = list("hop") }, /obj/machinery/button/flasher{ id = "hopflash"; @@ -42206,8 +42389,7 @@ /area/medical/morgue) "mlT" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Sanitarium"; - req_access_txt = "2" + name = "Prison Sanitarium" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -42218,6 +42400,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison/hallway) "mmk" = ( @@ -42349,8 +42532,7 @@ /area/maintenance/starboard/aft) "mow" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -42364,6 +42546,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel, /area/security/brig) "moF" = ( @@ -42432,6 +42615,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "mpG" = ( @@ -42578,8 +42762,7 @@ /area/maintenance/starboard) "mrX" = ( /obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Shuttle Airlock"; - req_access_txt = "63" + name = "Labor Camp Shuttle Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = -1; @@ -42591,6 +42774,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) "msk" = ( @@ -42852,8 +43036,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" + name = "Bridge" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -42865,6 +43048,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "mxs" = ( @@ -43120,8 +43304,7 @@ /area/crew_quarters/bar) "mAT" = ( /obj/machinery/door/airlock{ - name = "Law Office"; - req_access_txt = "38" + name = "Law Office" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -43129,12 +43312,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/service/lawyer, /turf/open/floor/wood, /area/security/courtroom) "mAX" = ( /obj/machinery/door/airlock/security/glass{ - name = "Gear Room"; - req_one_access_txt = "1;4" + name = "Gear Room" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -43143,16 +43326,16 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel, /area/security/main) "mBa" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "mBh" = ( @@ -43225,6 +43408,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "mBY" = ( @@ -43324,8 +43510,7 @@ /area/science/xenobiology) "mDl" = ( /obj/machinery/door/airlock{ - name = "Kitchen"; - req_access_txt = "28;79" + name = "Kitchen" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -43342,6 +43527,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -43365,8 +43551,7 @@ /area/medical/paramedic) "mDO" = ( /obj/machinery/door/airlock{ - name = "Kitchen"; - req_one_access_txt = "25;28" + name = "Kitchen" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -43374,6 +43559,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/service/kitchen, +/obj/effect/mapping_helpers/airlock/access/any/service/bar, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -43498,9 +43685,9 @@ frequency = 1449; heat_proof = 1; id_tag = "incinerator_airlock_exterior"; - name = "Incinerator Exterior Airlock"; - req_access_txt = "32" + name = "Incinerator Exterior Airlock" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "mFE" = ( @@ -43570,14 +43757,14 @@ /area/maintenance/port/fore) "mGW" = ( /obj/machinery/door/airlock/security{ - name = "Evidence Storage"; - req_access_txt = "3" + name = "Evidence Storage" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel, /area/security/warden) "mHe" = ( @@ -43598,8 +43785,7 @@ /obj/machinery/door/window/northleft{ dir = 8; name = "Magboot Storage"; - pixel_x = -1; - req_access_txt = "19" + pixel_x = -1 }, /obj/structure/window/reinforced{ dir = 1; @@ -43615,6 +43801,9 @@ pixel_x = 4; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/command/eva{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "mHk" = ( @@ -43868,8 +44057,7 @@ /area/science/xenobiology) "mKx" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Launch Room"; - req_access_txt = "8" + name = "Toxins Launch Room" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -43884,6 +44072,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel, /area/maintenance/department/science) "mKF" = ( @@ -43982,14 +44171,14 @@ name = "Bridge Access Blast Door Control"; pixel_x = -1; pixel_y = -24; - req_access_txt = "19" + req_access = list("command") }, /obj/machinery/button/door{ id = "council blast"; name = "Council Chamber Blast Door Control"; pixel_x = -1; pixel_y = -34; - req_access_txt = "19" + req_access = list("command") }, /obj/machinery/camera{ c_tag = "Bridge - Command Chair"; @@ -44014,9 +44203,7 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "mMX" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -44029,6 +44216,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "mNg" = ( @@ -44189,8 +44377,7 @@ }, /obj/machinery/door/airlock/research{ id_tag = "ResearchInt"; - name = "Research Division"; - req_one_access_txt = "47" + name = "Research Division" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -44199,6 +44386,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel, /area/science/research) "mOP" = ( @@ -44290,6 +44478,12 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"mPH" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/secondary) "mPR" = ( /obj/structure/window/reinforced, /obj/machinery/power/terminal{ @@ -44328,11 +44522,6 @@ /turf/open/floor/plating/asteroid/snow/icemoon/top_layer, /area/icemoon/top_layer/outdoors) "mQy" = ( -/obj/machinery/button/door{ - id = "Podbaydoor"; - pixel_x = 24; - pixel_y = -1 - }, /obj/machinery/light, /obj/structure/rack, /obj/item/tank/internals/oxygen, @@ -44345,6 +44534,13 @@ dir = 8 }, /obj/effect/turf_decal/bot, +/obj/machinery/button/door{ + id = "Podbaydoor"; + pixel_x = 24; + pixel_y = -1; + req_access = list("external_airlocks"); + name = "Shipbreaking External Control" + }, /turf/open/floor/plasteel/dark, /area/escapepodbay) "mQz" = ( @@ -44443,7 +44639,7 @@ id = "Biohazard"; name = "Biohazard Shutter Control"; pixel_x = -7; - req_access_txt = "47" + req_access = list("security") }, /obj/machinery/button/door{ desc = "A remote control switch for the research division entryway."; @@ -44451,7 +44647,8 @@ name = "Research Exterior Airlock"; normaldoorcontrol = 1; pixel_x = 7; - pixel_y = 7 + pixel_y = 7; + req_access = list("security") }, /obj/machinery/button/door{ desc = "A remote control switch for the research division entryway."; @@ -44459,7 +44656,8 @@ name = "Research Interior Airlock"; normaldoorcontrol = 1; pixel_x = 7; - pixel_y = -2 + pixel_y = -2; + req_access = list("security") }, /obj/machinery/firealarm{ dir = 4; @@ -44546,14 +44744,12 @@ }, /obj/machinery/door/window/northleft{ dir = 8; - name = "Chemistry Desk"; - req_access_txt = "5; 33" + name = "Chemistry Desk" }, -/obj/effect/turf_decal/tile/neutral/fourcorners{ - alpha = 220; - color = "#F29A4D" +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry{ + dir = 8 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plating, /area/medical/chemistry) "mSY" = ( /obj/machinery/status_display/evac{ @@ -44573,7 +44769,7 @@ id = "xenobio1"; name = "Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -44681,8 +44877,7 @@ /area/crew_quarters/toilet/auxiliary) "mUb" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Secure Tech Storage"; - req_access_txt = "19;23" + name = "Secure Tech Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -44698,6 +44893,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/secure_tech, /turf/open/floor/plasteel/dark, /area/storage/tech) "mUc" = ( @@ -44743,8 +44939,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/command{ - name = "Chief Engineer's Office"; - req_access_txt = "56" + name = "Chief Engineer's Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -44761,6 +44956,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/ce, /turf/open/floor/plasteel{ dir = 1 }, @@ -44930,11 +45126,13 @@ "mWH" = ( /obj/machinery/door/window{ dir = 1; - name = "Captain's Bedroom"; - req_access_txt = "20" + name = "Captain's Bedroom" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/windoor/access/all/command/captain{ + dir = 1 + }, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "mWK" = ( @@ -45238,15 +45436,15 @@ /turf/open/floor/plasteel/dark, /area/aisat) "nbc" = ( -/obj/machinery/door/airlock{ - name = "Theatre Backstage"; - req_access_txt = "46" - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance{ + name = "Theatre Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /turf/open/floor/plating, /area/maintenance/starboard) "nbd" = ( @@ -45311,7 +45509,10 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hos) "ncq" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/corner{ dir = 4 }, /turf/open/floor/plating, @@ -45321,10 +45522,10 @@ /turf/open/floor/plasteel/cafeteria, /area/mine/break_room) "ncA" = ( -/obj/structure/stairs/goon/wide/left{ +/obj/effect/turf_decal/ramp_middle{ dir = 1 }, -/obj/effect/turf_decal/ramp_middle{ +/obj/structure/stairs/wide_left{ dir = 1 }, /turf/open/floor/plating, @@ -45337,8 +45538,7 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance{ - name = "Psychiatrists office Maintenance"; - req_access_txt = "5" + name = "Psychiatrists office Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -45346,6 +45546,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/psychology, /turf/open/floor/plating, /area/maintenance/aft) "ncI" = ( @@ -45404,12 +45605,14 @@ "ndm" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen #1"; - req_access_txt = "55" + name = "Containment Pen #1" }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "ndu" = ( @@ -45435,8 +45638,11 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance_hatch{ - name = "MiniSat Maintenance"; - req_one_access_txt = "65;19" + name = "MiniSat Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 }, /turf/open/floor/plating, /area/ai_monitored/storage/satellite) @@ -45488,12 +45694,12 @@ /area/maintenance/port/aft) "neS" = ( /obj/machinery/door/airlock/external{ - name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/brig) "nfa" = ( @@ -45511,8 +45717,7 @@ /area/security/main) "nfh" = ( /obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Security"; - req_access_txt = "22" + name = "Labor Camp Security" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 @@ -45527,6 +45732,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/mine/laborcamp/security) "nfD" = ( @@ -45723,7 +45929,7 @@ "nif" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/secure_closet/contraband/armory{ - req_access = list(63) + req_access = list("sec_basic") }, /turf/open/floor/plasteel, /area/mine/living_quarters) @@ -45821,8 +46027,7 @@ /obj/machinery/door/window/northleft{ dir = 8; name = "Jetpack Storage"; - pixel_x = -1; - req_access_txt = "19" + pixel_x = -1 }, /obj/structure/window/reinforced, /obj/structure/rack, @@ -45835,6 +46040,9 @@ pixel_x = -4; pixel_y = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/command/eva{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "nkE" = ( @@ -45991,14 +46199,16 @@ }, /obj/machinery/door/window/eastleft{ dir = 1; - name = "Research and Development Deliveries"; - req_one_access_txt = "7;29" + name = "Research and Development Deliveries" }, /obj/structure/window/reinforced{ dir = 8 }, /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/windoor/access/all/science/general{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/lab) "noz" = ( @@ -46031,15 +46241,15 @@ resistance_flags = 115 }, /obj/machinery/door/airlock/external{ - name = "Engineering Escape Pod"; - req_one_access_txt = "10;61" + name = "Engineering Escape Pod" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, /area/maintenance/starboard) "npe" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "5" + name = "Medbay Storage" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -46054,6 +46264,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/storage) "npi" = ( @@ -46217,8 +46428,7 @@ /area/security/checkpoint/science/research) "nrx" = ( /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" + name = "Medbay Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -46226,17 +46436,18 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/port/aft) "nry" = ( /obj/machinery/door/airlock/maintenance{ - name = "Gift Shop Maintenance"; - req_one_access_txt = "12;17;36" + name = "Gift Shop Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "nrN" = ( @@ -46356,7 +46567,7 @@ name = "Teleporter Shutter Control"; pixel_x = 30; pixel_y = 5; - req_access_txt = "19" + req_access = list("teleporter") }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ @@ -46458,6 +46669,9 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/item/poster/random_contraband, /obj/effect/spawner/lootdrop/maintenance, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/port) "nuJ" = ( @@ -46630,14 +46844,14 @@ /area/maintenance/fore) "nxg" = ( /obj/machinery/door/window{ - name = "SMES Chamber"; - req_access_txt = "32" + name = "SMES Chamber" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/windoor/access/all/engineering/equipment, /turf/open/floor/plasteel/dark, /area/engine/engine_smes) "nxi" = ( @@ -46697,16 +46911,15 @@ /turf/open/floor/plasteel, /area/security/checkpoint/customs) "nxL" = ( -/obj/machinery/door/morgue{ - name = "Relic Closet"; - req_access_txt = "22" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/machinery/door/morgue/chaplain{ + name = "Relic Closet" + }, /turf/open/floor/plasteel/cult, /area/chapel/office) "nyc" = ( @@ -46834,8 +47047,7 @@ /area/security/checkpoint/medical) "nAu" = ( /obj/machinery/door/airlock/maintenance{ - name = "Law Office Maintenance"; - req_access_txt = "38" + name = "Law Office Maintenance" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -46844,6 +47056,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/service/lawyer, /turf/open/floor/plating, /area/maintenance/fore) "nAv" = ( @@ -46867,8 +47080,7 @@ /area/library) "nAM" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" + name = "Bridge" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ @@ -46878,6 +47090,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "nAO" = ( @@ -46936,6 +47149,9 @@ /obj/structure/sign/departments/minsky/supply/cargo{ pixel_y = 32 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "nBm" = ( @@ -47026,7 +47242,7 @@ name = "Cell 1 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "PCell 1"; @@ -47242,8 +47458,7 @@ "nGP" = ( /obj/machinery/button/crematorium{ id = "crematoriumChapel"; - pixel_x = -26; - req_access_txt = "27" + pixel_x = -26 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -47637,12 +47852,12 @@ }, /obj/machinery/door/airlock/highsecurity{ id_tag = "ai_core_airlock_interior"; - name = "AI Core"; - req_access_txt = "65" + name = "AI Core" }, /obj/structure/ethernet_cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) "nMf" = ( @@ -47707,8 +47922,7 @@ /area/hallway/primary/central) "nMJ" = ( /obj/machinery/door/airlock/security{ - name = "Armory"; - req_access_txt = "3" + name = "Armory" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -47720,6 +47934,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "nMN" = ( @@ -47747,10 +47962,12 @@ dir = 1; icon_state = "right"; name = "Monkey Pen"; - pixel_y = 2; - req_access_txt = "9" + pixel_y = 2 }, /obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/mapping_helpers/windoor/access/all/science/genetics{ + dir = 1 + }, /turf/open/floor/grass, /area/medical/genetics) "nNq" = ( @@ -48056,8 +48273,7 @@ /area/hallway/primary/aft) "nRB" = ( /obj/machinery/door/airlock{ - name = "Bar Storage"; - req_access_txt = "25;79" + name = "Bar Storage" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -48066,6 +48282,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/wood, /area/hallway/secondary/service) "nRF" = ( @@ -48390,27 +48607,11 @@ /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "nVE" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ +/obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "MiniSat Maintenance"; - req_one_access_txt = "65;19" - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/storage/satellite) +/turf/open/floor/plating, +/area/maintenance/starboard) "nVN" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -48490,16 +48691,13 @@ /turf/open/floor/circuit/green/telecomms, /area/ai_monitored/secondarydatacore) "nWM" = ( -/obj/machinery/door/morgue{ - name = "Confession Booth (Chaplain)"; - req_access_txt = "22" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/machinery/door/morgue/chaplain, /turf/open/floor/plasteel/dark, /area/chapel/office) "nWO" = ( @@ -48595,8 +48793,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -48613,6 +48810,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/hfr) "nYT" = ( @@ -49016,6 +49214,9 @@ "oek" = ( /obj/machinery/space_heater, /obj/effect/decal/cleanable/cobweb, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port) "oey" = ( @@ -49035,8 +49236,7 @@ /area/medical/medbay/aft) "oeD" = ( /obj/machinery/door/airlock/security/glass{ - name = "Departure Lounge Security Post"; - req_access_txt = "63" + name = "Departure Lounge Security Post" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -49053,6 +49253,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "oeF" = ( @@ -49107,15 +49309,14 @@ /turf/baseturf_bottom, /area/maintenance/port/aft) "oeW" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;5;39;6" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/aft) "ofi" = ( @@ -49221,14 +49422,14 @@ /area/science/research) "ogT" = ( /obj/machinery/door/airlock/maintenance{ - name = "Nanite Laboratory Maintenance"; - req_one_access_txt = "7;47;29" + name = "Nanite Laboratory Maintenance" }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/department/science/central) "ohc" = ( @@ -49250,8 +49451,7 @@ /obj/structure/table, /obj/machinery/door/window{ dir = 8; - name = "High-Risk Modules"; - req_access_txt = "20" + name = "High-Risk Modules" }, /obj/structure/window/reinforced, /obj/machinery/flasher{ @@ -49263,6 +49463,9 @@ /obj/item/aiModule/supplied/protectStation, /obj/item/aiModule/zeroth/oneHuman, /obj/item/aiModule/reset/purge, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "oht" = ( @@ -49296,6 +49499,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "ohS" = ( @@ -49381,13 +49587,13 @@ "oiY" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ - name = "Morgue Maintenance"; - req_access_txt = "6" + name = "Morgue Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/plating, /area/maintenance/aft) "ojs" = ( @@ -49603,11 +49809,6 @@ location = "Disposals" }, /obj/structure/plasticflaps, -/obj/machinery/door/window/northright{ - dir = 2; - name = "delivery door"; - req_access_txt = "31" - }, /obj/structure/disposalpipe/segment, /obj/machinery/conveyor{ dir = 1; @@ -49627,9 +49828,6 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /turf/open/floor/plating, /area/maintenance/fore) "omA" = ( @@ -49695,13 +49893,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/trimline/purple/filled/corner/lower{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/purple/filled/corner/lower, /obj/structure/disposalpipe/junction{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "onA" = ( @@ -49721,8 +49918,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Kitchen Maintenance"; - req_access_txt = "28" + name = "Kitchen Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -49733,6 +49929,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plating, /area/maintenance/starboard) "onO" = ( @@ -49784,8 +49981,7 @@ autoclose = 0; frequency = 1449; id_tag = "xeno_airlock_interior"; - name = "Xenobiology Lab Internal Airlock"; - req_access_txt = "55" + name = "Xenobiology Lab Internal Airlock" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -49808,6 +50004,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/white, /area/science/xenobiology) "ooN" = ( @@ -49833,12 +50030,14 @@ "opO" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen #5"; - req_access_txt = "55" + name = "Containment Pen #5" }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "opQ" = ( @@ -49891,6 +50090,9 @@ /obj/item/clothing/mask/gas, /obj/item/storage/box/lights/mixed, /obj/effect/spawner/lootdrop/maintenance, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "oqA" = ( @@ -49944,9 +50146,9 @@ dir = 1 }, /obj/machinery/door/airlock/maintenance{ - name = "Genetics Maintenance"; - req_access_txt = "5;9;68" + name = "Genetics Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plating, /area/maintenance/department/medical/central) "ors" = ( @@ -50042,9 +50244,7 @@ /turf/open/floor/plasteel/dark, /area/chapel/main) "osD" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;47" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -50063,12 +50263,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "osK" = ( /obj/machinery/door/airlock/external{ - name = "MiniSat Space Access Airlock"; - req_one_access_txt = "10;32" + name = "MiniSat Space Access Airlock" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -50079,6 +50279,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, /area/engine/foyer) "osN" = ( @@ -50213,6 +50415,16 @@ /obj/item/kirbyplants/random, /turf/open/floor/plasteel/dark, /area/aisat) +"ouV" = ( +/obj/effect/landmark/blobstart, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard) "ouZ" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /obj/structure/cable{ @@ -50241,8 +50453,7 @@ /area/hallway/primary/central) "ovw" = ( /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -50256,6 +50467,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "ovx" = ( @@ -50491,8 +50704,7 @@ "ozJ" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ - name = "Cargo Desk"; - req_access_txt = "50" + name = "Cargo Desk" }, /obj/item/paper_bin{ pixel_x = -3; @@ -50513,7 +50725,10 @@ pixel_x = -5; pixel_y = -9 }, -/turf/open/floor/plasteel, +/obj/effect/mapping_helpers/windoor/access/all/supply/general{ + dir = 8 + }, +/turf/open/floor/plating, /area/quartermaster/office) "ozK" = ( /turf/open/floor/plating/asteroid/snow/icemoon/top_layer, @@ -50580,17 +50795,16 @@ /obj/machinery/button/flasher{ id = "holdingflash"; name = "holding cell flasher button"; - pixel_x = 23; - pixel_y = 23; - req_access_txt = "1" + pixel_x = 24; + pixel_y = -8 }, /obj/machinery/camera{ c_tag = "Brig - Desk"; dir = 8 }, /obj/item/radio/intercom{ - pixel_x = 29; - pixel_y = -2 + pixel_x = 28; + pixel_y = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -50624,8 +50838,7 @@ /area/engine/atmos/distro) "oAE" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Desk"; - req_access_txt = "63" + name = "Security Desk" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -50639,6 +50852,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel/dark, /area/security/brig) "oAG" = ( @@ -50731,8 +50945,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/security{ - name = "Security-Storage Backroom"; - req_access_txt = "63" + name = "Security-Storage Backroom" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -50740,6 +50953,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) "oCv" = ( @@ -50933,6 +51147,9 @@ name = "gas ports" }, /obj/effect/mapping_helpers/teleport_anchor, +/obj/effect/mapping_helpers/windoor/access/all/security/brig{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/security/execution/education) "oFW" = ( @@ -50992,7 +51209,7 @@ name = "AI Chamber entrance shutters control"; pixel_x = -23; pixel_y = -12; - req_access_txt = "16" + req_access = list("ai_master") }, /obj/item/radio/intercom{ freerange = 1; @@ -51018,8 +51235,7 @@ /area/maintenance/port/fore) "oGC" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Shared Engineering Storage"; - req_one_access_txt = "10;32" + name = "Shared Engineering Storage" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -51032,6 +51248,8 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel, /area/engine/storage_shared) "oGG" = ( @@ -51046,13 +51264,15 @@ "oGR" = ( /obj/machinery/door/window/westright{ dir = 1; - name = "Atmospherics Access"; - req_access_txt = "24" + name = "Atmospherics Access" }, /obj/structure/window/reinforced{ dir = 4 }, /obj/effect/turf_decal/loading_area, +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/atmos) "oGY" = ( @@ -51122,8 +51342,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_one_access_txt = "8;70" + name = "Experimentation Lab" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -51137,6 +51356,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/experimentation, /turf/open/floor/plasteel/white, /area/science/explab) "oJE" = ( @@ -51187,7 +51407,8 @@ /obj/machinery/button{ id = "lawyer_shutters"; name = "law office shutter control"; - pixel_y = -26 + pixel_y = -26; + req_access = list("lawyer") }, /turf/open/floor/wood, /area/lawoffice) @@ -51303,9 +51524,7 @@ /turf/open/floor/plasteel, /area/quartermaster/qm) "oNu" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -51315,6 +51534,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/fore) "oNv" = ( @@ -51426,12 +51646,13 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/effect/turf_decal/trimline/purple/filled/line/lower{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/trimline/purple/filled/corner/lower{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "oPB" = ( @@ -51468,14 +51689,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;48;50;1" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "oPO" = ( @@ -51563,9 +51783,7 @@ /turf/open/floor/carpet, /area/crew_quarters/theatre) "oQL" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;63;48;50" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -51574,6 +51792,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "oQN" = ( @@ -51624,8 +51843,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - name = "Psychiatrists office Maintenance"; - req_access_txt = "5" + name = "Psychiatrists office Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -51637,6 +51855,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/psychology, /turf/open/floor/plating, /area/maintenance/aft) "oSm" = ( @@ -51675,10 +51894,10 @@ "oSv" = ( /obj/machinery/door/window/westleft{ dir = 2; - name = "Research Division Deliveries"; - req_access_txt = "47" + name = "Research Division Deliveries" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/science/general, /turf/open/floor/plasteel, /area/science/research) "oSC" = ( @@ -51785,14 +52004,15 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "oVE" = ( @@ -51955,8 +52175,7 @@ /area/maintenance/starboard/secondary) "oXB" = ( /obj/machinery/door/airlock/maintenance{ - name = "Research Lab Maintenance"; - req_one_access_txt = "7;29" + name = "Research Lab Maintenance" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -51965,6 +52184,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/department/science/central) "oXC" = ( @@ -52016,11 +52236,6 @@ /area/hallway/secondary/entry) "oYk" = ( /obj/structure/plasticflaps, -/obj/machinery/door/window/northright{ - dir = 4; - name = "delivery door"; - req_access_txt = "31" - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -52151,6 +52366,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/wood, /area/crew_quarters/bar) "pak" = ( @@ -52213,8 +52431,7 @@ /area/hallway/primary/central) "paJ" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -52225,6 +52442,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison/hallway) "paV" = ( @@ -52233,8 +52451,7 @@ /area/security/execution/education) "pbC" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Foyer"; - req_one_access_txt = "10;32" + name = "Engineering Foyer" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -52261,6 +52478,8 @@ dir = 1 }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel, /area/engine/foyer) "pbX" = ( @@ -52472,8 +52691,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ dir = 4; - name = "Engineering Desk"; - req_one_access_txt = "32;19" + name = "Engineering Desk" }, /obj/structure/cable/yellow{ icon_state = "1-4" @@ -52486,17 +52704,29 @@ pixel_y = -3 }, /obj/item/storage/pencil_holder/crew, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/any/engineering/construction{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/any/engineering/general{ + dir = 4 + }, /turf/open/floor/plating, /area/engine/foyer) "phd" = ( /obj/machinery/door/airlock/maintenance{ - name = "Robotics Maintenance"; - req_one_access_txt = "29;75" + name = "Robotics Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "phm" = ( @@ -52523,13 +52753,12 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "1;4;38;12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore) "phK" = ( @@ -52644,11 +52873,16 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "pjj" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/door/firedoor/border_only{ dir = 1 }, -/turf/open/floor/plating, -/area/maintenance/port/fore) +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/filled/corner/lower, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) "pjm" = ( /obj/machinery/smartfridge/chemistry/preloaded, /turf/closed/wall, @@ -52854,12 +53088,14 @@ "plz" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen #3"; - req_access_txt = "55" + name = "Containment Pen #3" }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "plH" = ( @@ -53091,10 +53327,6 @@ /turf/open/floor/plasteel, /area/engine/atmos/distro) "ppf" = ( -/obj/machinery/door/airlock/command{ - name = "Emergency Escape"; - req_access_txt = "20" - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -53107,6 +53339,10 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/machinery/door/airlock/maintenance{ + name = "Captain's Office Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/plating, /area/maintenance/central) "ppr" = ( @@ -53125,7 +53361,7 @@ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_y = -24; - req_access_txt = "31" + req_access = list("cargo") }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -53301,8 +53537,7 @@ /area/crew_quarters/bar) "prZ" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics"; - req_access_txt = "24" + name = "Atmospherics" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -53323,6 +53558,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel/dark, /area/engine/atmos) "psb" = ( @@ -53455,16 +53691,16 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard) "puz" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/airlock/command{ - name = "Head of Personnel"; - req_access_txt = "57" - }, +/obj/machinery/door/airlock/command, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -53480,6 +53716,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hop, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "puL" = ( @@ -53498,13 +53735,14 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;47;70" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/maintenance/department/science) "pve" = ( @@ -53520,14 +53758,14 @@ /area/science/lab) "pvq" = ( /obj/machinery/door/airlock/maintenance{ - name = "Chemistry Lab Maintenance"; - req_access_txt = "5; 33" + name = "Chemistry Lab Maintenance" }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, /turf/open/floor/plating, /area/maintenance/department/medical/central) "pvr" = ( @@ -53620,10 +53858,12 @@ "pwl" = ( /obj/machinery/door/window/southleft{ dir = 1; - name = "Maximum Security Test Chamber"; - req_access_txt = "55" + name = "Maximum Security Test Chamber" }, /obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "pwz" = ( @@ -53674,6 +53914,9 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "pxu" = ( @@ -53909,6 +54152,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/fore) "pBx" = ( @@ -54000,9 +54244,6 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, @@ -54128,15 +54369,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;63;48;50" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "pEO" = ( @@ -54161,8 +54401,7 @@ base_state = "rightsecure"; dir = 1; icon_state = "rightsecure"; - name = "Head of Personnel's Desk"; - req_access_txt = "57" + name = "Head of Personnel's Desk" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -54183,6 +54422,9 @@ pixel_x = -8; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/service/hop{ + dir = 1 + }, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "pFu" = ( @@ -54506,10 +54748,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "pMb" = ( -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/airlock/vault{ - req_access_txt = "53" - }, +/obj/machinery/door/airlock/vault, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -54520,6 +54759,8 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/vault, +/obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/plasteel/dark, /area/security/nuke_storage) "pMi" = ( @@ -54748,6 +54989,9 @@ /area/security/brig) "pPz" = ( /obj/structure/closet/firecloset, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "pPR" = ( @@ -54784,17 +55028,15 @@ /turf/open/floor/plasteel, /area/crew_quarters/locker) "pQQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plating{ - icon_state = "panelscorched" +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 }, +/turf/open/floor/plating, /area/maintenance/starboard/aft) "pQR" = ( /obj/machinery/door/airlock/grunge{ - name = "Morgue"; - req_access_txt = "6" + name = "Morgue" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -54802,6 +55044,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/plasteel/dark, /area/medical/morgue) "pQT" = ( @@ -54838,15 +55081,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "20;12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "pRE" = ( @@ -54897,10 +55139,6 @@ /turf/open/floor/plasteel, /area/security/prison) "pSM" = ( -/obj/machinery/door/airlock{ - name = "Research Emergency Storage"; - req_one_access_txt = "47" - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -54913,6 +55151,10 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/airlock/research{ + name = "Research Emergency Storage" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "pSN" = ( @@ -54989,8 +55231,7 @@ dir = 4 }, /obj/machinery/door/airlock/hatch{ - name = "Test Chamber Maintenance"; - req_access_txt = "47" + name = "Test Chamber Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -54998,6 +55239,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plating, /area/science/xenobiology) "pUH" = ( @@ -55102,8 +55344,7 @@ /obj/machinery/door/airlock/research{ glass = 1; name = "Slime Euthanization Chamber"; - opacity = 0; - req_access_txt = "55" + opacity = 0 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -55114,6 +55355,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/white, /area/science/xenobiology) "pVK" = ( @@ -55288,17 +55530,22 @@ /obj/machinery/door/window{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/security/detective{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/security/detectives_office) "pYs" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/light, +/obj/machinery/space_heater, +/obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/structure/cable{ + icon_state = "4-8" }, /turf/open/floor/plating, /area/ai_monitored/storage/satellite) @@ -55554,6 +55801,9 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard) "qdV" = ( @@ -55599,8 +55849,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/research{ - name = "Xenobiology Lab"; - req_access_txt = "47" + name = "Xenobiology Lab" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ @@ -55613,6 +55862,8 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/science/general, +/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, /turf/open/floor/plasteel/white, /area/science/research) "qeE" = ( @@ -55628,8 +55879,7 @@ /area/aisat) "qeI" = ( /obj/machinery/door/airlock/external{ - name = "MiniSat Space Access Airlock"; - req_one_access_txt = "10;32" + name = "MiniSat Space Access Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -55637,6 +55887,8 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, /area/engine/foyer) "qeN" = ( @@ -55788,13 +56040,12 @@ /turf/open/floor/plating, /area/maintenance/aft) "qgx" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, -/area/mine/eva_secondary) +/area/maintenance/fore) "qgy" = ( /obj/machinery/shower{ dir = 8 @@ -55861,14 +56112,19 @@ /turf/open/floor/plasteel, /area/crew_quarters/locker) "qic" = ( -/obj/item/paper, -/obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor{ name = "Arrivals Security Checkpoint"; - pixel_y = -8; - req_access_txt = "1" + pixel_y = -8 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/mob/living/simple_animal/crab/kreb{ + desc = "Here to lay down the hard claws of the law!"; + health = 50; + name = "Officer Kreb"; + real_name = "Officer Kreb" + }, +/obj/structure/chair/office/dark, +/obj/effect/landmark/event_spawn, /turf/open/floor/plasteel, /area/security/checkpoint/customs) "qih" = ( @@ -55876,6 +56132,7 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -56097,13 +56354,15 @@ /turf/open/floor/plasteel/freezer, /area/mine/living_quarters) "qlF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/machinery/light, -/obj/machinery/space_heater, /obj/effect/turf_decal/stripes/corner{ - dir = 4 + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" }, /turf/open/floor/plating, /area/ai_monitored/storage/satellite) @@ -56189,7 +56448,7 @@ name = "Virology Access Button"; pixel_x = -26; pixel_y = 28; - req_access_txt = "39" + req_access = list("virology") }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -56262,12 +56521,12 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "qnI" = ( @@ -56323,8 +56582,7 @@ /area/tcommsat/computer) "qor" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -56336,6 +56594,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "qot" = ( @@ -56361,20 +56620,10 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "qoH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/light_switch{ - pixel_x = -24; - pixel_y = -23 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/plating, +/turf/closed/wall/r_wall, /area/ai_monitored/storage/satellite) "qoL" = ( /obj/item/taperecorder, @@ -56462,9 +56711,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;5;9" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -56474,6 +56721,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/department/medical/central) "qqy" = ( @@ -56555,8 +56803,7 @@ /area/crew_quarters/bar) "qrk" = ( /obj/machinery/door/airlock/hatch{ - name = "Test Chamber Maintenance"; - req_access_txt = "47" + name = "Test Chamber Maintenance" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -56567,6 +56814,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plating, /area/science/xenobiology) "qrm" = ( @@ -56796,7 +57044,8 @@ /area/hallway/primary/fore) "quD" = ( /obj/machinery/firealarm{ - pixel_y = 38 + pixel_y = 38; + dir = 1 }, /obj/machinery/computer/ai_server_console, /turf/open/floor/plasteel/grimy, @@ -56909,6 +57158,9 @@ "qwd" = ( /obj/item/stack/sheet/cardboard, /obj/item/storage/box/lights/mixed, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "qws" = ( @@ -56922,7 +57174,7 @@ /obj/machinery/computer/med_data/laptop{ dir = 8 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plating, /area/medical/medbay/central) "qwx" = ( /obj/structure/table, @@ -57133,7 +57385,7 @@ "qzU" = ( /obj/machinery/door/airlock/research{ name = "Mech Bay"; - req_one_access_txt = "29;75" + req_access = list("robotics") }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -57463,14 +57715,16 @@ idDoor = "ai_core_airlock_exterior"; idSelf = "ai_core_airlock_control"; pixel_x = 10; - pixel_y = 22 + pixel_y = 22; + req_access = list("ai_master") }, /obj/machinery/doorButtons/airlock_controller{ idExterior = "ai_core_airlock_exterior"; idInterior = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 9; - pixel_y = 32 + pixel_y = 32; + req_access = list("ai_master") }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 5 @@ -57522,12 +57776,14 @@ base_state = "right"; dir = 8; icon_state = "right"; - name = "Containment Pen #4"; - req_access_txt = "55" + name = "Containment Pen #4" }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "qFD" = ( @@ -57539,6 +57795,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/wood, /area/medical/psych) "qFI" = ( @@ -57733,10 +57992,10 @@ frequency = 1449; glass = 1; id_tag = "telecomms_airlock_interior"; - name = "Telecomms Server Room Access"; - req_access_txt = "61" + name = "Telecomms Server Room Access" }, /obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/computer) "qHl" = ( @@ -57765,8 +58024,7 @@ /area/security/main) "qHr" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security E.V.A. Storage"; - req_access_txt = "3" + name = "Security E.V.A. Storage" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -57781,6 +58039,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel, /area/security/brig) "qHs" = ( @@ -57802,6 +58061,16 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/cmo) +"qHw" = ( +/obj/structure/rack, +/obj/item/clothing/suit/poncho, +/obj/item/clothing/head/sombrero, +/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "qHT" = ( /obj/structure/cable{ icon_state = "4-8" @@ -57823,8 +58092,7 @@ dir = 4; icon_state = "right"; name = "Infirmary"; - red_alert_access = 1; - req_access_txt = "5" + red_alert_access = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -57833,6 +58101,9 @@ dir = 6 }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower, +/obj/effect/mapping_helpers/windoor/access/all/security/brig_phys{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/security/brig) "qIe" = ( @@ -58066,14 +58337,13 @@ /turf/open/floor/plasteel/white, /area/science/research) "qLD" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/starboard) "qLU" = ( @@ -58120,7 +58390,7 @@ idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_y = 24; - req_access_txt = "39" + req_access = list("virology") }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -58130,8 +58400,7 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_exterior"; - name = "Virology Exterior Airlock"; - req_access_txt = "39" + name = "Virology Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -58149,6 +58418,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "qNy" = ( @@ -58227,9 +58497,9 @@ dir = 2; icon_state = "right"; layer = 3.1; - name = "Upload Console Window"; - req_access_txt = "16" + name = "Upload Console Window" }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "qOL" = ( @@ -58356,7 +58626,7 @@ name = "Access Button"; pixel_x = 29; pixel_y = -8; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/machinery/light{ dir = 4 @@ -58725,8 +58995,15 @@ /area/maintenance/department/science/xenobiology) "qXd" = ( /obj/effect/spawner/lootdrop/tanks/highquality, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/ai_monitored/storage/satellite) +"qXi" = ( +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plating, +/area/maintenance/starboard) "qXt" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -30 @@ -58842,12 +59119,11 @@ /turf/open/floor/plasteel/dark, /area/mine/laborcamp) "qZg" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment{ - dir = 6 +/obj/effect/turf_decal/stripes/corner{ + dir = 1 }, /turf/open/floor/plating, -/area/maintenance/port/fore) +/area/maintenance/starboard) "qZl" = ( /obj/structure/cable{ icon_state = "4-8" @@ -59033,7 +59309,7 @@ name = "Secondary AI Core Access Button"; pixel_x = 23; pixel_y = -24; - req_one_access_txt = "30;70" + req_access = list("ai_sat") }, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) @@ -59088,7 +59364,8 @@ name = "Medbay Doors Control"; normaldoorcontrol = 1; pixel_x = 1; - pixel_y = 22 + pixel_y = 22; + req_access = list("medical") }, /obj/machinery/modular_computer/telescreen/preset/medical{ pixel_y = 32 @@ -59252,8 +59529,10 @@ dir = 8 }, /obj/machinery/door/window/westright{ - name = "MULEbot Access"; - req_access_txt = "31" + name = "MULEbot Access" + }, +/obj/effect/mapping_helpers/windoor/access/all/supply/cargo_bay{ + dir = 8 }, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -59444,8 +59723,7 @@ /area/science/storage) "rjE" = ( /obj/machinery/door/airlock/command/glass{ - name = "Server Access"; - req_access_txt = "30" + name = "Server Access" }, /obj/machinery/atmospherics/pipe/simple{ dir = 4 @@ -59456,6 +59734,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers, /turf/open/floor/plasteel/dark, /area/science/server) "rjI" = ( @@ -59496,25 +59775,13 @@ /turf/open/floor/plating, /area/engine/atmos/distro) "rkd" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/item/radio/intercom{ - dir = 4; - pixel_x = 27 - }, -/obj/structure/table, -/obj/item/folder/yellow, -/obj/item/folder/yellow, -/obj/item/paper, -/obj/item/paper, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/item/storage/firstaid/regular{ - pixel_x = 1; - pixel_y = 15 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, +/obj/structure/table, /turf/open/floor/plasteel, /area/quartermaster/storage) "rkg" = ( @@ -59766,8 +60033,7 @@ }, /obj/machinery/door/window/brigdoor{ dir = 1; - name = "Brig Control Desk"; - req_access_txt = "3" + name = "Brig Control Desk" }, /obj/item/paper, /obj/structure/cable/yellow{ @@ -59782,6 +60048,10 @@ pixel_y = -3 }, /obj/item/storage/pencil_holder/crew, +/obj/effect/mapping_helpers/windoor/access/all/security/basic, +/obj/effect/mapping_helpers/windoor/access/all/security/armory{ + dir = 1 + }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "rnr" = ( @@ -59789,11 +60059,12 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "rnE" = ( @@ -60011,6 +60282,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/fore) "rtB" = ( @@ -60260,8 +60534,7 @@ /area/maintenance/port) "rwI" = ( /obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "24" + name = "Atmospherics External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -60269,6 +60542,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/engine/atmos/distro) "rwS" = ( @@ -60532,9 +60806,7 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "rAz" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;25;46;70" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -60544,6 +60816,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "rAA" = ( @@ -60595,6 +60868,7 @@ /area/hallway/primary/central) "rBq" = ( /obj/machinery/space_heater, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/maintenance/port/aft) "rBr" = ( @@ -60741,8 +61015,7 @@ /area/crew_quarters/heads/hop) "rDE" = ( /obj/machinery/door/airlock/medical{ - name = "Medbay Backroom"; - req_access_txt = "5" + name = "Medbay Backroom" }, /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/machinery/door/firedoor/border_only, @@ -60753,6 +61026,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/medical/sleeper) "rER" = ( @@ -60803,7 +61077,7 @@ /obj/item/storage/pencil_holder/crew{ pixel_y = 12 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plating, /area/medical/medbay/central) "rFg" = ( /obj/machinery/atmospherics/pipe/simple/violet/hidden{ @@ -60862,13 +61136,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/highsecurity{ id_tag = "ai_core_airlock_exterior"; - name = "AI Core"; - req_access_txt = "65" + name = "AI Core" }, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/ethernet_cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "rGz" = ( @@ -61008,8 +61282,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/security/glass{ - name = "Secure Gear Storage"; - req_access_txt = "3" + name = "Secure Gear Storage" }, /obj/effect/turf_decal/delivery, /obj/structure/cable/yellow{ @@ -61027,6 +61300,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel, /area/security/warden) "rIP" = ( @@ -61052,6 +61326,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/fore) "rIY" = ( @@ -61106,8 +61381,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/engineering{ - name = "Port Bow Solar Access"; - req_access_txt = "10" + name = "Port Bow Solar Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor/border_only{ @@ -61117,6 +61391,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "rKz" = ( @@ -61183,7 +61458,6 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, @@ -61298,8 +61572,7 @@ /area/chapel/main) "rNs" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Isolation A"; - req_access_txt = "39" + name = "Isolation A" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -61313,6 +61586,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/freezer, /area/medical/virology) "rNy" = ( @@ -61403,6 +61677,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "rOi" = ( @@ -61435,7 +61710,8 @@ idDoor = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 9; - pixel_y = -22 + pixel_y = -22; + req_access = list("ai_master") }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) @@ -61597,8 +61873,7 @@ /area/hallway/secondary/service) "rQz" = ( /obj/machinery/door/airlock/mining{ - name = "Cargo Bay"; - req_one_access_txt = "48;50" + name = "Cargo Bay" }, /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -61610,12 +61885,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/construction/storage_wing) "rQJ" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Secure Network Access"; - req_access_txt = "19" + name = "Secure Network Access" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -61629,6 +61904,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "rQK" = ( @@ -62176,16 +62452,22 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ dir = 1; - name = "Kitchen Window"; - req_access_txt = "28" + name = "Kitchen Window" }, /obj/item/paper, /obj/machinery/door/window/eastleft{ dir = 2; - name = "Kitchen Window"; - req_access_txt = "35" + name = "Hydroponics Window" }, -/turf/open/floor/plasteel, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics, +/obj/effect/mapping_helpers/windoor/access/all/service/kitchen{ + dir = 1 + }, +/turf/open/floor/plating, /area/crew_quarters/kitchen) "rXX" = ( /obj/effect/spawner/structure/window/reinforced/tinted, @@ -62417,6 +62699,9 @@ /area/engine/engine_smes) "saT" = ( /obj/structure/closet/l3closet/scientist, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plating{ icon_state = "platingdmg2" }, @@ -62649,7 +62934,9 @@ /obj/machinery/button/door{ id = "Podbaydoor"; pixel_x = -24; - pixel_y = -1 + pixel_y = -1; + req_access = list("external_airlocks"); + name = "Shipbreaking External Control" }, /obj/machinery/light, /turf/open/floor/plasteel, @@ -62695,10 +62982,12 @@ "see" = ( /obj/machinery/door/window/eastleft{ dir = 1; - name = "Robotics Deliveries"; - req_one_access_txt = "29;75" + name = "Robotics Deliveries" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/science/robotics{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/robotics/lab) "seL" = ( @@ -62925,6 +63214,7 @@ "sjB" = ( /obj/item/extinguisher, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/maintenance/central) "skc" = ( @@ -63032,20 +63322,11 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "sme" = ( -/obj/machinery/button/door{ - id = "chemistry_shutters"; - name = "chemistry shutters control"; - pixel_x = 24; - pixel_y = 24; - req_access_txt = "5; 33" - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "chemistry_shutters"; - name = "chemistry shutters" +/obj/effect/turf_decal/stripes/corner{ + dir = 1 }, /turf/open/floor/plating, -/area/medical/chemistry) +/area/maintenance/central) "smi" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -63204,9 +63485,9 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "10;61" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, /area/maintenance/starboard) "soE" = ( @@ -63456,10 +63737,10 @@ /area/mine/maintenance) "ssB" = ( /obj/machinery/door/window/southleft{ - name = "Mass Driver Door"; - req_access_txt = "7" + name = "Mass Driver Door" }, /obj/effect/turf_decal/loading_area, +/obj/effect/mapping_helpers/windoor/access/all/science/toxins, /turf/open/floor/plasteel, /area/science/mixing) "ssC" = ( @@ -63708,8 +63989,7 @@ "svx" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/effect/mapping_helpers/airlock/unres, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -63721,6 +64001,7 @@ /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "svG" = ( @@ -63810,8 +64091,7 @@ "swB" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen #4"; - req_access_txt = "55" + name = "Containment Pen #4" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio7"; @@ -63826,6 +64106,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/engine, /area/science/xenobiology) "swC" = ( @@ -64000,8 +64283,7 @@ dir = 1 }, /obj/machinery/door/airlock/engineering{ - name = "Auxillary Base Construction"; - req_one_access_txt = "32;47;48" + name = "Auxillary Base Construction" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -64018,6 +64300,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base, /turf/open/floor/plasteel, /area/construction/mining/aux_base) "syr" = ( @@ -64094,8 +64377,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/command{ - name = "E.V.A. Storage"; - req_access_txt = "18" + name = "E.V.A. Storage" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -64104,6 +64386,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "sAo" = ( @@ -64240,9 +64523,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;5;39;6" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, @@ -64250,6 +64531,8 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plating, /area/maintenance/aft) "sBR" = ( @@ -64295,13 +64578,13 @@ /area/security/checkpoint/science/research) "sCe" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Storage"; - req_access_txt = "8" + name = "Toxins Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins_storage, /turf/open/floor/plasteel, /area/science/storage) "sCl" = ( @@ -64354,6 +64637,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, +/obj/effect/landmark/event_spawn, /turf/open/floor/plasteel, /area/storage/tools) "sCT" = ( @@ -64796,6 +65080,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/wood, /area/medical/psych) "sKP" = ( @@ -64964,6 +65249,9 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "sNR" = ( @@ -65073,8 +65361,7 @@ /area/security/brig) "sOG" = ( /obj/machinery/door/airlock/maintenance{ - name = "Library Maintenance"; - req_one_access_txt = "12;37" + name = "Library Maintenance" }, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -65084,6 +65371,8 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/library, /turf/open/floor/plating, /area/maintenance/port) "sOJ" = ( @@ -65296,8 +65585,7 @@ /area/icemoon/top_layer/outdoors) "sRs" = ( /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" + name = "Medbay Maintenance" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -65311,6 +65599,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/port/aft) "sRC" = ( @@ -65419,11 +65708,6 @@ dir = 4 }, /obj/structure/plasticflaps, -/obj/machinery/door/window/northright{ - dir = 8; - name = "delivery door"; - req_access_txt = "31" - }, /turf/open/floor/plating, /area/maintenance/disposal) "sTK" = ( @@ -65500,12 +65784,12 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "24" + name = "Atmospherics External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/engine/atmos/distro) "sUq" = ( @@ -65642,8 +65926,7 @@ }, /obj/machinery/door/window/brigdoor{ dir = 4; - name = "Security Desk"; - req_access_txt = "1" + name = "Security Desk" }, /obj/structure/cable/yellow{ icon_state = "1-4" @@ -65667,6 +65950,9 @@ pixel_y = -3 }, /obj/item/storage/pencil_holder/crew, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/security/brig) "sWw" = ( @@ -65723,8 +66009,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ dir = 1; - name = "Delivery Desk"; - req_access_txt = "50" + name = "Delivery Desk" }, /obj/effect/turf_decal/bot, /obj/machinery/door/firedoor/border_only{ @@ -65736,7 +66021,10 @@ pixel_y = -4 }, /obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plasteel, +/obj/effect/mapping_helpers/windoor/access/all/supply/general{ + dir = 1 + }, +/turf/open/floor/plating, /area/quartermaster/sorting) "sXC" = ( /obj/machinery/light{ @@ -65934,8 +66222,7 @@ /area/crew_quarters/kitchen) "sZY" = ( /obj/machinery/door/airlock/command{ - name = "Captain's Quarters"; - req_access_txt = "20" + name = "Captain's Quarters" }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -65944,6 +66231,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) "tal" = ( @@ -66022,7 +66310,7 @@ id = "xenobio7"; name = "Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -66067,7 +66355,14 @@ /obj/item/radio/intercom{ frequency = 1485; name = "Station Intercom (Medbay)"; - pixel_x = 32 + pixel_x = 28 + }, +/obj/machinery/button/door{ + id = "chemistry_shutters"; + name = "chemistry shutters control"; + pixel_x = 24; + pixel_y = -8; + req_access = list("chemistry") }, /turf/open/floor/plasteel/white, /area/medical/chemistry) @@ -66136,6 +66431,9 @@ pixel_x = 2; pixel_y = -2 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "tbX" = ( @@ -66380,6 +66678,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/fore) "tfU" = ( @@ -66592,8 +66893,7 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "MiniSat Space Access Airlock"; - req_one_access_txt = "32;19" + name = "MiniSat Space Access Airlock" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -66606,6 +66906,7 @@ pixel_x = 1; pixel_y = 32 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plating, /area/aisat) "tja" = ( @@ -66631,6 +66932,9 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard) "tjn" = ( @@ -66677,6 +66981,9 @@ pixel_x = 23; pixel_y = -9 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plasteel, /area/vacant_room/commissary) "tjL" = ( @@ -66949,8 +67256,7 @@ "tnY" = ( /obj/machinery/door/airlock/research{ id_tag = "AuxGenetics"; - name = "Genetics Access"; - req_access_txt = "9" + name = "Genetics Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -66965,6 +67271,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel, /area/medical/genetics) "toh" = ( @@ -67011,6 +67318,9 @@ dir = 1; name = "gas ports" }, +/obj/effect/mapping_helpers/windoor/access/all/security/brig{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/security/execution/education) "tpd" = ( @@ -67073,8 +67383,7 @@ /area/hallway/secondary/exit/departure_lounge) "tpY" = ( /obj/machinery/door/airlock/maintenance{ - name = "Hydroponics Maintenance"; - req_access_txt = "35" + name = "Hydroponics Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -67085,6 +67394,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "tqs" = ( @@ -67724,9 +68034,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;63;48;50" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, @@ -67734,6 +68042,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "tzL" = ( @@ -67940,7 +68249,7 @@ id = "Prison Gate"; name = "Prison Wing Lockdown"; pixel_x = 26; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -68082,7 +68391,7 @@ name = "research shutters control"; pixel_x = -26; pixel_y = -26; - req_access_txt = "7" + req_access = list("science") }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -68169,9 +68478,9 @@ autoclose = 0; frequency = 1449; id_tag = "telecomms_airlock_exterior"; - name = "Telecomms Server Room Access"; - req_access_txt = "61" + name = "Telecomms Server Room Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/tcommsat/computer) "tHq" = ( @@ -68246,14 +68555,14 @@ /area/security/prison) "tIJ" = ( /obj/machinery/door/airlock/maintenance{ - name = "Podbay Maintenence"; - req_access_txt = "12" + name = "Podbay Maintenence" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "tIS" = ( @@ -68345,9 +68654,7 @@ /turf/open/floor/plating, /area/crew_quarters/heads/captain/private) "tKa" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "1;4;38;12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -68357,6 +68664,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore) "tKc" = ( @@ -68409,8 +68717,7 @@ /area/medical/medbay/aft) "tKR" = ( /obj/machinery/door/airlock/maintenance{ - name = "Cargo Bay Warehouse Maintenance"; - req_one_access_txt = "31;48" + name = "Cargo Bay Warehouse Maintenance" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -68419,6 +68726,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/maintenance/port/fore) "tKY" = ( @@ -68503,8 +68811,9 @@ id = "MedbayFoyer"; name = "Medbay Doors Control"; normaldoorcontrol = 1; - pixel_x = -36; - pixel_y = 7 + pixel_x = -24; + pixel_y = 6; + req_access = list("security") }, /turf/open/floor/plasteel, /area/security/checkpoint/medical) @@ -68529,8 +68838,7 @@ /area/security/checkpoint/supply) "tMs" = ( /obj/machinery/door/airlock{ - name = "Custodial Closet"; - req_access_txt = "26" + name = "Custodial Closet" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -68546,6 +68854,7 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/plasteel, /area/janitor) "tMF" = ( @@ -68593,6 +68902,9 @@ /obj/structure/sign/departments/minsky/research/research{ pixel_y = 32 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "tNz" = ( @@ -68665,9 +68977,7 @@ /turf/open/floor/plasteel, /area/crew_quarters/locker) "tPi" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;5;39;6" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -68686,6 +68996,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/aft) "tQb" = ( @@ -68934,8 +69245,7 @@ /area/security/checkpoint/science/research) "tTg" = ( /obj/machinery/door/airlock/public/glass{ - name = "Courtroom"; - req_access_txt = "42" + name = "Courtroom" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -68943,6 +69253,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, /turf/open/floor/plasteel/dark, /area/security/courtroom) "tTj" = ( @@ -68950,8 +69261,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/command{ - name = "Teleport Access"; - req_one_access_txt = "17;19" + name = "Teleport Access" }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/delivery, @@ -68961,6 +69271,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/teleporter, /turf/open/floor/plasteel, /area/teleporter) "tTn" = ( @@ -69197,8 +69508,7 @@ /area/security/brig) "tVz" = ( /obj/machinery/door/airlock/security/glass{ - name = "Secure Gear Storage"; - req_access_txt = "3" + name = "Secure Gear Storage" }, /obj/structure/cable/yellow{ icon_state = "1-8" @@ -69219,6 +69529,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel, /area/security/warden) "tVI" = ( @@ -69238,8 +69549,7 @@ "tVU" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock{ - name = "Kitchen Cold Room"; - req_access_txt = "28" + name = "Kitchen Cold Room" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -69250,6 +69560,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) "tVZ" = ( @@ -69317,6 +69628,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating{ icon_state = "platingdmg1" }, @@ -69560,8 +69872,7 @@ /area/maintenance/port/aft) "ubV" = ( /obj/machinery/door/airlock/maintenance{ - name = "Disposal Conveyor Access"; - req_access_txt = "12" + name = "Disposal Conveyor Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -69569,6 +69880,7 @@ }, /obj/effect/decal/cleanable/oil, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/disposal) "ucj" = ( @@ -69640,6 +69952,7 @@ "ucZ" = ( /obj/structure/barricade/wooden/crude/snow, /obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/mine/abandoned) "udj" = ( @@ -69649,13 +69962,13 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/research{ id_tag = "ResearchExt"; - name = "Research Division"; - req_one_access_txt = "47" + name = "Research Division" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel, /area/science/research) "udm" = ( @@ -69674,8 +69987,7 @@ id = "secentranceflasher"; name = "Brig Entrance Flasher"; pixel_x = -3; - pixel_y = -38; - req_access_txt = "1" + pixel_y = -38 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, /obj/effect/turf_decal/trimline/secred/filled/corner/lower, @@ -69812,13 +70124,14 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "ufT" = ( @@ -70072,8 +70385,7 @@ /area/science/xenobiology) "uiA" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -70088,6 +70400,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "uiK" = ( @@ -70108,13 +70421,13 @@ /area/chapel/main) "uiY" = ( /obj/machinery/door/airlock/command{ - name = "Corporate Showroom"; - req_access_txt = "19" + name = "Corporate Showroom" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/wood, /area/bridge/showroom/corporate) "ujv" = ( @@ -70122,13 +70435,18 @@ base_state = "left"; dir = 8; icon_state = "left"; - name = "Security Delivery"; - req_access_txt = "1" + name = "Security Delivery" }, /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/any/security/detective{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/any/security/general{ + dir = 8 + }, /turf/open/floor/plasteel, /area/security/main) "ujO" = ( @@ -70190,10 +70508,14 @@ }, /obj/machinery/door/window/northleft{ dir = 2; - name = "Hydroponics Desk"; - req_access_txt = "35" + name = "Hydroponics Desk" }, -/turf/open/floor/plasteel, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics, +/turf/open/floor/plating, /area/hydroponics) "ukA" = ( /obj/structure/cable{ @@ -70367,7 +70689,7 @@ name = "Cell 2 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "PCell 2"; @@ -70468,8 +70790,7 @@ }, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/effect/mapping_helpers/airlock/unres, /obj/machinery/door/firedoor/border_only{ @@ -70479,6 +70800,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "uoi" = ( @@ -70572,8 +70894,7 @@ dir = 4 }, /obj/machinery/door/airlock/engineering/glass{ - name = "SMES Foyer"; - req_access_txt = "32" + name = "Vacant Room" }, /turf/open/floor/plasteel, /area/mine/vacant) @@ -70939,6 +71260,9 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/command/teleporter{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/teleporter) "uvF" = ( @@ -71143,6 +71467,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_sat{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/aisat) "uyn" = ( @@ -71249,7 +71576,7 @@ name = "Cell 3 Lockdown"; pixel_x = -4; pixel_y = 25; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "PCell 3"; @@ -71318,12 +71645,11 @@ /area/engine/atmos/distro) "uBM" = ( /obj/machinery/mineral/ore_redemption, -/obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/quartermaster/miningoffice) "uCm" = ( /obj/structure/cable/yellow{ @@ -71434,13 +71760,6 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "uDR" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "MiniSat Maintenance"; - req_one_access_txt = "65;19" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -71453,9 +71772,13 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "MiniSat Maintenance" + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/satellite) "uDV" = ( @@ -72055,9 +72378,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/trimline/yellow/warning/lower{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -72388,15 +72708,13 @@ /turf/open/floor/plasteel/white, /area/medical/genetics) "uPk" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "26"; - req_one_access_txt = "12;25;46" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "uPI" = ( @@ -72451,8 +72769,7 @@ /obj/item/pen, /obj/machinery/door/window/northleft{ dir = 2; - name = "Atmospherics Desk"; - req_access_txt = "24" + name = "Atmospherics Desk" }, /obj/machinery/door/poddoor/preopen{ id = "atmos"; @@ -72464,6 +72781,11 @@ }, /obj/item/storage/pencil_holder/crew, /obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos, /turf/open/floor/plating, /area/engine/atmos) "uPS" = ( @@ -72513,11 +72835,18 @@ /turf/open/floor/plasteel, /area/vacant_room/commissary) "uQC" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating{ - icon_state = "platingdmg1" +/obj/structure/disposalpipe/segment{ + dir = 6 }, -/area/maintenance/starboard/aft) +/obj/machinery/door/window/northright{ + dir = 4; + name = "delivery door" + }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/maintenance{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/port/fore) "uQD" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -72661,12 +72990,12 @@ /area/maintenance/disposal) "uSQ" = ( /obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "1" + name = "Security External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/security/prison/hallway) "uTc" = ( @@ -72913,8 +73242,7 @@ /area/maintenance/solars/port/aft) "uWT" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mining Station EVA"; - req_access_txt = "54" + name = "Mining Station EVA" }, /obj/structure/cable{ icon_state = "1-2" @@ -72928,6 +73256,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel, /area/mine/eva) "uWU" = ( @@ -73243,13 +73572,13 @@ "vby" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Maintenance"; - req_access_txt = "24" + name = "Atmospherics Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/starboard) "vbQ" = ( @@ -73316,14 +73645,15 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "vcw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/space_heater, +/obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/stripes/corner{ dir = 4 }, /turf/open/floor/plating, -/area/ai_monitored/storage/satellite) +/area/maintenance/port/fore) "vcy" = ( /obj/structure/chair{ dir = 4 @@ -73434,7 +73764,6 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 1; pixel_y = 32 }, /turf/open/floor/plasteel/white, @@ -73551,6 +73880,9 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "vfR" = ( @@ -73683,12 +74015,14 @@ base_state = "right"; dir = 8; icon_state = "right"; - name = "Containment Pen #2"; - req_access_txt = "55" + name = "Containment Pen #2" }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "viO" = ( @@ -73770,6 +74104,7 @@ /obj/machinery/firealarm{ pixel_y = 26 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel, /area/vacant_room/commissary) "vkJ" = ( @@ -73799,8 +74134,7 @@ /area/storage/tech) "vkX" = ( /obj/machinery/door/airlock/command{ - name = "Head of Personnel"; - req_access_txt = "57" + name = "Head of Personnel" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -73812,6 +74146,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hop, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hop) "vkY" = ( @@ -73857,10 +74192,7 @@ /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 4 }, -/obj/effect/turf_decal/trimline/chemorange/filled/corner/lower{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/chemorange/filled/corner/lower{ +/obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ dir = 8 }, /turf/open/floor/plasteel, @@ -73870,6 +74202,9 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/vacant_room/commissary) "vlO" = ( @@ -73884,15 +74219,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;47" - }, /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "vmb" = ( @@ -73906,11 +74239,10 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "vmi" = ( -/obj/machinery/door/airlock/external{ - req_one_access_txt = "13,8" - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/fore) "vmq" = ( @@ -74006,7 +74338,8 @@ /obj/machinery/button/door{ id = "ceprivacy"; name = "Privacy Shutters Control"; - pixel_y = -26 + pixel_y = -26; + req_access = list("engineering") }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, /turf/open/floor/plasteel/dark, @@ -74033,7 +74366,7 @@ name = "chemistry shutters control"; pixel_x = 26; pixel_y = -26; - req_access_txt = "5; 33" + req_access = list("chemistry") }, /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ dir = 6 @@ -74128,8 +74461,7 @@ /obj/structure/table/reinforced, /obj/item/pen, /obj/machinery/door/window/eastright{ - name = "Robotics Desk"; - req_one_access_txt = "29;75" + name = "Robotics Desk" }, /obj/item/folder/white{ pixel_x = 4; @@ -74157,7 +74489,10 @@ pixel_x = -5; pixel_y = -9 }, -/turf/open/floor/plasteel, +/obj/effect/mapping_helpers/windoor/access/all/science/robotics{ + dir = 4 + }, +/turf/open/floor/plating, /area/science/robotics/lab) "vpY" = ( /obj/structure/sink{ @@ -74348,9 +74683,10 @@ }, /obj/machinery/button/door{ id = "hosspace"; - name = "Space Shutters Control"; + name = "External Shutters Control"; pixel_x = -26; - pixel_y = 34 + pixel_y = 34; + req_access = list("security") }, /obj/machinery/photocopier/faxmachine{ department = "Head of Security"; @@ -74398,8 +74734,7 @@ }, /obj/machinery/door/window/brigdoor{ dir = 8; - name = "Brig Control Desk"; - req_access_txt = "3" + name = "Brig Control Desk" }, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -74411,6 +74746,9 @@ /obj/item/folder/red, /obj/item/folder/red, /obj/item/poster/random_official, +/obj/effect/mapping_helpers/windoor/access/all/security/armory{ + dir = 8 + }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "vtX" = ( @@ -74418,6 +74756,7 @@ name = "Escape Pod Two" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/prison/hallway) "vub" = ( @@ -74425,15 +74764,15 @@ dir = 8 }, /obj/machinery/door/window/westleft{ - name = "MULEbot Access"; - req_access_txt = "31" + name = "MULEbot Access" + }, +/obj/effect/mapping_helpers/windoor/access/all/supply/cargo_bay{ + dir = 8 }, /turf/open/floor/plasteel, /area/quartermaster/storage) "vue" = ( -/obj/machinery/vending/cart{ - req_access_txt = "57" - }, +/obj/machinery/vending/cart, /obj/item/radio/intercom{ pixel_y = 21 }, @@ -74908,8 +75247,7 @@ /area/janitor) "vzB" = ( /obj/machinery/door/window/brigdoor/security/cell/westright{ - dir = 4; - req_one_access = "2" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/general{ dir = 10 @@ -74996,10 +75334,14 @@ }, /obj/machinery/door/window/northleft{ dir = 2; - name = "Paramedic Desk"; - req_access_txt = "69" + name = "Paramedic Desk" }, -/turf/open/floor/plasteel, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/medical/paramedic, +/turf/open/floor/plating, /area/medical/paramedic) "vAJ" = ( /obj/machinery/cell_charger, @@ -75169,9 +75511,10 @@ base_state = "left"; dir = 8; icon_state = "left"; - name = "Library Desk Door"; - pixel_x = 3; - req_access_txt = "37" + name = "Library Desk Door" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/library{ + dir = 8 }, /turf/open/floor/wood, /area/library) @@ -75276,8 +75619,7 @@ /area/security/courtroom) "vFO" = ( /obj/machinery/door/airlock/command{ - name = "Research Division Server Room"; - req_access_txt = "30" + name = "Research Division Server Room" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -75288,6 +75630,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers, /turf/open/floor/plasteel/dark, /area/science/server) "vFW" = ( @@ -75305,7 +75648,7 @@ name = "Test Chamber Blast Doors"; pixel_x = 4; pixel_y = -3; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/structure/table/reinforced, /obj/structure/cable/yellow{ @@ -75406,9 +75749,7 @@ /turf/open/floor/plasteel/dark, /area/tcommsat/computer) "vHR" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -75421,6 +75762,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "vHY" = ( @@ -75518,14 +75860,13 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "vJN" = ( -/obj/machinery/door/airlock/external{ - req_one_access_txt = "13,8" - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/fore) "vJR" = ( @@ -75635,6 +75976,7 @@ /area/hallway/primary/starboard) "vLm" = ( /obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/mine/abandoned) "vLp" = ( @@ -75670,8 +76012,7 @@ dir = 4 }, /obj/machinery/door/airlock/command{ - name = "Research Director's Office"; - req_access_txt = "30" + name = "Research Director's Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -75691,6 +76032,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/rd, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -75739,8 +76081,7 @@ /area/security/brig) "vMm" = ( /obj/machinery/door/airlock/engineering{ - name = "Tech Storage"; - req_one_access_txt = "23;30" + name = "Tech Storage" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -75757,6 +76098,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /turf/open/floor/plasteel/dark, /area/storage/tech) "vMo" = ( @@ -76040,13 +76382,13 @@ icon_state = "1-4" }, /obj/machinery/door/airlock/medical/glass{ - name = "Brig Physician's Office"; - req_access_txt = "74" + name = "Brig Physician's Office" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/brig_phys, /turf/open/floor/plasteel/white, /area/security/brig) "vQV" = ( @@ -76129,11 +76471,14 @@ /turf/open/floor/wood, /area/vacant_room/office) "vSm" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/corner{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard/aft) +/area/maintenance/port/fore) "vSu" = ( /obj/structure/cable{ icon_state = "4-8" @@ -76194,8 +76539,7 @@ /area/storage/primary) "vTc" = ( /obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance"; - req_access_txt = "1" + name = "Security Maintenance" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -76206,6 +76550,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plating, /area/maintenance/port/fore) "vTj" = ( @@ -76325,7 +76671,7 @@ name = "Justice Area Lockdown"; pixel_x = -25; pixel_y = 26; - req_access_txt = "2" + req_access = list("brig") }, /obj/item/assembly/signaler{ pixel_x = -3; @@ -76335,8 +76681,7 @@ id = "justiceflash"; name = "Justice Flash Control"; pixel_x = -36; - pixel_y = 36; - req_access_txt = "1" + pixel_y = 36 }, /obj/machinery/button/door{ id = "SecJusticeChamber"; @@ -76344,7 +76689,7 @@ name = "Justice Vent Control"; pixel_x = -36; pixel_y = 26; - req_access_txt = "3" + req_access = list("brig") }, /turf/open/floor/plasteel/dark, /area/security/execution/education) @@ -76513,8 +76858,7 @@ base_state = "right"; dir = 8; icon_state = "right"; - name = "Containment Pen #1"; - req_access_txt = "55" + name = "Containment Pen #1" }, /obj/machinery/door/poddoor/preopen{ id = "xenobio3"; @@ -76529,6 +76873,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/engine, /area/science/xenobiology) "vXV" = ( @@ -76643,6 +76990,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "vYW" = ( @@ -76650,6 +77000,9 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "vYZ" = ( @@ -76774,8 +77127,7 @@ /area/engine/atmos/distro) "waV" = ( /obj/machinery/door/airlock/hatch{ - name = "MiniSat Access"; - req_one_access_txt = "10;32" + name = "MiniSat Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -76790,6 +77142,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel/dark, /area/engine/foyer) "wbb" = ( @@ -76999,11 +77353,11 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/research{ id_tag = "ResearchExt"; - name = "Research Division"; - req_one_access_txt = "47" + name = "Research Division" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel, /area/science/research) "wen" = ( @@ -77139,7 +77493,8 @@ /obj/machinery/button/door{ id = "telelab"; name = "Test Chamber Blast Doors"; - pixel_y = -25 + pixel_y = -25; + req_access = list("experimentation") }, /turf/open/floor/engine, /area/science/explab) @@ -77317,9 +77672,9 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/engineering/glass{ - name = "SMES Foyer"; - req_access_txt = "32" + name = "SMES Foyer" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engine_smes) "wis" = ( @@ -77332,7 +77687,7 @@ name = "Psych Office Shutters Control"; pixel_x = -5; pixel_y = -25; - req_access_txt = "5" + req_access = list("psychology") }, /obj/machinery/light_switch{ pixel_x = 8; @@ -77529,9 +77884,6 @@ /turf/open/floor/plasteel/dark, /area/bridge) "wlk" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/item/cigbutt{ pixel_x = -10; pixel_y = -3 @@ -77659,8 +78011,7 @@ dir = 8 }, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Treatment"; - req_access_txt = "5" + name = "Medbay Treatment" }, /obj/effect/mapping_helpers/airlock/unres{ dir = 8 @@ -77669,6 +78020,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "wmI" = ( @@ -77778,10 +78130,12 @@ /turf/open/floor/plasteel/dark, /area/engine/foyer) "wop" = ( -/obj/structure/stairs/goon/wide, /obj/effect/turf_decal/ramp_middle{ dir = 1 }, +/obj/structure/stairs/wide_mid{ + dir = 1 + }, /turf/open/floor/plating, /area/mine/living_quarters) "wot" = ( @@ -77995,15 +78349,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;48;50;1" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "wrv" = ( @@ -78206,8 +78559,7 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_interior"; - name = "Virology Interior Airlock"; - req_access_txt = "39" + name = "Virology Interior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -78231,6 +78583,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "wtG" = ( @@ -78326,7 +78679,8 @@ idDoor = "ai_core_airlock_exterior"; idSelf = "ai_core_airlock_control"; pixel_x = 10; - pixel_y = -22 + pixel_y = -22; + req_access = list("ai_master") }, /obj/machinery/light_switch{ pixel_x = -23 @@ -78447,8 +78801,7 @@ /area/engine/atmos/distro) "wxG" = ( /obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" + name = "Supply Dock Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -78456,6 +78809,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/quartermaster/storage) "wxL" = ( @@ -78847,9 +79201,6 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -78902,13 +79253,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;63;48;50" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "wFh" = ( @@ -79078,10 +79428,12 @@ /turf/open/floor/plasteel, /area/quartermaster/sorting) "wHy" = ( -/obj/structure/stairs/goon/wide, /obj/effect/turf_decal/ramp_middle{ dir = 1 }, +/obj/structure/stairs/wide_mid{ + dir = 1 + }, /turf/open/floor/plating, /area/mine/abandoned) "wHH" = ( @@ -79132,10 +79484,6 @@ /turf/open/floor/plasteel, /area/hydroponics) "wIx" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Storage Room"; - req_access_txt = "12" - }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor/border_only{ @@ -79143,6 +79491,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/starboard/fore) "wIz" = ( @@ -79254,9 +79603,10 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Engineering Escape Pod"; - req_one_access_txt = "10;61" + name = "Engineering Escape Pod" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, /area/maintenance/starboard) "wKG" = ( @@ -79271,9 +79621,6 @@ "wKL" = ( /obj/item/cigbutt, /obj/effect/spawner/lootdrop/maintenance, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/item/cigbutt{ pixel_x = 5; pixel_y = -9 @@ -79696,8 +80043,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Brig Infirmary Maintenance"; - req_access_txt = "74" + name = "Brig Infirmary Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -79705,6 +80051,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig_phys, /turf/open/floor/plating, /area/maintenance/port/fore) "wPG" = ( @@ -79778,6 +80125,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/machinery/door/window/northright{ + name = "delivery door" + }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/maintenance{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "wQE" = ( @@ -80079,8 +80432,7 @@ /area/hallway/primary/aft) "wVn" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "5" + name = "Medbay Storage" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -80095,6 +80447,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/storage) "wVq" = ( @@ -80118,8 +80471,7 @@ /area/hallway/primary/central) "wVZ" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Post - Research Division"; - req_access_txt = "63" + name = "Security Post - Research Division" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -80136,6 +80488,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/science/research) "wWf" = ( @@ -80232,7 +80585,7 @@ id = "corporate_privacy"; name = "corporate showroom shutters control"; pixel_x = 28; - req_access_txt = "19" + req_access = list("command") }, /obj/item/poster/random_official, /obj/item/poster/random_official, @@ -80283,13 +80636,13 @@ /area/science/xenobiology) "wXZ" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mech Bay Maintenance"; - req_one_access_txt = "29;75" + name = "Mech Bay Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plating, /area/maintenance/department/science/central) "wYe" = ( @@ -80348,8 +80701,7 @@ /area/hallway/primary/central) "wYZ" = ( /obj/machinery/door/airlock{ - name = "Law Office"; - req_access_txt = "38" + name = "Law Office" }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -80358,6 +80710,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/service/lawyer, /turf/open/floor/wood, /area/lawoffice) "wZa" = ( @@ -80458,6 +80811,9 @@ /area/crew_quarters/heads/captain/private) "xaY" = ( /obj/item/trash/cheesie, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/port) "xaZ" = ( @@ -80661,6 +81017,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -80867,8 +81226,7 @@ /area/mine/maintenance) "xhN" = ( /obj/machinery/door/airlock/external{ - name = "MiniSat Space Access Airlock"; - req_one_access_txt = "32;19" + name = "MiniSat Space Access Airlock" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 @@ -80876,6 +81234,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plating, /area/aisat) "xhP" = ( @@ -80970,8 +81329,7 @@ "xjt" = ( /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_exterior"; - name = "Physical Core Access"; - req_one_access_txt = "30;70" + name = "Networking Chamber Access" }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ @@ -80990,6 +81348,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) "xjB" = ( @@ -81526,7 +81885,7 @@ name = "Privacy Shutters Control"; pixel_x = -24; pixel_y = -6; - req_access_txt = "28" + req_access = list("hop") }, /obj/machinery/light_switch{ pixel_x = -25; @@ -81580,15 +81939,15 @@ name = "Atmospherics Lockdown"; pixel_x = 24; pixel_y = 24; - req_one_access_txt = "1;24" + req_access = list("security") }, /obj/machinery/button/door{ desc = "A remote control-switch for the engineering security doors."; id = "Engineering"; name = "Engineering Lockdown"; pixel_x = 24; - pixel_y = 16; - req_one_access_txt = "1;10" + pixel_y = 14; + req_access = list("security") }, /obj/structure/table, /obj/item/paper_bin{ @@ -81737,8 +82096,7 @@ /area/crew_quarters/heads/captain/private) "xtB" = ( /obj/machinery/door/airlock/maintenance{ - name = "Library Maintenance"; - req_one_access_txt = "12;37" + name = "Library Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -81746,6 +82104,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/library, /turf/open/floor/plating, /area/maintenance/port) "xtF" = ( @@ -81901,7 +82261,7 @@ id = "hop"; name = "Privacy Shutters Control"; pixel_y = 25; - req_access_txt = "28" + req_access = list("hop") }, /obj/structure/table/wood, /turf/open/floor/wood, @@ -81978,8 +82338,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ - id_tag = "commissarydoor"; - req_one_access_txt = "12;63;48;50;36" + id_tag = "commissarydoor" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -81987,6 +82346,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "xww" = ( @@ -82120,7 +82480,7 @@ idSelf = "xeno_airlock_control"; name = "Access Button"; pixel_x = -24; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -82130,8 +82490,7 @@ autoclose = 0; frequency = 1449; id_tag = "xeno_airlock_exterior"; - name = "Xenobiology Lab External Airlock"; - req_access_txt = "55" + name = "Xenobiology Lab External Airlock" }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/border_only{ @@ -82139,6 +82498,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/white, /area/science/xenobiology) "xxX" = ( @@ -82166,8 +82526,7 @@ /area/science/robotics/lab) "xyb" = ( /obj/machinery/door/airlock/engineering{ - name = "Starboard Quarter Solar Access"; - req_access_txt = "10" + name = "Starboard Quarter Solar Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -82184,6 +82543,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -82359,10 +82719,12 @@ }, /obj/machinery/door/window/eastright{ dir = 1; - name = "Hydroponics Delivery"; - req_access_txt = "35" + name = "Hydroponics Delivery" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hydroponics) "xAc" = ( @@ -82410,7 +82772,7 @@ name = "Bar Shutters Control"; pixel_x = 24; pixel_y = 9; - req_access_txt = "25" + req_access = list("bar") }, /obj/machinery/light_switch{ pixel_x = 22 @@ -82499,6 +82861,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/mine/laborcamp) +"xBK" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ai_monitored/storage/satellite) "xBM" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -82695,13 +83069,12 @@ /area/medical/medbay/aft) "xEu" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;25;46" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard) "xEx" = ( @@ -82725,7 +83098,7 @@ name = "Kitchen Shutters Control"; pixel_x = -8; pixel_y = 23; - req_access_txt = "28" + req_access = list("kitchen") }, /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -82865,8 +83238,7 @@ /area/engine/engineering) "xGx" = ( /obj/machinery/door/airlock/hatch{ - name = "Telecomms Control Room"; - req_one_access_txt = "19; 61" + name = "Telecomms Control Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -82880,6 +83252,7 @@ /obj/structure/ethernet_cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "xGM" = ( @@ -82913,20 +83286,15 @@ "xHh" = ( /obj/machinery/button/holosign{ id = "surgery_b"; - pixel_x = -36; - pixel_y = -10 - }, -/obj/machinery/light_switch{ - pixel_x = -26; - pixel_y = -9 + pixel_x = -24; + pixel_y = -6 }, /obj/machinery/button/door{ id = "surgery_shutters"; name = "Surgery shutters"; - pixel_x = -36; - pixel_y = -1; - req_access_txt = "45"; - req_one_access_txt = null + pixel_x = -24; + pixel_y = 6; + req_access = list("surgery") }, /obj/structure/table, /obj/item/clothing/gloves/color/latex, @@ -82956,28 +83324,29 @@ name = "Secure Lab Shutter Control"; pixel_x = -5; pixel_y = -5; - req_access_txt = "47" + req_access = list("science") }, /obj/structure/table/reinforced, /obj/machinery/button/door{ id = "rdprivacy"; name = "Privacy Shutters Control"; pixel_x = 5; - pixel_y = 5 + pixel_y = 5; + req_access = list("science") }, /obj/machinery/button/door{ id = "Biohazard"; name = "Entrance Shutter Control"; pixel_x = -5; pixel_y = 5; - req_access_txt = "47" + req_access = list("science") }, /obj/machinery/button/door{ id = "toxins_blastdoor"; name = "Toxins Shutter Control"; pixel_x = 5; pixel_y = -5; - req_access_txt = "47" + req_access = list("science") }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -83159,8 +83528,7 @@ /area/hallway/primary/fore) "xKk" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Distribution Loop"; - req_access_txt = "24" + name = "Distribution Loop" }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/door/firedoor/border_only{ @@ -83181,6 +83549,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/distro) "xKu" = ( @@ -83304,7 +83673,7 @@ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_y = 24; - req_access_txt = "31" + req_access = list("cargo") }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -83366,14 +83735,14 @@ /area/chapel/main) "xNf" = ( /obj/machinery/door/airlock/command{ - name = "E.V.A. Storage"; - req_access_txt = "18" + name = "E.V.A. Storage" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "xNl" = ( @@ -83578,20 +83947,16 @@ "xPy" = ( /obj/machinery/door/window/westleft{ dir = 4; - name = "Bridge Deliveries"; - req_access_txt = "19" + name = "Bridge Deliveries" }, /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; name = "bridge blast door" }, /obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor/border_only{ +/obj/effect/mapping_helpers/windoor/access/all/command/general{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, /turf/open/floor/plasteel, /area/bridge) "xPG" = ( @@ -83601,6 +83966,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/maintenance/starboard/fore) "xPI" = ( @@ -83619,7 +83988,7 @@ /obj/item/clothing/under/rank/civilian/assistantformal, /obj/item/clothing/suit/hooded/wintercoat, /obj/item/clothing/shoes/winterboots, -/obj/effect/turf_decal/trimline/yellow/filled/corner/lower{ +/obj/effect/turf_decal/stripes/corner{ dir = 1 }, /turf/open/floor/plasteel/dark, @@ -83666,12 +84035,12 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/security/glass{ id_tag = "innerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "xQE" = ( @@ -83757,8 +84126,7 @@ /area/maintenance/department/science) "xSu" = ( /obj/machinery/door/airlock{ - name = "Bar Storage"; - req_access_txt = "25" + name = "Bar Storage" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -83767,6 +84135,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/wood, /area/crew_quarters/bar) "xSx" = ( @@ -83829,12 +84198,13 @@ /area/quartermaster/office) "xTW" = ( /obj/machinery/door/airlock/public/glass{ - name = "space-bridge access" + name = "External-Bridge Access" }, /obj/machinery/button/door{ id = "supplybridge"; - name = "Shuttle Bay Space Bridge Control"; - pixel_y = 27 + name = "Shuttle Bay External Bridge Control"; + pixel_y = 27; + req_access = list("external_airlocks") }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -83848,6 +84218,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "xUa" = ( @@ -83954,8 +84327,7 @@ /obj/machinery/door/airlock/research{ glass = 1; name = "Slime Euthanization Chamber"; - opacity = 0; - req_access_txt = "55" + opacity = 0 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -83966,6 +84338,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/white, /area/science/xenobiology) "xVS" = ( @@ -84156,8 +84529,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/security/glass{ - name = "Security Post - Cargo"; - req_access_txt = "63" + name = "Security Post - Cargo" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -84171,18 +84543,20 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "xYv" = ( /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/structure/cable{ icon_state = "1-2" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "xYI" = ( @@ -84264,15 +84638,14 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "xZO" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/fore) "xZR" = ( @@ -84280,8 +84653,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/engineering/glass{ - name = "Power Monitoring"; - req_access_txt = "32" + name = "Power Monitoring" }, /obj/effect/turf_decal/bot{ dir = 1 @@ -84292,6 +84664,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel{ dir = 1 }, @@ -84351,8 +84724,7 @@ /area/crew_quarters/heads/hos) "yaE" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Station Maintenance"; - req_access_txt = "48" + name = "Mining Station Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -84369,6 +84741,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/open/floor/plasteel/dark/side{ dir = 8 }, @@ -84678,8 +85051,7 @@ /area/medical/virology) "yeI" = ( /obj/machinery/door/airlock/maintenance{ - name = "Research Maintenance"; - req_one_access_txt = "7;47;29" + name = "Research Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -84690,6 +85062,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/department/science/central) "yeY" = ( @@ -84710,6 +85083,9 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "yfb" = ( @@ -84751,8 +85127,7 @@ /area/science/xenobiology) "ygb" = ( /obj/machinery/door/airlock/virology{ - name = "Break Room"; - req_access_txt = "39" + name = "Break Room" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -84770,6 +85145,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "ygo" = ( @@ -84835,8 +85211,7 @@ /area/crew_quarters/fitness/recreation) "yhs" = ( /obj/machinery/door/airlock/research{ - name = "Nanite Laboratory"; - req_one_access_txt = "7;47;29" + name = "Nanite Laboratory" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -84856,6 +85231,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/science/nanite) "yhz" = ( @@ -166191,7 +166567,7 @@ uxg gOs aaU upf -qgx +rZh rZh bgq dEM @@ -230176,7 +230552,7 @@ dUL eyU rNk tZe -qZg +mRX gdg kfK kfK @@ -230432,7 +230808,7 @@ dUL dUL dUL hCU -pjj +tZe pjg rNk cTU @@ -230690,7 +231066,7 @@ dUL dUL rNk tZe -btq +pjg rNk uOH cTU @@ -231203,7 +231579,7 @@ pZb tZe sSA tZe -mRX +uQC drz tZe tZe @@ -231521,7 +231897,7 @@ fPt vSj ilD wnd -ydD +fIf oiw jmC jmC @@ -232528,7 +232904,7 @@ dUC qwd cPQ vQC -hHv +vcw vDG duv kfs @@ -233270,7 +233646,7 @@ tZe tZe vfB uGV -tZe +ten edc rNk aMT @@ -233321,7 +233697,7 @@ dHB dHB dHB dUg -cxT +oQs wyz lGh kZT @@ -235320,10 +235696,10 @@ cTR exh vhC dfW -ncq +tZe cED tZe -ncq +tZe hHv rNk rNk @@ -236691,7 +237067,7 @@ pTD sUg rBq vlc -xLq +btq xLq xLq mqk @@ -237139,7 +237515,7 @@ qTj hOk xqM rNk -mKF +vSm rNk rNk rNk @@ -237400,10 +237776,10 @@ vYV gvO cdk xsU -gvO +ncq qih nMx -fWd +lBl fWd gsh rNk @@ -240752,7 +241128,7 @@ hAt byf ewQ gUm -jBJ +sme sKP sbe kHW @@ -242841,7 +243217,7 @@ hUC nbv sEn diI -sme +pcn diI pcn diI @@ -243879,7 +244255,7 @@ nAn mpG oPx onx -rNV +pjj mHL vLa qJI @@ -245450,7 +245826,7 @@ wlq bwy hIF pDH -fIf +iqX ueX ozK ozK @@ -247725,7 +248101,7 @@ aeK rbU rbU rbU -cFq +mPH lWb aJi tdO @@ -249210,7 +249586,7 @@ iWS ifc mxO hhy -wbr +qgx eRM miN eRM @@ -249808,7 +250184,7 @@ boa jWS aCX mae -gyB +aCX iuS ksP bQS @@ -250742,7 +251118,7 @@ bja iNw sUe gep -wbr +mjN onR uJA uJA @@ -251283,7 +251659,7 @@ oJE dqx uxM uxM -wdp +cxT jXO jXO jXO @@ -251331,7 +251707,7 @@ wVd nhL abB lXG -cFq +gyB uwo cFq ydb @@ -251345,13 +251721,13 @@ aAj aKa kdu ksP -xwT +pQQ bnL wLc wLc qkE mhr -uQC +mot hmb bQS bQS @@ -252322,7 +252698,7 @@ sTW wDW pZy kal -kal +qXi rfi aQV dZc @@ -252378,9 +252754,9 @@ bQS bQS bQS uhS -fuF +leq +ciy ciy -lBl uhS bQS bQS @@ -252823,7 +253199,7 @@ hTI jMb dTU aYL -wdp +cwR nOj nOj prA @@ -252836,7 +253212,7 @@ lFl jwm pZy cRI -kal +hgm rfi bza iiO @@ -253146,8 +253522,8 @@ kmI txK ksP xyL -pQQ -vSm +tOC +ciy tOC ciy aZX @@ -253628,7 +254004,7 @@ pOP pOP rTH rTH -jls +hCo uUC uUC xqA @@ -254377,7 +254753,7 @@ lLS cgk srU pZy -kal +nVE oDs uha uha @@ -254394,9 +254770,9 @@ bUG uha qdH qaH -pAu +ouV uUC -kal +qZg kal qvw kal @@ -254655,7 +255031,7 @@ gFP alO alO alO -vMf +fuF eeF xdW pLF @@ -256144,7 +256520,7 @@ rfQ mYF lhB jXO -sZq +qHw nOj rfW nOj @@ -259249,7 +259625,7 @@ whE whE whE ept -kal +nVE hFP xog kGl @@ -272109,9 +272485,9 @@ jYF tRh tRh jYF -cPn -reK -aUQ +uEX +eUy +qlF qoe cDq lum @@ -272366,9 +272742,9 @@ jYF tRh tRh jYF -nWc -mQJ -iOi +jrS +xBK +qXd jYF qoe qoe @@ -272623,9 +272999,9 @@ tRh tRh tRh jYF -fvM -qDz -fHR +rYS +jKN +pYs jYF jYF jYF @@ -272880,9 +273256,9 @@ tRh tRh tRh jYF -git -hon -oWL +dPj +bfu +qoH jYF tRh tRh @@ -273137,9 +273513,9 @@ tRh tRh tRh jYF -dPj -nVE -dPj +cPn +reK +aUQ jYF tRh tRh @@ -273394,9 +273770,9 @@ gWW tRh tRh jYF -uEX -qoH -hgm +nWc +mQJ +iOi jYF tRh tRh @@ -273651,9 +274027,9 @@ euQ tRh tRh jYF -jrS -vcw -qXd +fvM +qDz +fHR jYF tRh tRh @@ -273908,9 +274284,9 @@ oET ueX ueX jYF -rYS -pYs -qlF +git +hon +oWL jYF ueX ueX diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 3876e3420fe6..e543ca33042c 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -354,14 +354,14 @@ name = "Cell 5 Blast Door Control"; pixel_x = -28; pixel_y = 8; - req_access_txt = "63" + req_access = list("brig") }, /obj/machinery/button/door{ id = "cell4 blast"; name = "Cell 4 Blast Door Control"; pixel_x = -28; pixel_y = -8; - req_access_txt = "63" + req_access = list("brig") }, /turf/open/floor/plasteel, /area/security/prison) @@ -430,8 +430,7 @@ "acz" = ( /obj/machinery/door/airlock/medical{ id_tag = "GeneticsDoor"; - name = "Genetics"; - req_access_txt = "5; 68" + name = "Cloning Lab" }, /obj/effect/mapping_helpers/airlock/unres{ dir = 4 @@ -455,6 +454,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cloning, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "acF" = ( @@ -692,8 +692,7 @@ dir = 8 }, /obj/machinery/door/airlock/security{ - name = "Labor Shuttle"; - req_access_txt = "63" + name = "Labor Shuttle" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -705,6 +704,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/processing) "aex" = ( @@ -1056,8 +1056,7 @@ base_state = "left"; dir = 8; icon_state = "left"; - name = "Security Delivery"; - req_access_txt = "1" + name = "Security Delivery" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -1072,6 +1071,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/windoor/access/any/security/detective{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/any/security/general{ + dir = 8 + }, /turf/open/floor/plasteel, /area/security/main) "ahg" = ( @@ -1222,10 +1227,10 @@ /area/engine/foyer) "aiw" = ( /obj/machinery/door/window/southleft{ - name = "Engineering Delivery"; - req_access_txt = "10" + name = "Engineering Delivery" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/engineering/general, /turf/open/floor/plasteel, /area/maintenance/port/aft) "aiy" = ( @@ -1395,9 +1400,9 @@ /area/crew_quarters/heads/hos) "ajR" = ( /obj/machinery/door/window/southleft{ - name = "Court Cell"; - req_access_txt = "2" + name = "Court Cell" }, +/obj/effect/mapping_helpers/windoor/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/courtroom) "ajX" = ( @@ -1682,8 +1687,7 @@ /area/security/courtroom) "aml" = ( /obj/machinery/door/airlock/command/glass{ - name = "Research Director"; - req_access_txt = "30" + name = "Research Director" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -1709,6 +1713,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/rd, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/hor) "amn" = ( @@ -1803,8 +1808,7 @@ name = "test chamber blast door" }, /obj/machinery/door/airlock/research/glass{ - name = "Test Chamber"; - req_access_txt = "47" + name = "Test Chamber" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -1814,6 +1818,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel, /area/science/misc_lab) "amY" = ( @@ -1917,9 +1922,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/fore) "anR" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -1935,6 +1938,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore/secondary) "anT" = ( @@ -2005,8 +2009,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ - name = "Detective Maintenance"; - req_access_txt = "4" + name = "Detective Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -2023,6 +2026,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/detective, /turf/open/floor/plating, /area/maintenance/fore) "aoC" = ( @@ -2315,8 +2319,7 @@ dir = 4 }, /obj/machinery/door/airlock/security/glass{ - name = "Prison Security Post"; - req_access_txt = "2" + name = "Prison Security Post" }, /obj/structure/cable{ icon_state = "4-8" @@ -2327,6 +2330,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison) "aqO" = ( @@ -2467,8 +2471,7 @@ /area/crew_quarters/dorms) "aso" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Isolation A"; - req_access_txt = "39" + name = "Isolation A" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -2485,6 +2488,7 @@ /obj/effect/turf_decal/trimline/green/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "asv" = ( @@ -2789,13 +2793,14 @@ name = "Prison Wing Lockdown"; pixel_x = -27; pixel_y = 8; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/door{ id = "Secure Gate"; name = "Cell Shutters"; pixel_x = -27; - pixel_y = -2 + pixel_y = -2; + req_access = list("brig") }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) @@ -2850,8 +2855,7 @@ /area/science/nanite) "auW" = ( /obj/machinery/door/airlock/security{ - name = "Brig"; - req_access_txt = "63; 42" + name = "Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -2863,6 +2867,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "avd" = ( @@ -2872,6 +2877,15 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) +"avf" = ( +/obj/effect/turf_decal/trimline/secred/filled/corner/lower{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "avj" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -3004,13 +3018,13 @@ base_state = "left"; dir = 2; icon_state = "left"; - name = "Robotics Desk"; - req_one_access_txt = "29;75" + name = "Robotics Desk" }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 8 }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower, +/obj/effect/mapping_helpers/windoor/access/any/science/robotics, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) "awr" = ( @@ -3043,8 +3057,7 @@ /area/maintenance/starboard/fore) "awP" = ( /obj/machinery/door/airlock/engineering{ - name = "Electrical Maintenance"; - req_access_txt = "11" + name = "Electrical Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -3061,6 +3074,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plating, /area/maintenance/starboard/fore) "awQ" = ( @@ -3127,6 +3141,8 @@ }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/obj/effect/mapping_helpers/airlock/access/any/engineering/aux_base, /turf/open/floor/plating, /area/construction/mining/aux_base) "axl" = ( @@ -3149,8 +3165,7 @@ /area/solar/port/fore) "axw" = ( /obj/machinery/door/airlock/command/glass{ - name = "EVA Storage"; - req_access_txt = "18" + name = "EVA Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -3164,6 +3179,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "axG" = ( @@ -3251,9 +3267,9 @@ }, /obj/effect/turf_decal/tile/bar, /obj/machinery/door/airlock{ - name = "Bar Storage"; - req_access_txt = "25" + name = "Bar Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plasteel, /area/crew_quarters/bar) "ayB" = ( @@ -3267,8 +3283,7 @@ /area/security/brig) "ayD" = ( /obj/machinery/door/airlock/public/glass{ - name = "Auxiliary Tool Storage"; - req_access_txt = "12" + name = "Auxiliary Tool Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -3285,6 +3300,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plasteel, /area/storage/tools) "ayF" = ( @@ -3629,15 +3645,14 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/fore/secondary) "aBe" = ( @@ -3675,6 +3690,8 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/obj/effect/mapping_helpers/airlock/access/any/engineering/aux_base, /turf/open/floor/plating, /area/construction/mining/aux_base) "aBs" = ( @@ -3954,12 +3971,12 @@ }, /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2"; shuttledocked = 1 }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/security/processing) "aDd" = ( @@ -4043,8 +4060,7 @@ dir = 8 }, /obj/machinery/door/airlock/external{ - name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -4058,6 +4074,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/security/processing) "aDn" = ( @@ -4115,7 +4132,8 @@ id = "briggate"; name = "Desk Shutters"; pixel_x = -26; - pixel_y = 6 + pixel_y = 6; + req_access = list("security") }, /obj/machinery/button/flasher{ id = "brigentry"; @@ -4130,13 +4148,13 @@ "aDI" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/command{ - name = "Command Tool Storage"; - req_access_txt = "19" + name = "Command Tool Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "aDR" = ( @@ -4398,8 +4416,7 @@ /area/security/brig) "aGq" = ( /obj/machinery/door/airlock/public/glass{ - name = "Courtroom"; - req_access_txt = "42" + name = "Courtroom" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -4409,6 +4426,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/courtroom) "aGs" = ( @@ -4486,8 +4504,7 @@ /obj/structure/window/reinforced, /obj/machinery/door/window{ dir = 8; - name = "High-Risk Modules"; - req_access_txt = "20" + name = "High-Risk Modules" }, /obj/item/aiModule/supplied/oxygen, /obj/item/aiModule/supplied/protectStation, @@ -4495,6 +4512,9 @@ /obj/item/aiModule/reset/purge, /obj/item/aiModule/supplied/quarantine, /obj/effect/spawner/lootdrop/aimodule_harmful, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 8 + }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "aHl" = ( @@ -4603,15 +4623,14 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "aHQ" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore/secondary) "aHR" = ( @@ -4646,13 +4665,13 @@ /area/crew_quarters/toilet) "aHW" = ( /obj/machinery/door/airlock/external{ - name = "Construction Zone"; - req_one_access_txt = "32;47;48" + name = "Construction Zone" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base, /turf/open/floor/plating, /area/construction/mining/aux_base) "aHY" = ( @@ -4841,8 +4860,7 @@ /area/hallway/primary/central) "aJy" = ( /obj/machinery/door/airlock/hatch{ - name = "Telecomms Tech Storage"; - req_access_txt = "61" + name = "Telecomms Tech Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -4860,6 +4878,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/tcommsat/computer) "aJz" = ( @@ -5101,8 +5120,7 @@ /area/hydroponics) "aKX" = ( /obj/machinery/door/airlock/security{ - name = "Security Checkpoint"; - req_access_txt = "1" + name = "Security Checkpoint" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -5117,15 +5135,17 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/checkpoint/auxiliary) "aKY" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/fore) "aLa" = ( @@ -5460,7 +5480,7 @@ name = "Privacy Shutters Control"; pixel_x = -5; pixel_y = -25; - req_access_txt = "28" + req_access = list("kitchen") }, /obj/machinery/camera{ c_tag = "Kitchen South"; @@ -5829,9 +5849,7 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "aPF" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -5846,6 +5864,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "aPG" = ( @@ -6090,8 +6109,7 @@ /area/medical/paramedic) "aRv" = ( /obj/machinery/door/airlock/maintenance{ - name = "Testing Lab Maintenance"; - req_access_txt = "47" + name = "Testing Lab Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -6105,11 +6123,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plating, /area/maintenance/starboard/aft) "aRJ" = ( /obj/machinery/door/airlock/mining{ - req_access_txt = "48" + name = "Mining Bay" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -6127,6 +6146,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "aRM" = ( @@ -6144,8 +6164,7 @@ /area/library) "aRO" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Break Room"; - req_access_txt = "39" + name = "Break Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -6162,17 +6181,15 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "aRQ" = ( -/obj/machinery/door/morgue{ - name = "Private Study"; - req_access_txt = "37" - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/morgue/curator, /turf/open/floor/plasteel/cult, /area/library) "aRR" = ( @@ -6253,6 +6270,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base, /turf/open/floor/plating, /area/construction/mining/aux_base) "aSk" = ( @@ -6323,8 +6341,10 @@ "aTc" = ( /obj/machinery/door/window/northright{ dir = 8; - name = "Library Desk Door"; - req_access_txt = "37" + name = "Library Desk Door" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/library{ + dir = 8 }, /turf/open/floor/wood, /area/library) @@ -6368,8 +6388,7 @@ /area/crew_quarters/locker) "aTz" = ( /obj/machinery/door/airlock/maintenance{ - name = "Fitness Maintenance"; - req_access_txt = "12" + name = "Fitness Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -6381,6 +6400,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore/secondary) "aTA" = ( @@ -6560,13 +6580,13 @@ }, /obj/machinery/door/airlock/highsecurity{ id_tag = "ai_core_airlock_exterior"; - name = "AI Core"; - req_access_txt = "65" + name = "AI Core" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "aicoredoor"; name = "AI Chamber entrance shutters" }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) "aUL" = ( @@ -6614,8 +6634,7 @@ /area/maintenance/starboard/fore) "aUY" = ( /obj/machinery/door/airlock/maintenance{ - name = "Aux Base Construction Maintenance"; - req_access_txt = "12" + name = "Aux Base Construction Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -6626,6 +6645,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "aVc" = ( @@ -6741,8 +6761,7 @@ /area/crew_quarters/toilet/locker) "aWB" = ( /obj/machinery/door/airlock/maintenance{ - name = "Holodeck Maintenance"; - req_access_txt = "12" + name = "Holodeck Maintenance" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -6750,6 +6769,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "aWC" = ( @@ -6805,8 +6825,7 @@ /area/quartermaster/office) "aXd" = ( /obj/machinery/door/airlock/command{ - name = "Teleport Access"; - req_access_txt = "17" + name = "Teleport Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -6830,6 +6849,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/command/teleporter, /turf/open/floor/plasteel, /area/teleporter) "aXp" = ( @@ -7680,13 +7700,15 @@ "bfo" = ( /obj/machinery/door/window/eastright{ dir = 1; - name = "Bridge Delivery"; - req_access_txt = "19" + name = "Bridge Delivery" }, /obj/effect/turf_decal/delivery, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/windoor/access/all/command/general{ + dir = 1 + }, /turf/open/floor/plasteel, /area/bridge/meeting_room) "bfr" = ( @@ -7791,8 +7813,7 @@ "bgv" = ( /obj/machinery/door/window/eastleft{ icon_state = "right"; - name = "Mail"; - req_access_txt = "50" + name = "Mail" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -7870,7 +7891,7 @@ name = "Warehouse Door Control"; pixel_x = -1; pixel_y = -24; - req_access_txt = "31" + req_access = list("cargo") }, /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, @@ -7881,9 +7902,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "bhh" = ( @@ -7964,8 +7986,7 @@ "bhB" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -7974,6 +7995,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "bhE" = ( @@ -7996,9 +8018,7 @@ /turf/open/floor/plasteel/white, /area/medical/storage) "bhH" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -8009,6 +8029,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/starboard) "bhM" = ( @@ -8038,12 +8059,13 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/engineering/glass{ - name = "Shared Engineering Storage"; - req_one_access_txt = "10;32" + name = "Shared Engineering Storage" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel, /area/engine/storage_shared) "bhV" = ( @@ -8166,8 +8188,7 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance_hatch{ - name = "Disposals Access"; - req_access_txt = "12" + name = "Disposals Access" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -8175,6 +8196,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "bjg" = ( @@ -8497,8 +8519,7 @@ dir = 1 }, /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -8506,6 +8527,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "bmi" = ( @@ -8518,14 +8540,14 @@ /area/crew_quarters/dorms) "bmo" = ( /obj/machinery/door/airlock/command{ - name = "Head of Personnel"; - req_access_txt = "57" + name = "Head of Personnel" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/hop, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "bmr" = ( @@ -8635,8 +8657,7 @@ /area/engine/atmos/storage) "bnE" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -8653,6 +8674,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "bnH" = ( @@ -8802,11 +8824,11 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/security{ - name = "Detective's Backroom"; - req_access_txt = "4" + name = "Detective's Backroom" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/detective, /turf/open/floor/plasteel/dark, /area/security/detectives_office) "bpc" = ( @@ -9031,7 +9053,7 @@ name = "Shutters Control Button"; pixel_x = 24; pixel_y = -24; - req_one_access_txt = "29;75" + req_access = list("robotics") }, /turf/open/floor/plasteel, /area/science/robotics/lab) @@ -9153,8 +9175,7 @@ /area/science/storage) "bsn" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Storage"; - req_access_txt = "8" + name = "Toxins Storage" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only{ @@ -9172,6 +9193,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins_storage, /turf/open/floor/plasteel, /area/science/storage) "bsF" = ( @@ -9241,8 +9263,10 @@ base_state = "right"; dir = 1; icon_state = "right"; - name = "Brig Desk"; - req_access_txt = "1" + name = "Brig Desk" + }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 1 }, /turf/open/floor/plating, /area/security/brig) @@ -9273,8 +9297,7 @@ /area/science/mixing) "btn" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Launch Room"; - req_access_txt = "7" + name = "Toxins Launch Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -9291,6 +9314,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel, /area/science/mixing) "bts" = ( @@ -9298,6 +9322,9 @@ /obj/machinery/camera/motion{ c_tag = "EVA Motion Sensor" }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "btu" = ( @@ -9473,8 +9500,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/security/glass{ id_tag = "innerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -9484,6 +9510,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "buU" = ( @@ -9626,13 +9653,13 @@ /area/engine/engineering) "bvX" = ( /obj/machinery/door/airlock/maintenance{ - name = "Garden Maintenance"; - req_access_txt = "12" + name = "Garden Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "bwe" = ( @@ -9912,8 +9939,7 @@ /area/maintenance/fore) "byI" = ( /obj/machinery/door/airlock/maintenance{ - name = "EVA Maintenance"; - req_access_txt = "18" + name = "EVA Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -9930,6 +9956,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel, /area/maintenance/fore) "byP" = ( @@ -10076,8 +10103,7 @@ /area/science/research) "bAb" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Maintenance"; - req_access_txt = "48" + name = "Mining Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -10097,6 +10123,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plating, /area/maintenance/port/aft) "bAj" = ( @@ -10131,8 +10158,7 @@ /area/science/server) "bAB" = ( /obj/machinery/door/airlock/command/glass{ - name = "Server Room"; - req_access_txt = "30" + name = "Server Room" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -10143,6 +10169,7 @@ /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers, /turf/open/floor/plasteel/dark, /area/science/server) "bAC" = ( @@ -10653,8 +10680,7 @@ /area/engine/atmos/mix) "bEh" = ( /obj/machinery/door/airlock/maintenance{ - id_tag = "commissarydoor"; - req_one_access_txt = "12;63;48;50;36" + id_tag = "commissarydoor" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -10665,6 +10691,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore) "bEm" = ( @@ -10752,9 +10779,7 @@ /turf/open/floor/plasteel, /area/engine/atmos/mix) "bFY" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "8;12" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -10770,6 +10795,8 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/starboard) "bFZ" = ( @@ -10827,7 +10854,8 @@ id = "ceprivacy"; name = "Privacy Shutters Control"; pixel_x = -24; - pixel_y = 10 + pixel_y = 10; + req_access = list("engineering") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -10945,8 +10973,7 @@ /area/maintenance/aft) "bHn" = ( /obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance"; - req_access_txt = "1" + name = "Security Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -10954,6 +10981,8 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plating, /area/maintenance/port/fore) "bHo" = ( @@ -11097,8 +11126,7 @@ /area/science/research) "bIT" = ( /obj/machinery/door/airlock/maintenance{ - name = "Tool Storage Maintenance"; - req_access_txt = "12" + name = "Tool Storage Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -11109,6 +11137,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "bJi" = ( @@ -11134,8 +11163,7 @@ "bJu" = ( /obj/structure/lattice, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 @@ -11143,6 +11171,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/fore) "bJv" = ( @@ -11214,10 +11243,10 @@ /area/science/mixing) "bKf" = ( /obj/machinery/door/window/southleft{ - name = "Mass Driver Door"; - req_access_txt = "7" + name = "Mass Driver Door" }, /obj/effect/turf_decal/loading_area, +/obj/effect/mapping_helpers/windoor/access/all/science/toxins, /turf/open/floor/plasteel, /area/science/mixing) "bKr" = ( @@ -11456,8 +11485,7 @@ /area/library) "bLT" = ( /obj/machinery/door/airlock/atmos{ - name = "Equipment Room"; - req_access_txt = "24" + name = "Equipment Room" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -11478,6 +11506,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/foyer) "bLX" = ( @@ -11788,13 +11817,13 @@ /area/ai_monitored/storage/eva) "bPg" = ( /obj/machinery/door/airlock/command{ - name = "Command Tool Storage"; - req_access_txt = "19" + name = "Command Tool Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "bPh" = ( @@ -11924,8 +11953,7 @@ dir = 4 }, /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" + name = "Bridge" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -11956,6 +11984,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "bQp" = ( @@ -11979,8 +12008,7 @@ /area/maintenance/solars/starboard/aft) "bQs" = ( /obj/machinery/door/airlock/maintenance{ - name = "Experimentation Lab Maintenance"; - req_access_txt = "47" + name = "Experimentation Lab Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -11994,6 +12022,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/science/experimentation, /turf/open/floor/plating, /area/maintenance/starboard) "bQw" = ( @@ -12275,14 +12304,14 @@ /area/maintenance/fore) "bTG" = ( /obj/machinery/door/airlock/command/glass{ - name = "EVA Storage"; - req_access_txt = "18" + name = "EVA Storage" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "bTH" = ( @@ -12427,8 +12456,7 @@ "bWn" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/eastleft{ - dir = 8; - req_access_txt = "9" + dir = 8 }, /obj/machinery/door/poddoor/shutters/preopen{ id = "genedesk"; @@ -12444,6 +12472,9 @@ pixel_x = 8; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/science/genetics{ + dir = 8 + }, /turf/open/floor/plating, /area/medical/genetics) "bWr" = ( @@ -12613,13 +12644,14 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "bYT" = ( @@ -12806,7 +12838,7 @@ normaldoorcontrol = 1; pixel_x = 26; pixel_y = 26; - req_one_access_txt = "29;75" + req_access = list("robotics") }, /obj/item/book/manual/wiki/robotics_cyborgs{ pixel_x = 2; @@ -12817,7 +12849,7 @@ name = "Shutters Control Button"; pixel_x = 26; pixel_y = 38; - req_one_access_txt = "29;75" + req_access = list("robotics") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 @@ -12975,13 +13007,15 @@ dir = 4 }, /obj/machinery/door/window/westleft{ - name = "Atmospherics Delivery"; - req_access_txt = "24" + name = "Atmospherics Delivery" }, /obj/structure/window/reinforced, /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/engine/atmos/foyer) "cek" = ( @@ -13136,15 +13170,20 @@ /obj/item/paper, /obj/machinery/door/window/westright{ dir = 1; - name = "Security Checkpoint"; - req_access_txt = "1" + name = "Security Checkpoint" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, +/obj/effect/mapping_helpers/windoor/access/any/security/detective{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/any/security/general{ + dir = 1 + }, +/turf/open/floor/plating, /area/hallway/secondary/entry) "cfY" = ( /obj/effect/landmark/xeno_spawn, @@ -13285,7 +13324,7 @@ name = "Atmospherics Lockdown"; pixel_x = -24; pixel_y = -7; - req_access_txt = "24" + req_access = list("atmospherics") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -13661,9 +13700,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/maintenance{ - name = "Kitchen Maintenance"; - req_access_txt = "28" + name = "Kitchen Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plating, /area/maintenance/starboard/fore) "clE" = ( @@ -13676,8 +13715,7 @@ /area/hydroponics) "clF" = ( /obj/machinery/door/airlock/maintenance{ - name = "Hydroponics Maintenance"; - req_access_txt = "35" + name = "Hydroponics Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -13689,6 +13727,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plating, /area/maintenance/starboard/fore) "clG" = ( @@ -13808,8 +13847,7 @@ /area/maintenance/starboard/aft) "cna" = ( /obj/machinery/door/window/eastleft{ - name = "Medical Delivery"; - req_access_txt = "5" + name = "Medical Delivery" }, /obj/effect/turf_decal/delivery, /obj/structure/cable{ @@ -13818,6 +13856,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "cnh" = ( @@ -14036,7 +14077,8 @@ id = "Skynet_launch"; name = "Mech Bay Door Control"; pixel_x = 6; - pixel_y = 24 + pixel_y = 24; + req_access = list("robotics") }, /obj/machinery/light_switch{ pixel_x = -6; @@ -14228,14 +14270,15 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "csa" = ( @@ -14303,8 +14346,7 @@ "ctl" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer_L"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -14321,6 +14363,7 @@ dir = 8 }, /obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "ctu" = ( @@ -14559,13 +14602,14 @@ /area/ai_monitored/storage/satellite) "cvV" = ( /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "cwc" = ( @@ -14679,9 +14723,9 @@ dir = 8 }, /obj/machinery/door/airlock/external{ - name = "Security Escape Airlock"; - req_access_txt = "2" + name = "Security Escape Airlock" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/hallway/secondary/exit) "cyp" = ( @@ -14983,7 +15027,7 @@ name = "Chemistry shutters"; pixel_x = 26; pixel_y = 7; - req_one_access_txt = "5; 33" + req_access = list("chemistry") }, /obj/effect/turf_decal/trimline/chemorange/warning/lower, /obj/effect/turf_decal/trimline/chemorange/filled/corner/lower{ @@ -15055,6 +15099,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/wood, /area/lawoffice) "cDK" = ( @@ -15100,8 +15145,7 @@ dir = 8 }, /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" + name = "Bridge" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -15132,6 +15176,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "cEu" = ( @@ -15200,8 +15245,7 @@ /obj/structure/rack, /obj/machinery/door/window/brigdoor{ dir = 4; - name = "Armory Door"; - req_access_txt = "1" + name = "Armory Door" }, /obj/item/gun/energy/disabler{ pixel_x = -4; @@ -15227,6 +15271,9 @@ pixel_x = 2; pixel_y = -2 }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "cGS" = ( @@ -15309,10 +15356,12 @@ /area/science/robotics/lab) "cIg" = ( /obj/machinery/door/window/eastright{ - name = "Hydroponics Delivery"; - req_access_txt = "35" + name = "Hydroponics Delivery" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hydroponics) "cIh" = ( @@ -15430,8 +15479,7 @@ /area/hallway/secondary/entry) "cKt" = ( /obj/machinery/door/airlock/command/glass{ - name = "Chief Medical Officer"; - req_access_txt = "40" + name = "Chief Medical Officer" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -15452,6 +15500,7 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/cmo) "cKu" = ( @@ -15485,8 +15534,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/security/glass{ id_tag = "permainterior"; - name = "Permabrig Transfer"; - req_access_txt = "2" + name = "Permabrig Transfer" }, /obj/structure/cable{ icon_state = "1-2" @@ -15496,6 +15544,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/prison) "cLg" = ( @@ -15691,9 +15740,7 @@ /turf/open/floor/engine/co2, /area/engine/atmos/distro) "cNI" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -15703,15 +15750,14 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/central) "cNW" = ( /turf/closed/wall, /area/maintenance/starboard/aft) "cNX" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "8;12" - }, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, @@ -15727,6 +15773,8 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/general, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cNZ" = ( @@ -16157,7 +16205,7 @@ name = "Biohazard Shutter Control"; pixel_x = -5; pixel_y = 28; - req_access_txt = "47" + req_access = list("security") }, /turf/open/floor/plasteel, /area/security/checkpoint/science) @@ -16258,12 +16306,11 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard) "cWd" = ( @@ -16335,8 +16382,7 @@ /area/medical/medbay/central) "cXW" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics"; - req_access_txt = "24" + name = "Atmospherics" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -16348,6 +16394,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/mix) "cZh" = ( @@ -16490,8 +16537,7 @@ /area/bridge) "daK" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Visitation Observation"; - req_access_txt = "2" + name = "Prison Visitation Observation" }, /obj/structure/cable{ icon_state = "1-2" @@ -16502,6 +16548,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/prison/hallway) "daN" = ( @@ -16570,8 +16617,7 @@ "dcn" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "permaouter"; - name = "Permabrig Transfer"; - req_access_txt = "2" + name = "Permabrig Transfer" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -16586,6 +16632,7 @@ /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/prison/hallway) "ddb" = ( @@ -16686,8 +16733,7 @@ /area/hallway/primary/central) "dfz" = ( /obj/machinery/door/airlock/maintenance{ - name = "Dormitories Maintenance"; - req_access_txt = "12" + name = "Dormitories Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -16698,6 +16744,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore/secondary) "dfD" = ( @@ -16939,8 +16986,7 @@ /area/quartermaster/office) "dlt" = ( /obj/machinery/door/airlock{ - name = "Law Office"; - req_access_txt = "38" + name = "Law Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -16948,6 +16994,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/lawyer, /turf/open/floor/wood, /area/lawoffice) "dlv" = ( @@ -17122,7 +17169,8 @@ id = "hosspace"; name = "Space Shutters Control"; pixel_x = -26; - pixel_y = 34 + pixel_y = 34; + req_access = list("security") }, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) @@ -17168,8 +17216,7 @@ dir = 8 }, /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" + name = "Bridge" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -17184,6 +17231,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "doP" = ( @@ -17449,8 +17497,7 @@ name = "Surgery shutters"; pixel_x = 26; pixel_y = 6; - req_access_txt = "45"; - req_one_access_txt = null + req_access = list("surgery") }, /obj/machinery/button/holosign{ id = "surgery"; @@ -17710,12 +17757,12 @@ /area/hallway/secondary/exit) "dzN" = ( /obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "24" + name = "Atmospherics External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/engine/atmos/distro) "dzR" = ( @@ -17899,7 +17946,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "dDm" = ( /obj/effect/landmark/observer_start, @@ -18112,8 +18159,7 @@ dir = 8 }, /obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator and SMES"; - req_one_access_txt = "11;32" + name = "Gravity Generator and SMES" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -18121,6 +18167,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engine_smes) "dHE" = ( @@ -18226,8 +18273,7 @@ /area/security/main) "dJK" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics"; - req_access_txt = "24" + name = "Atmospherics" }, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ @@ -18236,6 +18282,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/foyer) "dJQ" = ( @@ -18270,8 +18317,7 @@ /area/security/checkpoint/engineering) "dKN" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = -2; @@ -18280,12 +18326,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "dKQ" = ( /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -18294,6 +18340,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "dKR" = ( @@ -18454,7 +18501,7 @@ id = "captain blast"; name = "Privacy Shutters Control"; pixel_x = 5; - req_access_txt = "20" + req_access = list("captain") }, /turf/open/floor/stone, /area/crew_quarters/heads/captain) @@ -18580,14 +18627,14 @@ name = "Privacy Shutters Control"; pixel_x = 6; pixel_y = 25; - req_access_txt = "57" + req_access = list("hop") }, /obj/machinery/button/door{ id = "hopqueue"; name = "Queue Shutters Control"; pixel_x = -4; pixel_y = 25; - req_access_txt = "57" + req_access = list("hop") }, /obj/machinery/light_switch{ pixel_x = -4; @@ -18621,12 +18668,12 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison/hallway) "dQG" = ( @@ -18715,8 +18762,7 @@ dir = 8 }, /obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" + name = "Research Division Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -18736,6 +18782,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel/white, /area/science/research) "dSD" = ( @@ -18947,7 +18994,6 @@ "dWG" = ( /obj/machinery/door/airlock/security{ name = "Security Office"; - req_one_access_txt = "1;4"; security_level = 1 }, /obj/machinery/door/firedoor/border_only{ @@ -18966,6 +19012,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/main) "dXb" = ( @@ -19023,7 +19071,7 @@ "dXX" = ( /obj/machinery/computer/rdconsole/production{ dir = 8; - req_access = list(32) + req_access = list("engineering") }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 5 @@ -19125,8 +19173,7 @@ /area/crew_quarters/heads/hop) "eaO" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -19147,6 +19194,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "ebl" = ( @@ -19236,9 +19284,9 @@ dir = 8 }, /obj/machinery/door/window/southleft{ - name = "Kitchen Delivery"; - req_access_txt = "28" + name = "Kitchen Delivery" }, +/obj/effect/mapping_helpers/windoor/access/all/service/kitchen, /turf/open/floor/plasteel/freezer, /area/crew_quarters/kitchen) "ecK" = ( @@ -19283,7 +19331,7 @@ name = "Counter Shutters Control"; pixel_x = -25; pixel_y = 24; - req_access_txt = "25" + req_access = list("bar") }, /obj/machinery/light_switch{ pixel_x = -25; @@ -19294,7 +19342,7 @@ name = "Window Shutters Control"; pixel_x = -25; pixel_y = 32; - req_access_txt = "25" + req_access = list("bar") }, /turf/open/floor/plasteel, /area/crew_quarters/bar) @@ -19305,15 +19353,11 @@ name = "Mech Bay APC"; pixel_x = -25 }, -/obj/structure/cable{ - icon_state = "0-4" - }, /turf/open/floor/mech_bay_recharge_floor, /area/science/robotics/mechbay) "edT" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Quartermaster"; - req_access_txt = "41" + name = "Quartermaster" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -19325,6 +19369,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, /turf/open/floor/plasteel, /area/quartermaster/qm) "edX" = ( @@ -19413,7 +19458,7 @@ name = "Engineering Lockdown"; pixel_x = -24; pixel_y = -6; - req_access_txt = "10" + req_access = list("security") }, /obj/machinery/recharger/wallrecharger{ pixel_x = -22; @@ -19521,12 +19566,6 @@ /turf/open/floor/plasteel, /area/janitor) "ehI" = ( -/obj/machinery/button/door{ - id = "telelab"; - name = "Test Chamber Blast Doors"; - pixel_x = 25; - req_access_txt = "47" - }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 @@ -19593,7 +19632,7 @@ name = "Paramedic Staging Area Shutters"; pixel_x = 26; pixel_y = 6; - req_access_txt = "69" + req_access = list("paramedic") }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 @@ -19928,6 +19967,7 @@ /obj/structure/cable{ icon_state = "0-4" }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/wood, /area/lawoffice) "era" = ( @@ -19941,7 +19981,7 @@ name = "Shutters Control Button"; pixel_x = -6; pixel_y = 25; - req_one_access_txt = "29;75" + req_access = list("robotics") }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 9 @@ -20050,15 +20090,14 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard) "esK" = ( @@ -20087,8 +20126,10 @@ /obj/effect/turf_decal/delivery, /obj/machinery/door/window/southleft{ dir = 8; - name = "Bar Delivery"; - req_access_txt = "25" + name = "Bar Delivery" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/bar{ + dir = 8 }, /turf/open/floor/plasteel, /area/crew_quarters/bar) @@ -20106,13 +20147,13 @@ "etp" = ( /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_exterior"; - name = "Physical Core Access"; - req_one_access_txt = "30;70" + name = "Physical Core Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) "etv" = ( @@ -20271,8 +20312,7 @@ /area/ai_monitored/storage/satellite) "evg" = ( /obj/machinery/door/window/southleft{ - name = "Armory"; - req_access_txt = "3" + name = "Armory" }, /obj/effect/turf_decal/stripes{ dir = 10 @@ -20286,17 +20326,18 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/security/armory, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "evq" = ( /obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance"; - req_access_txt = "2" + name = "Security Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/maintenance/fore) "evy" = ( @@ -20315,8 +20356,7 @@ "evC" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/southright{ - name = "Research and Development Desk"; - req_access_txt = "7" + name = "Research and Development Desk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "rnd"; @@ -20333,6 +20373,7 @@ /obj/item/storage/pencil_holder/crew{ pixel_x = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/general, /turf/open/floor/plating, /area/science/lab) "evD" = ( @@ -20438,11 +20479,11 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/maintenance_hatch{ - name = "MiniSat Maintenance"; - req_access_txt = "65" + name = "MiniSat Maintenance" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/satellite) "exB" = ( @@ -21050,8 +21091,7 @@ /area/hallway/primary/starboard) "eII" = ( /obj/machinery/door/airlock/medical{ - name = "Medbay Reception"; - req_access_txt = "5" + name = "Medbay Reception" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -21063,6 +21103,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "eIR" = ( @@ -21249,7 +21290,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "eLV" = ( /obj/structure/grille/broken, @@ -21455,8 +21496,7 @@ /area/quartermaster/storage) "eOu" = ( /obj/machinery/door/airlock/maintenance{ - name = "Law Office Maintenance"; - req_access_txt = "38" + name = "Law Office Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -21468,6 +21508,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/lawyer, /turf/open/floor/plating, /area/maintenance/fore) "eOA" = ( @@ -21559,9 +21600,7 @@ /turf/open/floor/plasteel/dark, /area/engine/engine_smes) "eRb" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -21572,6 +21611,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "eRe" = ( @@ -21811,8 +21851,7 @@ /area/science/misc_lab) "eVH" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Launch Room Access"; - req_access_txt = "7" + name = "Toxins Launch Room Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -21838,6 +21877,7 @@ /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel/white, /area/science/mixing) "eVJ" = ( @@ -22053,12 +22093,12 @@ dir = 8 }, /obj/machinery/door/airlock/medical{ - name = "Morgue"; - req_access_txt = "6" + name = "Morgue" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/plasteel, /area/medical/morgue) "eYI" = ( @@ -22110,8 +22150,7 @@ /area/quartermaster/storage) "eZu" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Treatment"; - req_access_txt = "5" + name = "Medbay Treatment" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -22132,6 +22171,7 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "eZD" = ( @@ -22304,12 +22344,14 @@ dir = 1; icon_state = "right"; layer = 3.1; - name = "Upload Console Window"; - req_access_txt = "16" + name = "Upload Console Window" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 1 + }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "fer" = ( @@ -22482,7 +22524,7 @@ name = "Test Chamber Blast Doors"; pixel_x = -13; pixel_y = 6; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/structure/table/reinforced, /obj/structure/window/reinforced{ @@ -22499,7 +22541,7 @@ name = "Test Chamber Blast Doors"; pixel_x = -13; pixel_y = 6; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/item/folder/white{ pixel_x = 4; @@ -22617,9 +22659,9 @@ /obj/effect/turf_decal/ramp_middle, /obj/machinery/door/window/northleft{ dir = 2; - name = "Captain's Desk Door"; - req_one_access_txt = "20" + name = "Captain's Desk Door" }, +/obj/effect/mapping_helpers/windoor/access/all/command/captain, /turf/open/floor/plasteel/stairs/goon/wood_stairs_wide, /area/crew_quarters/heads/captain) "fiE" = ( @@ -22680,11 +22722,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/window/brigdoor{ - dir = 1; - name = "SMES Access"; - req_access_txt = "11" - }, /turf/open/floor/plating, /area/engine/engine_smes) "fke" = ( @@ -23127,12 +23164,11 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "79" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/service/general, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "ftn" = ( @@ -23335,8 +23371,7 @@ /area/maintenance/starboard/aft) "fvN" = ( /obj/machinery/door/airlock/engineering{ - name = "Construction Area"; - req_access_txt = "32" + name = "Construction Area" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -23354,6 +23389,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, /turf/open/floor/plating, /area/construction) "fvP" = ( @@ -23363,13 +23399,12 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore) "fwa" = ( @@ -23537,8 +23572,7 @@ /area/crew_quarters/toilet) "fzq" = ( /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -23547,6 +23581,7 @@ /obj/effect/turf_decal/trimline/green/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "fzs" = ( @@ -23909,8 +23944,7 @@ base_state = "left"; dir = 8; icon_state = "left"; - name = "Chemistry Desk"; - req_access_txt = "33" + name = "Chemistry Desk" }, /obj/machinery/door/poddoor/preopen{ id = "chemistry_shutters"; @@ -23920,6 +23954,9 @@ pixel_x = 8; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry{ + dir = 8 + }, /turf/open/floor/plating, /area/medical/chemistry) "fFW" = ( @@ -23946,6 +23983,24 @@ /obj/effect/turf_decal/trimline/secred/warning/lower, /turf/open/floor/plasteel/dark, /area/bridge) +"fGp" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/fore) "fGz" = ( /obj/machinery/camera{ c_tag = "Atmospherics East"; @@ -23965,8 +24020,7 @@ /area/engine/atmos/mix) "fHf" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = 2; @@ -23978,6 +24032,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "fHi" = ( @@ -24127,11 +24182,12 @@ /area/hallway/primary/port) "fJG" = ( /obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "63" + name = "Security External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plating, /area/security/main) "fJJ" = ( @@ -24161,14 +24217,14 @@ name = "Bridge Blast Door Control"; pixel_x = 28; pixel_y = 8; - req_access_txt = "19" + req_access = list("command") }, /obj/machinery/button/door{ id = "tcomms_bridge"; - name = "Telecommunications server shutters control"; + name = "Telecommunications Shutter Control"; pixel_x = 28; pixel_y = -2; - req_one_access_txt = "19;61" + req_access = list("command") }, /obj/structure/chair/comfy/black{ dir = 1; @@ -24344,8 +24400,7 @@ /area/maintenance/port) "fLz" = ( /obj/machinery/door/airlock/medical{ - name = "Paramedic Staging Area"; - req_access_txt = "69" + name = "Paramedic Staging Area" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -24357,6 +24412,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plasteel/white, /area/medical/paramedic) "fLD" = ( @@ -24394,8 +24450,7 @@ /area/science/xenobiology) "fMw" = ( /obj/machinery/door/airlock/medical{ - name = "Medbay Break Room"; - req_access_txt = "5" + name = "Medbay Break Room" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -24412,6 +24467,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "fMR" = ( @@ -24792,9 +24848,6 @@ /area/security/prison) "fVy" = ( /obj/structure/lattice/catwalk, -/obj/structure/sign/warning/vacuum/external{ - pixel_y = 32 - }, /turf/closed/wall, /area/maintenance/starboard/fore) "fVY" = ( @@ -24889,7 +24942,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "fYZ" = ( /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ @@ -24938,8 +24991,7 @@ /area/quartermaster/storage) "gaa" = ( /obj/machinery/door/airlock/maintenance{ - name = "Construction Area Maintenance"; - req_access_txt = "32" + name = "Construction Area Maintenance" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -24957,6 +25009,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, /turf/open/floor/plating, /area/maintenance/port/aft) "gac" = ( @@ -25301,8 +25354,7 @@ /area/crew_quarters/bar) "gfL" = ( /obj/machinery/door/airlock{ - name = "Custodial Closet"; - req_access_txt = "26" + name = "Custodial Closet" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -25316,6 +25368,7 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/plasteel, /area/janitor) "gfP" = ( @@ -25471,10 +25524,12 @@ base_state = "left"; dir = 8; icon_state = "left"; - name = "Research Division Delivery"; - req_access_txt = "7" + name = "Research Division Delivery" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/science/general{ + dir = 8 + }, /turf/open/floor/plasteel, /area/science/lab) "gji" = ( @@ -25650,8 +25705,7 @@ /area/science/xenobiology) "gnW" = ( /obj/machinery/door/airlock/maintenance{ - name = "Genetics Maintenance"; - req_access_txt = "5;9;68" + name = "Genetics Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -25662,6 +25716,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plating, /area/maintenance/aft) "gon" = ( @@ -25739,8 +25794,7 @@ "gqI" = ( /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_interior"; - name = "Physical Core Access"; - req_one_access_txt = "30;70" + name = "Physical Core Access" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -25754,6 +25808,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plating, /area/ai_monitored/secondarydatacore) "gqO" = ( @@ -25772,14 +25827,26 @@ "gqZ" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ - name = "Hydroponics Desk"; - req_access_txt = "35" + name = "Hydroponics Window" }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/turf/open/floor/plasteel, +/obj/machinery/door/window/eastleft{ + dir = 8; + name = "Kitchen Window" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/all/service/kitchen{ + dir = 8 + }, +/turf/open/floor/plating, /area/crew_quarters/kitchen) "gri" = ( /obj/machinery/door/firedoor/border_only{ @@ -25958,8 +26025,7 @@ name = "security shutters" }, /obj/machinery/door/window/eastright{ - name = "Brig Desk"; - req_access_txt = "2" + name = "Brig Desk" }, /obj/item/restraints/handcuffs, /obj/item/radio/off, @@ -25969,6 +26035,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, /turf/open/floor/plating, /area/security/brig) "gus" = ( @@ -26104,7 +26173,7 @@ id = "Shuttle Construction Storage"; name = "Shuttle Construction Storage"; pixel_x = 24; - req_access_txt = "11" + req_access = list("aux_base") }, /obj/effect/turf_decal/delivery, /obj/structure/closet/emcloset, @@ -26171,7 +26240,7 @@ name = "Biohazard Shutter Control"; pixel_x = 29; pixel_y = -4; - req_access_txt = "47" + req_access = list("security") }, /turf/open/floor/plasteel, /area/security/checkpoint/science) @@ -26274,7 +26343,7 @@ name = "Counter Shutters Control"; pixel_x = -27; pixel_y = -5; - req_access_txt = "28" + req_access = list("kitchen") }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) @@ -26435,8 +26504,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ dir = 4; - name = "Atmospherics Desk"; - req_access_txt = "24" + name = "Atmospherics Desk" }, /obj/machinery/door/poddoor/preopen{ id = "atmos"; @@ -26455,6 +26523,9 @@ /obj/item/storage/pencil_holder/crew{ pixel_x = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos{ + dir = 4 + }, /turf/open/floor/plating, /area/engine/atmos/foyer) "gFf" = ( @@ -26520,8 +26591,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/medical{ - name = "Operating Theatre"; - req_access_txt = "45" + name = "Operating Theatre" }, /obj/machinery/holosign/surgery{ id = "surgery" @@ -26540,6 +26610,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /turf/open/floor/plasteel/white, /area/medical/surgery) "gGo" = ( @@ -26563,8 +26634,7 @@ /area/hydroponics/garden) "gGM" = ( /obj/machinery/door/airlock/maintenance{ - name = "Xenobiology Maintenance"; - req_access_txt = "55" + name = "Xenobiology Maintenance" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -26574,6 +26644,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plating, /area/maintenance/aft) "gHh" = ( @@ -26945,8 +27016,7 @@ "gPr" = ( /obj/machinery/door/airlock/research/glass{ name = "Kill Chamber"; - normalspeed = 0; - req_access_txt = "55" + normalspeed = 0 }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -26957,6 +27027,7 @@ /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "gPA" = ( @@ -27358,7 +27429,8 @@ idDoor = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = -23; - pixel_y = 7 + pixel_y = 7; + req_access = list("ai_master") }, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) @@ -27461,13 +27533,13 @@ /area/janitor) "gVS" = ( /obj/machinery/door/window/southleft{ - name = "Virology"; - req_one_access_txt = "39;24" + name = "Virology" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/windoor/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "gWj" = ( @@ -27820,13 +27892,13 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer_L"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, /obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "hcE" = ( @@ -27954,8 +28026,7 @@ /area/space/nearstation) "hft" = ( /obj/machinery/door/airlock/command{ - name = "Server Room"; - req_access_txt = "30" + name = "R&D Servers and Networking" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -27967,6 +28038,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers, /turf/open/floor/plasteel/dark, /area/science/server) "hfu" = ( @@ -28463,8 +28535,10 @@ /obj/item/clothing/suit/armor/laserproof, /obj/machinery/door/window/brigdoor{ dir = 4; - name = "Armory Door"; - req_access_txt = "1" + name = "Armory Door" + }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -28539,7 +28613,7 @@ name = "Toxins Mixing Room Access Console"; pixel_x = -24; pixel_y = 8; - req_one_access_txt = "8" + req_access = list("toxins") }, /obj/structure/cable{ icon_state = "1-2" @@ -28678,8 +28752,7 @@ /area/crew_quarters/locker) "hrt" = ( /obj/machinery/door/airlock/maintenance{ - name = "Cargo Bay Warehouse Maintenance"; - req_access_txt = "31" + name = "Cargo Bay Warehouse Maintenance" }, /obj/structure/sign/warning/electricshock{ pixel_x = 32 @@ -28691,6 +28764,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/maintenance/port) "hrw" = ( @@ -28862,8 +28936,7 @@ /area/maintenance/starboard/fore) "htf" = ( /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -28877,6 +28950,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "htI" = ( @@ -29211,8 +29285,7 @@ /area/maintenance/aft) "hAI" = ( /obj/machinery/door/airlock{ - name = "Private Restroom"; - req_access_txt = "20" + name = "Private Restroom" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -29231,21 +29304,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos/storage) -"hAT" = ( -/obj/machinery/door/window/northleft{ - base_state = "right"; - dir = 8; - icon_state = "right"; - name = "Containment Pen 6"; - req_access_txt = "55" - }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio_l"; - name = "Left side containment blast door" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/engine, -/area/science/xenobiology) "hBe" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -29296,8 +29354,7 @@ /area/security/courtroom) "hBA" = ( /obj/machinery/door/airlock/engineering{ - name = "Vacant Office A"; - req_access_txt = "32" + name = "Vacant Office A" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/door/firedoor/border_only{ @@ -29315,6 +29372,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, /turf/open/floor/wood, /area/vacant_room) "hBJ" = ( @@ -29394,8 +29452,7 @@ /area/engine/engineering) "hCu" = ( /obj/machinery/door/airlock{ - name = "Kitchen"; - req_access_txt = "28" + name = "Kitchen" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -29403,6 +29460,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "hCy" = ( @@ -29683,8 +29741,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" + name = "Medbay Maintenance" }, /obj/structure/cable{ icon_state = "4-8" @@ -29692,6 +29749,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) "hIx" = ( @@ -29769,9 +29827,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/bar, -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, +/obj/structure/closet/secure_closet/bar, /turf/open/floor/plasteel, /area/crew_quarters/bar) "hKu" = ( @@ -29866,8 +29922,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ - name = "Bar Maintenance"; - req_one_access_txt = "12;25" + name = "Bar Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -29875,6 +29930,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/bar, /turf/open/floor/plating, /area/maintenance/starboard/fore) "hLI" = ( @@ -29900,7 +29957,7 @@ name = "Armory Shutters"; pixel_x = 23; pixel_y = -22; - req_access_txt = "3" + req_access = list("armory") }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -29999,9 +30056,9 @@ max_integrity = 350 }, /obj/machinery/door/window/brigdoor{ - name = "Armory Door"; - req_access_txt = "1" + name = "Armory Door" }, +/obj/effect/mapping_helpers/windoor/access/all/security/general, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "hOu" = ( @@ -30048,7 +30105,10 @@ name = "Privacy Shutters"; pixel_x = -9; pixel_y = -20; - req_access_txt = "38" + req_access = list("lawyer") + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 }, /turf/open/floor/wood, /area/lawoffice) @@ -30603,13 +30663,14 @@ "hWw" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "hWy" = ( @@ -30827,8 +30888,7 @@ /area/storage/tech) "ibl" = ( /obj/machinery/door/airlock/security/glass{ - name = "Brig Desk"; - req_access_txt = "1" + name = "Brig Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -30837,6 +30897,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel/dark, /area/security/brig) "ibq" = ( @@ -30850,14 +30911,16 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/westright{ dir = 1; - name = "Hydroponics Desk"; - req_access_txt = "35" + name = "Hydroponics Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 1 + }, +/turf/open/floor/plating, /area/hydroponics) "ibx" = ( /obj/structure/closet/emcloset, @@ -31010,6 +31073,13 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/machinery/door/window/brigdoor{ + dir = 1; + name = "SMES Access" + }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/equipment{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/engine/engine_smes) "idR" = ( @@ -31399,13 +31469,13 @@ /area/crew_quarters/toilet/locker) "ilr" = ( /obj/machinery/door/airlock/security{ - name = "Detective's Office"; - req_access_txt = "4" + name = "Detective's Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/detective, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "ilw" = ( @@ -31665,7 +31735,7 @@ name = "Incinerator Access Console"; pixel_x = 24; pixel_y = -6; - req_one_access_txt = "12" + req_access = list("atmospherics") }, /obj/machinery/button/ignition{ id = "Incinerator"; @@ -32097,7 +32167,7 @@ pixel_x = -6; pixel_y = 5 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "iwj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -32156,8 +32226,7 @@ name = "test chamber blast door" }, /obj/machinery/door/airlock/research/glass{ - name = "Test Chamber"; - req_access_txt = "47" + name = "Test Chamber" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -32167,6 +32236,7 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/engine, /area/science/misc_lab) "ixV" = ( @@ -32181,8 +32251,7 @@ /obj/structure/table/glass, /obj/machinery/door/window/northright{ name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "5" + red_alert_access = 1 }, /obj/item/storage/firstaid/fire{ pixel_x = 3; @@ -32194,6 +32263,9 @@ pixel_y = -3 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/storage) "iyy" = ( @@ -32375,14 +32447,15 @@ /area/maintenance/disposal/incinerator) "iCk" = ( /obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "63" + name = "Security External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plating, /area/security/main) "iCl" = ( @@ -32411,9 +32484,9 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance{ - name = "Paramedic Staging Area Maintenance"; - req_access_txt = "69" + name = "Paramedic Staging Area Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plating, /area/maintenance/aft) "iCG" = ( @@ -32421,8 +32494,7 @@ dir = 8 }, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "5" + name = "Medbay Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -32434,6 +32506,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "iCQ" = ( @@ -32592,14 +32665,14 @@ name = "Atmospherics Lockdown"; pixel_x = 24; pixel_y = 10; - req_access_txt = "24" + req_access = list("engineering") }, /obj/machinery/button/door{ desc = "A remote control-switch for secure storage."; id = "Secure Storage"; name = "Engineering Secure Storage"; pixel_x = 24; - req_access_txt = "11" + req_access = list("engineering") }, /obj/machinery/button/door{ desc = "A remote control-switch for the engineering security doors."; @@ -32607,7 +32680,7 @@ name = "Engineering Lockdown"; pixel_x = 24; pixel_y = -10; - req_access_txt = "10" + req_access = list("engineering") }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) @@ -32698,8 +32771,7 @@ dir = 8 }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -32710,6 +32782,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "iHV" = ( @@ -32779,8 +32853,7 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 @@ -32788,6 +32861,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "iJJ" = ( @@ -32855,7 +32930,7 @@ id = "cmo"; name = "CMO Privacy Shutters Control"; pixel_y = 28; - req_access_txt = "40" + req_access = list("medical") }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/cmo) @@ -32929,8 +33004,7 @@ /area/engine/atmos/distro) "iLO" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prisoner Processing"; - req_access_txt = "2" + name = "Prisoner Processing" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -32949,6 +33023,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/processing) "iMa" = ( @@ -33021,8 +33096,10 @@ dir = 4 }, /obj/machinery/door/window/brigdoor/northright{ - name = "Armory Door"; - req_access_txt = "1" + name = "Armory Door" + }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 1 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -33077,8 +33154,7 @@ dir = 8 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -33086,6 +33162,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/aft) "iNv" = ( @@ -33217,13 +33294,13 @@ dir = 1 }, /obj/machinery/door/airlock/command{ - name = "Command Tool Storage"; - req_access_txt = "19" + name = "Command Tool Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "iQm" = ( @@ -33268,8 +33345,7 @@ /area/crew_quarters/locker) "iQL" = ( /obj/machinery/door/airlock/research{ - name = "Mech Bay"; - req_one_access_txt = "29;75" + name = "Mech Bay" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = -1; @@ -33279,6 +33355,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/science/robotics/mechbay) "iQR" = ( @@ -33799,7 +33876,7 @@ name = "Engineering Secure Storage"; pixel_x = -24; pixel_y = -23; - req_access_txt = "11" + req_access = list("engine_equip") }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -33898,12 +33975,12 @@ dir = 8 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "12" + name = "External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/escapepodbay) "jcf" = ( @@ -33933,7 +34010,7 @@ dir = 8 }, /obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "jcF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -34263,8 +34340,10 @@ /obj/effect/turf_decal/bot_red, /obj/structure/closet/secure_closet/lethalshots, /obj/machinery/door/window/brigdoor/northright{ - name = "Armory Door"; - req_access_txt = "1" + name = "Armory Door" + }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 1 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -34553,15 +34632,15 @@ /area/science/lab) "joA" = ( /obj/machinery/door/window/brigdoor/westleft{ - name = "AI Satellite Access"; - req_access_txt = "65" + name = "AI Satellite Access" + }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_sat{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/engine/engineering) "joM" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -34577,6 +34656,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "joU" = ( @@ -34633,11 +34713,12 @@ "jpt" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "jpy" = ( @@ -34659,8 +34740,7 @@ }, /obj/machinery/door/airlock/highsecurity{ id_tag = "ai_core_airlock_exterior"; - name = "AI Core"; - req_access_txt = "65" + name = "AI Core" }, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/cable/yellow{ @@ -34681,6 +34761,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "jpL" = ( @@ -34757,7 +34838,7 @@ normaldoorcontrol = 1; pixel_x = -26; pixel_y = 5; - req_access_txt = "63" + req_access = list("brig") }, /turf/open/floor/plasteel, /area/security/prison/hallway) @@ -35011,8 +35092,10 @@ "jwf" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/window/westleft{ - name = "Janitorial Delivery"; - req_access_txt = "26" + name = "Janitorial Delivery" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/janitor{ + dir = 8 }, /turf/open/floor/plasteel, /area/maintenance/aft) @@ -35532,8 +35615,7 @@ autoclose = 0; frequency = 1449; id_tag = "telecomms_airlock_exterior"; - name = "Telecomms Server Room Access"; - req_access_txt = "61" + name = "Telecomms Server Room Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -35547,6 +35629,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/tcommsat/storage) "jHq" = ( @@ -35557,14 +35640,14 @@ /area/engine/engineering) "jHx" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = 1; diry = 1 }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/aft) "jHT" = ( @@ -35616,10 +35699,10 @@ "jIJ" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/fore) "jIU" = ( @@ -35802,8 +35885,7 @@ base_state = "left"; dir = 2; icon_state = "left"; - name = "Robotics Desk"; - req_one_access_txt = "29;75" + name = "Robotics Desk" }, /obj/item/paper_bin{ pixel_x = -3; @@ -35821,6 +35903,7 @@ /obj/item/storage/pencil_holder/crew{ pixel_x = 8 }, +/obj/effect/mapping_helpers/windoor/access/any/science/robotics, /turf/open/floor/plating, /area/science/robotics/lab) "jOd" = ( @@ -35955,9 +36038,9 @@ /obj/machinery/door/window{ base_state = "right"; icon_state = "right"; - name = "Captain's Desk Door"; - req_access_txt = "20" + name = "Captain's Desk Door" }, +/obj/effect/mapping_helpers/windoor/access/all/command/captain, /turf/open/floor/plasteel/stairs/goon/wood_stairs_wide2, /area/crew_quarters/heads/captain) "jRq" = ( @@ -36106,8 +36189,7 @@ /area/hallway/primary/aft_starboard) "jVb" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -36124,6 +36206,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/checkpoint/service) "jVe" = ( @@ -36151,8 +36235,7 @@ /area/maintenance/port/aft) "jVX" = ( /obj/machinery/door/airlock/security/glass{ - name = "Equipment Room"; - req_access_txt = "1" + name = "Equipment Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -36162,6 +36245,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel/showroomfloor, /area/security/main) "jWc" = ( @@ -36648,8 +36732,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ dir = 2; - name = "Engineering Desk"; - req_one_access_txt = "32;19" + name = "Engineering Desk" }, /obj/item/deskbell/preset/engi{ pixel_x = -6; @@ -36658,7 +36741,13 @@ /obj/item/storage/pencil_holder/crew{ pixel_x = 8 }, -/turf/open/floor/plasteel, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/any/engineering/construction, +/obj/effect/mapping_helpers/windoor/access/any/engineering/general, +/turf/open/floor/plating, /area/engine/foyer) "khi" = ( /obj/structure/table, @@ -36708,8 +36797,7 @@ /area/hallway/primary/aft) "khF" = ( /obj/machinery/door/airlock/maintenance{ - name = "Locker Room Maintenance"; - req_access_txt = "12" + name = "Locker Room Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -36718,6 +36806,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port) "khH" = ( @@ -37020,8 +37109,7 @@ dir = 8 }, /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -37036,6 +37124,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/medical) "kmI" = ( @@ -37237,8 +37326,7 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_interior"; - name = "Virology Interior Airlock"; - req_access_txt = "39" + name = "Virology Interior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -37259,6 +37347,7 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "kra" = ( @@ -37296,8 +37385,7 @@ "krO" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer_R"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/effect/mapping_helpers/airlock/unres, /obj/machinery/door/firedoor/border_only{ @@ -37307,6 +37395,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "krX" = ( @@ -37539,13 +37628,15 @@ idInterior = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 25; - pixel_y = 7 + pixel_y = 7; + req_access = list("ai_master") }, /obj/machinery/doorButtons/access_button{ idDoor = "ai_core_airlock_exterior"; idSelf = "ai_core_airlock_control"; pixel_x = 23; - pixel_y = -7 + pixel_y = -7; + req_access = list("ai_master") }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat_interior) @@ -37631,13 +37722,13 @@ name = "bar shutters" }, /obj/machinery/door/window/southright{ - name = "Bar Door"; - req_one_access_txt = "25;28" + name = "Bar Door" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/service/bar, /turf/open/floor/plasteel, /area/crew_quarters/bar) "kAg" = ( @@ -37681,10 +37772,10 @@ "kAy" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/aft) "kAz" = ( @@ -37764,9 +37855,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "kBR" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -37776,6 +37865,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "kBS" = ( @@ -37882,8 +37972,10 @@ max_integrity = 350 }, /obj/machinery/door/window/brigdoor/northright{ - name = "Armory Door"; - req_access_txt = "1" + name = "Armory Door" + }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 1 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -37974,8 +38066,10 @@ /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet/locker) "kGS" = ( -/obj/structure/lattice/catwalk, -/obj/effect/spawner/structure/window/reinforced/shutter, +/obj/machinery/portable_atmospherics/canister/air, +/obj/structure/sign/warning/vacuum/external{ + pixel_y = 32 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "kHi" = ( @@ -38215,11 +38309,11 @@ "kLB" = ( /obj/machinery/door/airlock/external{ name = "Security Secure External Airlock"; - req_access_txt = "63"; security_level = 1 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plating, /area/security/main) "kMc" = ( @@ -38346,7 +38440,7 @@ name = "Visitation Shutters"; pixel_x = -6; pixel_y = 36; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/button/flasher{ id = "visitorflash"; @@ -38357,8 +38451,7 @@ /area/security/prison) "kNX" = ( /obj/machinery/door/airlock/command{ - name = "Conference Room"; - req_access_txt = "19" + name = "Conference Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -38373,6 +38466,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/wood, /area/bridge/meeting_room) "kOd" = ( @@ -38407,7 +38501,6 @@ }, /obj/machinery/door/airlock/highsecurity{ name = "Secure Tech Storage"; - req_access_txt = "76"; security_level = 6 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -38419,6 +38512,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/secure_tech, /turf/open/floor/plasteel/dark, /area/storage/tech) "kOH" = ( @@ -38486,8 +38580,7 @@ /area/engine/atmos/distro) "kQW" = ( /obj/machinery/door/airlock/engineering{ - name = "Starboard Quarter Solar Access"; - req_access_txt = "10" + name = "Starboard Quarter Solar Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -38498,6 +38591,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "kRa" = ( @@ -38938,7 +39032,8 @@ id = "disposalshutters"; name = "disposals shutter control"; pixel_x = -24; - pixel_y = 9 + pixel_y = 9; + req_access = list("cargo") }, /turf/open/floor/plasteel, /area/quartermaster/sorting) @@ -39420,8 +39515,7 @@ name = "security shutters" }, /obj/machinery/door/window/eastleft{ - name = "Brig Desk"; - req_access_txt = "1" + name = "Brig Desk" }, /obj/item/paper_bin{ pixel_x = -3; @@ -39434,6 +39528,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, /turf/open/floor/plating, /area/security/brig) "lkd" = ( @@ -39446,7 +39543,7 @@ id = "testlab"; name = "Test Chamber Blast Doors"; pixel_y = -4; - req_access_txt = "55" + req_access = list("science") }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ @@ -39525,8 +39622,7 @@ /area/crew_quarters/kitchen) "llu" = ( /obj/machinery/door/window{ - name = "SMES Chamber"; - req_access_txt = "32" + name = "SMES Chamber" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -39541,6 +39637,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/equipment, /turf/open/floor/plasteel/dark, /area/engine/engine_smes) "llx" = ( @@ -39770,14 +39867,15 @@ "loB" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "loF" = ( @@ -39809,6 +39907,21 @@ "lpv" = ( /turf/open/floor/plasteel, /area/crew_quarters/dorms) +"lpP" = ( +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Containment Pen" + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio_r"; + name = "Right side containment blast door" + }, +/obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, +/turf/open/floor/engine, +/area/science/xenobiology) "lpU" = ( /obj/machinery/airalarm{ pixel_y = 24 @@ -39987,8 +40100,7 @@ /area/space) "ltp" = ( /obj/machinery/door/airlock/security/glass{ - name = "Evidence Storage"; - req_access_txt = "63" + name = "Evidence Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -40000,6 +40112,8 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel, /area/security/brig) "ltM" = ( @@ -40048,8 +40162,7 @@ /area/ai_monitored/storage/satellite) "lvD" = ( /obj/machinery/door/window/southleft{ - name = "Test Chamber"; - req_access_txt = "55" + name = "Test Chamber" }, /obj/effect/turf_decal/loading_area{ dir = 1 @@ -40057,6 +40170,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "lvP" = ( @@ -40432,8 +40546,7 @@ /area/library) "lDR" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Power Storage"; - req_access_txt = "11" + name = "Power Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -40451,6 +40564,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engineering) "lEb" = ( @@ -40627,8 +40741,7 @@ "lIR" = ( /obj/machinery/door/window/southleft{ dir = 1; - name = "Test Chamber"; - req_access_txt = "55" + name = "Test Chamber" }, /obj/machinery/door/poddoor/preopen{ id = "misclab"; @@ -40638,6 +40751,9 @@ dir = 1 }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 1 + }, /turf/open/floor/engine, /area/science/xenobiology) "lJt" = ( @@ -40705,6 +40821,21 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) +"lLj" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/ai_monitored/storage/eva) "lLm" = ( /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -40719,9 +40850,9 @@ dir = 8 }, /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "lLF" = ( @@ -40840,8 +40971,7 @@ /area/medical/surgery) "lMB" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Delivery Office"; - req_access_txt = "50" + name = "Delivery Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -40855,6 +40985,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/sorting) "lME" = ( @@ -40913,8 +41044,7 @@ /area/maintenance/starboard/aft) "lOq" = ( /obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "47" + name = "Experimentation Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -40932,6 +41062,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/experimentation, /turf/open/floor/plasteel/white, /area/science/explab) "lOu" = ( @@ -41070,8 +41201,7 @@ /area/hallway/secondary/entry) "lRT" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -41088,6 +41218,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/science) "lRX" = ( @@ -41195,8 +41326,7 @@ /area/medical/psych) "lUy" = ( /obj/machinery/door/airlock/maintenance{ - name = "Engineering Maintenance"; - req_access_txt = "10" + name = "Engineering Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -41210,6 +41340,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/port/aft) "lUW" = ( @@ -41328,8 +41459,7 @@ /area/medical/genetics) "lYc" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator"; - req_access_txt = "11" + name = "Gravity Generator" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -41342,6 +41472,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel/dark, /area/engine/gravity_generator) "lYh" = ( @@ -41534,8 +41665,7 @@ /area/security/processing) "mbK" = ( /obj/machinery/door/airlock/security{ - name = "Labor Shuttle"; - req_access_txt = "2" + name = "Labor Shuttle" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -41556,6 +41686,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/brig) "mbY" = ( @@ -41762,8 +41893,7 @@ dir = 8 }, /obj/machinery/door/airlock{ - name = "Theatre Backstage"; - req_access_txt = "46" + name = "Theatre Backstage" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -41774,6 +41904,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /turf/open/floor/plasteel, /area/crew_quarters/theatre) "mfs" = ( @@ -41846,8 +41977,7 @@ /area/maintenance/port) "mgl" = ( /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = 1; @@ -41856,6 +41986,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/aft) "mgC" = ( @@ -41935,7 +42066,7 @@ normaldoorcontrol = 1; pixel_x = -26; pixel_y = 5; - req_access_txt = "63" + req_access = list("security") }, /obj/machinery/button/door{ id = "outerbrig"; @@ -41943,7 +42074,7 @@ normaldoorcontrol = 1; pixel_x = -26; pixel_y = -5; - req_access_txt = "63" + req_access = list("security") }, /obj/structure/cable{ icon_state = "1-2" @@ -41987,9 +42118,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -42008,6 +42137,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/fore) "mkg" = ( @@ -42052,8 +42182,7 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Escape Pod Three"; - req_access_txt = "63" + name = "Escape Pod Three" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -42067,6 +42196,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/main) "mkz" = ( @@ -42103,7 +42233,7 @@ name = "Warehouse Door Control"; pixel_x = -1; pixel_y = 24; - req_access_txt = "31" + req_access = list("cargo") }, /obj/structure/closet/emcloset, /obj/effect/turf_decal/trimline/brown/filled/line/lower{ @@ -42627,9 +42757,7 @@ /turf/open/floor/plating, /area/crew_quarters/kitchen) "mtD" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -42648,6 +42776,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/aft) "mtU" = ( @@ -42743,15 +42872,14 @@ /turf/open/floor/plasteel/white, /area/medical/chemistry) "mwJ" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/fore/secondary) "mxv" = ( @@ -42837,8 +42965,7 @@ "mzr" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ - name = "Hydroponics Desk"; - req_access_txt = "35" + name = "Hydroponics Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -42848,7 +42975,10 @@ pixel_x = -8; pixel_y = -2 }, -/turf/open/floor/plasteel, +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics{ + dir = 1 + }, +/turf/open/floor/plating, /area/hydroponics) "mzu" = ( /obj/structure/cable{ @@ -42875,7 +43005,8 @@ idDoor = "ai_core_airlock_interior"; idSelf = "ai_core_airlock_control"; pixel_x = 23; - pixel_y = -7 + pixel_y = -7; + req_access = list("ai_master") }, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -43034,8 +43165,7 @@ /area/hallway/primary/central) "mBy" = ( /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" + name = "Medbay Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -43049,6 +43179,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) "mBT" = ( @@ -43099,9 +43231,9 @@ dir = 1 }, /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" + name = "Medbay Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/aft) "mCm" = ( @@ -43195,8 +43327,7 @@ /area/tcommsat/server) "mEa" = ( /obj/machinery/door/window/brigdoor/eastright{ - dir = 2; - req_access_txt = "55" + dir = 2 }, /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -43217,6 +43348,7 @@ /obj/item/storage/pencil_holder/crew{ pixel_x = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio, /turf/open/floor/plating, /area/science/xenobiology) "mEe" = ( @@ -43350,13 +43482,15 @@ }, /obj/machinery/door/window/southleft{ dir = 1; - name = "Brig Desk"; - req_access_txt = "1" + name = "Brig Desk" }, /obj/item/deskbell/preset/sec{ pixel_x = 9; pixel_y = -2 }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 1 + }, /turf/open/floor/plating, /area/security/brig) "mGG" = ( @@ -43485,8 +43619,7 @@ dir = 4 }, /obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" + name = "Bridge" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -43501,6 +43634,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) "mJV" = ( @@ -43562,7 +43696,7 @@ name = "Chemistry shutters"; pixel_x = 25; pixel_y = 25; - req_one_access_txt = "5; 33" + req_access = list("chemistry") }, /obj/effect/turf_decal/trimline/chemorange/warning/lower{ dir = 4 @@ -44181,7 +44315,7 @@ name = "Research Lab Shutters Control"; pixel_x = -6; pixel_y = 24; - req_access_txt = "47" + req_access = list("science") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 @@ -44395,14 +44529,16 @@ idDoor = "telecomms_airlock_exterior"; idSelf = "telecomms_airlock_control"; pixel_x = -7; - pixel_y = 23 + pixel_y = 23; + req_access = list("tcomms") }, /obj/machinery/doorButtons/airlock_controller{ idExterior = "telecomms_airlock_exterior"; idInterior = "telecomms_airlock_interior"; idSelf = "telecomms_airlock_control"; pixel_x = 5; - pixel_y = 25 + pixel_y = 25; + req_access = list("tcomms") }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -44517,8 +44653,7 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "nby" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "nbA" = ( /obj/machinery/vending/sustenance, @@ -44566,20 +44701,23 @@ /turf/open/floor/plasteel, /area/security/main) "nca" = ( -/obj/machinery/door/poddoor/preopen{ - id = "xenobio_l"; - name = "Left side containment blast door" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window/northleft{ - base_state = "right"; - dir = 8; - icon_state = "right"; - name = "Containment Pen"; - req_access_txt = "55" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/engine, -/area/science/xenobiology) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/fore) "ncf" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plasteel, @@ -44641,7 +44779,7 @@ name = "Disposal Vent Control"; pixel_x = -25; pixel_y = 4; - req_access_txt = "12" + req_access = list("maint_tunnels") }, /obj/machinery/button/massdriver{ id = "trash"; @@ -44675,7 +44813,7 @@ name = "Mixing Room Vent Control"; pixel_x = -25; pixel_y = 5; - req_access_txt = "7" + req_access = list("toxins") }, /obj/machinery/button/ignition{ id = "mixingsparker"; @@ -44711,8 +44849,7 @@ /area/hallway/secondary/entry) "ndA" = ( /obj/machinery/door/airlock/maintenance{ - name = "Cargo Bay Maintenance"; - req_access_txt = "31" + name = "Cargo Bay Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -44725,15 +44862,13 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/maintenance/port) "ndK" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/cable{ - icon_state = "2-8" - }, /turf/open/floor/circuit, /area/science/robotics/mechbay) "ndL" = ( @@ -44793,14 +44928,14 @@ /area/hallway/primary/central) "nfe" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/fore) "nfk" = ( @@ -45004,13 +45139,15 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Core Modules"; - req_access_txt = "20" + name = "Core Modules" }, /obj/item/aiModule/core/full/asimov, /obj/effect/spawner/lootdrop/aimodule_neutral, /obj/effect/spawner/lootdrop/aimodule_harmless, /obj/item/aiModule/core/freeformcore, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 4 + }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "nkL" = ( @@ -45297,8 +45434,7 @@ /area/vacant_room/commissary) "nsk" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_access_txt = "50" + name = "Cargo Office" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -45316,6 +45452,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/brown/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/office) "nsn" = ( @@ -45331,8 +45468,7 @@ /area/bridge/meeting_room) "nsx" = ( /obj/machinery/door/airlock/research{ - name = "Robotics Lab"; - req_one_access_txt = "29;75" + name = "Robotics Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -45356,12 +45492,12 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/science/robotics/lab) "nsz" = ( /obj/machinery/door/airlock/maintenance{ - name = "Captain's Office Maintenance"; - req_access_txt = "20" + name = "Captain's Office Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ @@ -45369,6 +45505,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/plating, /area/maintenance/central/secondary) "nsA" = ( @@ -45853,13 +45990,11 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/hatch{ - name = "Abandoned Room"; - req_access_txt = "65" + name = "MiniSat Monitoring" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/barricade/wooden/crude, -/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "nCd" = ( @@ -46065,8 +46200,7 @@ /area/medical/medbay/central) "nFd" = ( /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -46078,6 +46212,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "nFx" = ( @@ -46542,9 +46678,9 @@ "nQP" = ( /obj/machinery/button/door{ id = "tcomms"; - name = "Telecommunications server shutters control"; + name = "Telecommunications Shutter Control"; pixel_y = -27; - req_access_txt = "61" + req_access = list("tcomms") }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower, /obj/structure/cable{ @@ -46564,8 +46700,7 @@ /area/ai_monitored/turret_protected/ai) "nRs" = ( /obj/machinery/door/airlock/research/glass{ - name = "Genetics Research"; - req_access_txt = "5; 9; 68" + name = "Genetics Lab" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -46581,6 +46716,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/medical/genetics) "nRw" = ( @@ -46773,8 +46909,7 @@ }, /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -46784,6 +46919,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/brig) "nUD" = ( @@ -46830,7 +46966,7 @@ name = "Virology Access Button"; pixel_x = 8; pixel_y = -28; - req_access_txt = "39" + req_access = list("virology") }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -47517,8 +47653,7 @@ /area/tcommsat/server) "oke" = ( /obj/machinery/door/airlock/command/glass{ - name = "Chief Engineer"; - req_access_txt = "56" + name = "Chief Engineer" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -47530,6 +47665,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/ce, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) "okn" = ( @@ -47780,8 +47916,7 @@ /area/maintenance/starboard/aft) "ooA" = ( /obj/machinery/door/airlock/command/glass{ - name = "Head of Security"; - req_access_txt = "58" + name = "Head of Security" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -47797,6 +47932,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/hos, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "ooC" = ( @@ -47994,14 +48130,14 @@ /area/crew_quarters/heads/cmo) "otq" = ( /obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" + name = "Hydroponics" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/trimline/green/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plasteel, /area/hydroponics) "otx" = ( @@ -48295,15 +48431,14 @@ idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = -24; - req_access_txt = "39" + req_access = list("virology") }, /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/virology{ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_exterior"; - name = "Virology Exterior Airlock"; - req_access_txt = "39" + name = "Virology Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor/border_only{ @@ -48321,6 +48456,7 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "oxG" = ( @@ -48800,7 +48936,7 @@ id = "genedesk"; name = "Genetics Desk Shutters Control"; pixel_x = 28; - req_access_txt = "9" + req_access = list("genetics") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 @@ -48863,7 +48999,7 @@ /obj/machinery/newscaster/security_unit{ pixel_y = -28 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "oJt" = ( /obj/structure/cable{ @@ -49017,14 +49153,14 @@ name = "Auxiliary Vent Control"; pixel_x = 25; pixel_y = -9; - req_access_txt = "12" + req_access = list("atmospherics") }, /obj/machinery/button/door{ id = "turbinevent"; name = "Turbine Vent Control"; pixel_x = 25; pixel_y = 8; - req_access_txt = "12" + req_access = list("atmospherics") }, /obj/machinery/atmospherics/pipe/manifold/general/visible, /obj/effect/turf_decal/stripes/corner{ @@ -49070,12 +49206,12 @@ autoclose = 0; heat_proof = 1; id_tag = "toxins_airlock_interior"; - name = "Mixing Room Interior Airlock"; - req_access_txt = "8" + name = "Mixing Room Interior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/engine, /area/science/mixing/chamber) "oNb" = ( @@ -49177,12 +49313,14 @@ /obj/machinery/door/window/westleft{ dir = 4; name = "Brig Infirmary"; - red_alert_access = 1; - req_access_txt = "5" + red_alert_access = 1 }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/security/brig_phys{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/security/brig) "oOo" = ( @@ -49264,15 +49402,15 @@ /obj/machinery/button/door{ id = "heads_meeting"; name = "Security Shutters"; - pixel_y = 24 + pixel_y = 24; + req_access = list("command") }, /turf/open/floor/wood, /area/bridge/meeting_room) "oQy" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "permaouter"; - name = "Permabrig Transfer"; - req_access_txt = "2" + name = "Permabrig Transfer" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -49285,6 +49423,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/secred/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/prison/hallway) "oQJ" = ( @@ -49703,8 +49842,7 @@ dir = 4; icon_state = "right"; name = "Brig Infirmary"; - red_alert_access = 1; - req_access_txt = "5" + red_alert_access = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -49713,6 +49851,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower, +/obj/effect/mapping_helpers/windoor/access/all/security/brig_phys{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/security/brig) "oZY" = ( @@ -49964,8 +50105,7 @@ /area/library) "pgn" = ( /obj/machinery/door/airlock/engineering{ - name = "Port Bow Solar Access"; - req_access_txt = "10" + name = "Port Bow Solar Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -49978,6 +50118,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "pgx" = ( @@ -50078,8 +50219,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer_R"; - name = "Medbay"; - req_access_txt = "5" + name = "Medbay" }, /obj/structure/cable{ icon_state = "1-2" @@ -50087,13 +50227,13 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "phO" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -50111,6 +50251,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "pia" = ( @@ -50386,8 +50527,7 @@ /area/hallway/secondary/entry) "pmW" = ( /obj/machinery/door/airlock/maintenance{ - name = "Teleporter Maintenance"; - req_access_txt = "17" + name = "Teleporter Maintenance" }, /obj/structure/sign/warning/securearea{ pixel_x = -32 @@ -50403,6 +50543,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/command/teleporter, /turf/open/floor/plating, /area/maintenance/central/secondary) "pnf" = ( @@ -50485,7 +50626,7 @@ name = "Public Teleporter Access Control"; pixel_x = -6; pixel_y = 24; - req_access_txt = "17" + req_access = list("teleporter") }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 @@ -50507,8 +50648,7 @@ /area/security/checkpoint/auxiliary) "poL" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -50517,6 +50657,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/fore) "poU" = ( @@ -50602,11 +50743,12 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_access_txt = "65" + name = "MiniSat External Access" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "pqG" = ( @@ -50693,8 +50835,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/hatch{ - name = "Hardware Workshop"; - req_access_txt = "61" + name = "Hardware Workshop" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -50710,6 +50851,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "psq" = ( @@ -50807,7 +50949,6 @@ "put" = ( /obj/machinery/door/airlock/external{ name = "Security Secure External Airlock"; - req_access_txt = "63"; security_level = 1 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -50815,6 +50956,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plating, /area/security/main) "pux" = ( @@ -50841,7 +50983,7 @@ id = "cell1 blast"; name = "Cell 1 Blast Door Control"; pixel_y = -26; - req_access_txt = "63" + req_access = list("brig") }, /turf/open/floor/plasteel, /area/security/prison) @@ -50926,13 +51068,13 @@ }, /obj/machinery/door/airlock/security{ aiControlDisabled = 1; - name = "Prisoner Transfer Centre"; - req_access_txt = "2" + name = "Prisoner Transfer Centre" }, /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 4 }, /obj/effect/turf_decal/trimline/secred/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/prison/hallway) "pwe" = ( @@ -50964,20 +51106,20 @@ name = "Left side containment blast doors"; pixel_x = -7; pixel_y = -24; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/machinery/button/door{ id = "xenobio_r"; name = "Right side containment blast doors"; pixel_x = 7; pixel_y = -24; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/machinery/button/door{ id = "xenobio_main"; name = "Main containment blast doors"; pixel_y = -34; - req_access_txt = "55" + req_access = list("xenobiology") }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -51102,9 +51244,9 @@ }, /obj/machinery/door/airlock/security/glass{ name = "Brig Control"; - req_access_txt = "3"; security_level = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "pyU" = ( @@ -51128,8 +51270,7 @@ /area/hallway/primary/central) "pzg" = ( /obj/machinery/door/airlock/medical{ - name = "Operating Theatre"; - req_access_txt = "45" + name = "Operating Theatre" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -51147,6 +51288,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /turf/open/floor/plasteel/white, /area/medical/sleeper) "pzv" = ( @@ -51263,8 +51405,7 @@ /area/vacant_room/commissary) "pAC" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Isolation B"; - req_access_txt = "39" + name = "Isolation B" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -51278,6 +51419,7 @@ /obj/effect/turf_decal/trimline/green/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/plasteel/white, /area/medical/virology) "pAL" = ( @@ -51334,12 +51476,12 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" + name = "Supply Dock Airlock" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/quartermaster/storage) "pCi" = ( @@ -51562,8 +51704,7 @@ dir = 8 }, /obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" + name = "Supply Dock Airlock" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -51571,6 +51712,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/quartermaster/storage) "pFU" = ( @@ -51704,8 +51846,7 @@ /obj/structure/table/glass, /obj/machinery/door/window/northleft{ name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "5" + red_alert_access = 1 }, /obj/item/storage/firstaid/toxin{ pixel_x = 3; @@ -51717,6 +51858,9 @@ pixel_y = -3 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/windoor/access/all/medical/general{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/storage) "pKz" = ( @@ -51812,7 +51956,7 @@ name = "AI Chamber entrance shutters control"; pixel_x = -23; pixel_y = 21; - req_access_txt = "16" + req_access = list("ai_master") }, /obj/structure/ethernet_cable{ icon_state = "0-4" @@ -52025,7 +52169,7 @@ /area/hallway/primary/central) "pQy" = ( /obj/machinery/door/airlock/public/glass{ - name = "Escape Podbay" + name = "Shipbreaking Bay" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -52037,6 +52181,7 @@ icon_state = "1-2" }, /obj/effect/turf_decal/ramp_middle, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plasteel, /area/escapepodbay) "pQS" = ( @@ -52297,9 +52442,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/security{ - name = "Interrogation"; - req_access_txt = "2" + name = "Interrogation" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/interrogation) "pUS" = ( @@ -52659,8 +52804,7 @@ base_state = "right"; dir = 1; icon_state = "right"; - name = "Monkey Pen"; - req_access_txt = "39" + name = "Monkey Pen" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -52678,6 +52822,9 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/virology{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "qbH" = ( @@ -52906,7 +53053,7 @@ name = "Loading Doors"; pixel_x = -24; pixel_y = -8; - req_access_txt = "31" + req_access = list("cargo_bay") }, /obj/machinery/button/door{ id = "QMLoaddoor2"; @@ -52914,7 +53061,7 @@ name = "Loading Doors"; pixel_x = -24; pixel_y = 8; - req_access_txt = "31" + req_access = list("cargo_bay") }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -53146,8 +53293,7 @@ dir = 1 }, /obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" + name = "Engine Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -53161,6 +53307,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "qlp" = ( @@ -53292,7 +53439,7 @@ name = "Psych Office Shutters Control"; pixel_x = -23; pixel_y = 22; - req_access_txt = "5" + req_access = list("psychology") }, /turf/open/floor/carpet, /area/medical/psych) @@ -53460,8 +53607,7 @@ /area/hallway/primary/fore) "qpF" = ( /obj/machinery/door/airlock{ - name = "Service Hall"; - req_access_txt = "79" + name = "Service Hall" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -53472,6 +53618,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/service/general, /turf/open/floor/plasteel, /area/hallway/secondary/service) "qqh" = ( @@ -53515,7 +53662,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "qsk" = ( /obj/machinery/firealarm{ @@ -53805,10 +53952,7 @@ /turf/open/floor/plasteel/white, /area/science/mixing/chamber) "qyR" = ( -/obj/machinery/door/airlock/vault{ - req_access_txt = "53" - }, -/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/vault, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -53824,6 +53968,8 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/command/vault, +/obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) "qyV" = ( @@ -53837,8 +53983,7 @@ /area/security/courtroom) "qzt" = ( /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10" + name = "Engineering External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = 2; @@ -53846,6 +53991,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "qAb" = ( @@ -53956,8 +54102,7 @@ /area/janitor) "qCW" = ( /obj/machinery/door/airlock/engineering{ - name = "Tech Storage"; - req_access_txt = "23" + name = "Tech Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -53978,6 +54123,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /turf/open/floor/plasteel, /area/storage/tech) "qDy" = ( @@ -54179,8 +54325,7 @@ /area/security/prison) "qGC" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay"; - req_access_txt = "31" + name = "Cargo Bay" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -54198,6 +54343,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/brown/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plasteel, /area/quartermaster/storage) "qGJ" = ( @@ -54289,8 +54435,7 @@ dir = 4 }, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "5" + name = "Medbay Storage" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -54311,6 +54456,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/storage) "qHR" = ( @@ -54444,14 +54590,15 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/research/glass{ name = "Computer Science"; - normalspeed = 0; - req_access_txt = "67" + normalspeed = 0 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/science/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) "qJI" = ( @@ -54481,8 +54628,7 @@ /area/tcommsat/storage) "qKn" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Chemistry Lab"; - req_access_txt = "5; 33" + name = "Chemistry Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -54504,6 +54650,7 @@ /obj/effect/turf_decal/trimline/chemorange/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, /turf/open/floor/plasteel/white, /area/medical/chemistry) "qKr" = ( @@ -54586,6 +54733,19 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) +"qLy" = ( +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Containment Pen" + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "qLJ" = ( /obj/effect/turf_decal/trimline/secred/filled/corner/lower, /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ @@ -54694,8 +54854,7 @@ /area/quartermaster/storage) "qNB" = ( /obj/machinery/door/airlock/command{ - name = "Captain's Office"; - req_access_txt = "20" + name = "Captain's Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -54712,6 +54871,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "qOa" = ( @@ -54758,8 +54918,7 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Security Escape Airlock"; - req_access_txt = "2" + name = "Security Escape Airlock" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -54767,6 +54926,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/hallway/secondary/exit) "qOw" = ( @@ -54835,8 +54995,7 @@ base_state = "rightsecure"; dir = 4; icon_state = "rightsecure"; - name = "Head of Personnel's Desk"; - req_access_txt = "57" + name = "Head of Personnel's Desk" }, /obj/machinery/flasher{ id = "hopflash"; @@ -54856,6 +55015,9 @@ pixel_x = -6; pixel_y = -5 }, +/obj/effect/mapping_helpers/windoor/access/all/service/hop{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "qQa" = ( @@ -54881,7 +55043,7 @@ dir = 8; network = "tcommsat" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "qQn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -55171,9 +55333,9 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - name = "Engineering Maintenance"; - req_access_txt = "10" + name = "Engineering Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/port/aft) "qWa" = ( @@ -55277,17 +55439,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"qXB" = ( -/obj/effect/turf_decal/loading_area{ - dir = 8 - }, -/obj/machinery/door/window/northleft{ - dir = 4; - name = "Containment Pen"; - req_access_txt = "55" - }, -/turf/open/floor/plasteel/dark, -/area/science/xenobiology) "qXS" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/rglass{ @@ -55365,7 +55516,8 @@ idDoor = "telecomms_airlock_interior"; idSelf = "telecomms_airlock_control"; pixel_x = -23; - pixel_y = -23 + pixel_y = -23; + req_access = list("tcomms") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 @@ -56183,8 +56335,7 @@ dir = 8 }, /obj/machinery/door/airlock/hatch{ - name = "MiniSat Antechamber"; - req_access_txt = "65" + name = "MiniSat Antechamber" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -56192,6 +56343,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "rqB" = ( @@ -56217,18 +56369,18 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "rqS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/fore) "rqZ" = ( @@ -56717,8 +56869,7 @@ /area/hydroponics/garden) "rAr" = ( /obj/machinery/door/airlock/research{ - name = "Toxins Lab"; - req_access_txt = "7" + name = "Toxins Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -56733,6 +56884,7 @@ /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/plasteel/white, /area/science/mixing) "rAx" = ( @@ -56776,13 +56928,13 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/purple/visible, /obj/machinery/door/airlock/atmos/glass{ - name = "Incinerator Access"; - req_access_txt = "24" + name = "Incinerator Access" }, /obj/machinery/door/poddoor/preopen{ id = "atmos"; name = "atmos blast door" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/distro) "rBs" = ( @@ -56869,8 +57021,7 @@ /area/engine/atmos/distro) "rDa" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Quartermaster"; - req_access_txt = "41" + name = "Quartermaster" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -56894,6 +57045,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/brown/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, /turf/open/floor/plasteel, /area/quartermaster/qm) "rDf" = ( @@ -56944,8 +57096,7 @@ /area/security/prison/hallway) "rEz" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering"; - req_one_access_txt = "10;32" + name = "Engineering" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -56969,6 +57120,8 @@ dir = 1 }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plasteel, /area/engine/foyer) "rEA" = ( @@ -57037,12 +57190,14 @@ /obj/machinery/door/window/westleft{ dir = 1; layer = 3.1; - name = "Cyborg Upload Console Window"; - req_access_txt = "16" + name = "Cyborg Upload Console Window" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master{ + dir = 1 + }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "rGe" = ( @@ -57119,7 +57274,7 @@ name = "Public Teleporter Access Control"; pixel_x = -6; pixel_y = -24; - req_access_txt = "17" + req_access = list("teleporter") }, /turf/open/floor/plating, /area/teleporter) @@ -57544,12 +57699,10 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor{ dir = 1; - name = "Armory Desk"; - req_access_txt = "3" + name = "Armory Desk" }, /obj/machinery/door/window/southleft{ - name = "Reception Desk"; - req_access_txt = "63" + name = "Reception Desk" }, /obj/item/paper_bin{ pixel_x = -3; @@ -57563,6 +57716,14 @@ pixel_x = 10; pixel_y = -3 }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/security/basic, +/obj/effect/mapping_helpers/windoor/access/all/security/armory{ + dir = 1 + }, /turf/open/floor/plating, /area/security/warden) "rOu" = ( @@ -57742,8 +57903,7 @@ /area/hallway/primary/starboard) "rRw" = ( /obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance"; - req_access_txt = "1" + name = "Security Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -57751,6 +57911,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plating, /area/maintenance/fore/secondary) "rRA" = ( @@ -57933,7 +58095,8 @@ idSelf = "toxins_access_control"; name = "Toxins airlock control"; pixel_x = 24; - pixel_y = 24 + pixel_y = 24; + req_access = list("toxins") }, /obj/machinery/doorButtons/access_button{ idDoor = "toxins_airlock_interior"; @@ -57941,7 +58104,8 @@ layer = 3.1; name = "Toxins airlock control"; pixel_x = -24; - pixel_y = 24 + pixel_y = 24; + req_access = list("toxins") }, /turf/open/floor/engine, /area/science/mixing/chamber) @@ -58016,8 +58180,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Treatment"; - req_access_txt = "5" + name = "Medbay Treatment" }, /obj/effect/mapping_helpers/airlock/unres, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ @@ -58026,6 +58189,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plasteel/white, /area/medical/sleeper) "rWx" = ( @@ -58216,7 +58380,7 @@ name = "Virology Access Console"; pixel_x = 8; pixel_y = 22; - req_access_txt = "39" + req_access = list("virology") }, /obj/machinery/light_switch{ pixel_x = -4; @@ -58345,13 +58509,13 @@ /area/security/checkpoint/medical) "sdu" = ( /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = -1; diry = 2 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/aft) "sdv" = ( @@ -58412,7 +58576,6 @@ "sdW" = ( /obj/machinery/door/airlock/security/glass{ name = "Brig Control"; - req_access_txt = "3"; security_level = 1 }, /obj/machinery/door/firedoor/border_only{ @@ -58424,6 +58587,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "sdX" = ( @@ -58483,8 +58647,7 @@ /area/engine/engineering) "sfg" = ( /obj/machinery/door/window/westleft{ - name = "Atmospherics Canister Storage"; - req_access_txt = "24" + name = "Atmospherics Canister Storage" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -58492,6 +58655,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/engine/atmos/foyer) "sfl" = ( @@ -58529,8 +58695,10 @@ }, /obj/machinery/door/window/brigdoor{ dir = 1; - name = "Armory Door"; - req_access_txt = "1" + name = "Armory Door" + }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 1 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -58654,9 +58822,7 @@ /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "siG" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -58675,6 +58841,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/aft) "siU" = ( @@ -58837,8 +59004,10 @@ }, /obj/machinery/door/window/brigdoor/northright{ name = "Filing Room"; - opacity = 1; - req_access_txt = "77" + opacity = 1 + }, +/obj/effect/mapping_helpers/windoor/access/all/medical/psychology{ + dir = 1 }, /turf/open/floor/wood, /area/medical/psych) @@ -58952,8 +59121,7 @@ /area/engine/engineering) "spk" = ( /obj/machinery/door/airlock/research{ - name = "Testing Lab"; - req_access_txt = "47" + name = "Testing Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -58967,6 +59135,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plasteel, /area/science/misc_lab) "sps" = ( @@ -59137,12 +59306,12 @@ /area/quartermaster/office) "stn" = ( /obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "24" + name = "Atmospherics External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/engine/atmos/distro) "stz" = ( @@ -59270,16 +59439,15 @@ /turf/open/floor/plating, /area/crew_quarters/heads/chief) "sxb" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Prison Visitation"; - req_access_txt = "2" - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/public/glass{ + name = "Prison Visitation" + }, /turf/open/floor/plasteel/dark, /area/security/prison/hallway) "sxj" = ( @@ -59410,8 +59578,7 @@ /area/hallway/primary/central) "sAl" = ( /obj/machinery/door/airlock/engineering{ - name = "Starboard Bow Solar Access"; - req_access_txt = "10" + name = "Starboard Bow Solar Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -59422,6 +59589,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "sAr" = ( @@ -59812,8 +59980,7 @@ base_state = "left"; dir = 8; icon_state = "left"; - name = "Robotics Desk"; - req_one_access_txt = "29;75" + name = "Robotics Desk" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics2"; @@ -59831,6 +59998,9 @@ pixel_x = 9; pixel_y = -4 }, +/obj/effect/mapping_helpers/windoor/access/any/science/robotics{ + dir = 8 + }, /turf/open/floor/plasteel, /area/science/robotics/lab) "sGY" = ( @@ -60539,7 +60709,7 @@ /obj/machinery/modular_computer/console/preset/tcomms{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "sWv" = ( /obj/effect/turf_decal/trimline/brown/filled/line/lower{ @@ -60557,12 +60727,12 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/port/aft) "sWK" = ( @@ -60606,8 +60776,7 @@ /area/lawoffice) "sXr" = ( /obj/machinery/door/airlock/command/glass{ - name = "EVA Storage"; - req_access_txt = "18" + name = "EVA Storage" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -60622,6 +60791,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "sXv" = ( @@ -60800,11 +60970,12 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/hatch{ - name = "MiniSat Teleporter Room"; - req_one_access_txt = "17;65" + name = "MiniSat Teleporter Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "sZy" = ( @@ -61084,12 +61255,14 @@ /obj/item/gun/ballistic/shotgun/automatic/breaching, /obj/machinery/door/window/brigdoor{ dir = 4; - name = "Armory Door"; - req_access_txt = "1" + name = "Armory Door" }, /obj/machinery/camera/motion/armory{ dir = 4 }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "teC" = ( @@ -61197,7 +61370,7 @@ id = "xenodesk"; name = "Xenobiology Desk Shutters Control"; pixel_x = -28; - req_access_txt = "55" + req_access = list("xenobiology") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 9 @@ -61368,8 +61541,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/security/glass{ id_tag = "permainterior"; - name = "Permabrig Transfer"; - req_access_txt = "2" + name = "Permabrig Transfer" }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/border_only{ @@ -61379,6 +61551,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/prison) "tjY" = ( @@ -61469,7 +61642,7 @@ name = "South Research Lab Shutter Control"; pixel_x = -23; pixel_y = 1; - req_access_txt = "47" + req_access = list("science") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 10 @@ -61583,13 +61756,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/command{ - name = "Captain's Quarters"; - req_access_txt = "20" + name = "Captain's Quarters" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/stone, /area/crew_quarters/heads/captain) "toz" = ( @@ -61762,7 +61935,7 @@ /obj/effect/turf_decal/ramp_middle{ dir = 1 }, -/turf/open/floor/plasteel/stairs{ +/turf/open/floor/plasteel/stairs/goon/stairs_alone{ dir = 1 }, /area/escapepodbay) @@ -61794,18 +61967,28 @@ /area/medical/virology) "trN" = ( /obj/machinery/door/window/eastleft{ - name = "armory desk"; - req_access_txt = "1" + name = "armory desk" }, /obj/machinery/door/window/westleft{ - name = "armory desk"; - req_access_txt = "3" + name = "armory desk" }, /obj/structure/table/reinforced, /obj/item/deskbell/preset/armory{ pixel_x = 5; pixel_y = 10 }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/all/security/armory{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, /turf/open/floor/plating, /area/ai_monitored/security/armory) "tsh" = ( @@ -61825,8 +62008,7 @@ /area/maintenance/starboard/aft) "tss" = ( /obj/machinery/door/airlock/atmos{ - name = "Tanks and Filtration"; - req_access_txt = "24" + name = "Tanks and Filtration" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -61843,6 +62025,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plasteel, /area/engine/atmos/distro) "tsu" = ( @@ -62238,24 +62421,14 @@ /turf/open/floor/plasteel/white, /area/storage/tech) "tBu" = ( -/obj/machinery/smartfridge/drinks{ - icon_state = "boozeomat" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "barcounter"; - name = "bar shutters" - }, /obj/effect/turf_decal/tile/bar{ dir = 1 }, /obj/effect/turf_decal/tile/bar, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/machinery/smartfridge/drinks{ + icon_state = "boozeomat" }, -/turf/open/floor/plasteel, +/turf/closed/wall, /area/crew_quarters/bar) "tBG" = ( /obj/structure/railing, @@ -62307,6 +62480,12 @@ /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 8 }, +/obj/machinery/button/door{ + id = "telelab"; + name = "Test Chamber Blast Doors"; + pixel_x = 25; + req_access = list("experimentation") + }, /turf/open/floor/plasteel/white, /area/science/explab) "tCY" = ( @@ -62448,8 +62627,7 @@ /area/ai_monitored/storage/satellite) "tGe" = ( /obj/machinery/door/airlock/maintenance{ - name = "Incinerator Access"; - req_one_access_txt = "24;10" + name = "Incinerator Access" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -62460,6 +62638,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/aft) "tGr" = ( @@ -62736,9 +62915,7 @@ /turf/open/floor/plasteel/white, /area/science/explab) "tKh" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -62749,6 +62926,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) "tKv" = ( @@ -62759,14 +62937,14 @@ /area/crew_quarters/toilet) "tKP" = ( /obj/machinery/door/airlock/external{ - name = "Escape Pod Four"; - req_access_txt = "10" + name = "Escape Pod Four" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = -2; diry = 2 }, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/engine/engineering) "tKR" = ( @@ -62832,8 +63010,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/medical{ - name = "Morgue"; - req_access_txt = "6;5" + name = "Morgue" }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -62843,6 +63020,7 @@ }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower, /obj/effect/turf_decal/stripes/corner, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/plasteel/white, /area/medical/morgue) "tMO" = ( @@ -62863,9 +63041,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/security{ - name = "Interrogation"; - req_access_txt = "63" + name = "Interrogation" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/security/interrogation) "tMW" = ( @@ -63152,9 +63330,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "tRp" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -63165,6 +63341,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/maintenance/aft) "tRq" = ( @@ -63302,8 +63479,7 @@ /area/crew_quarters/heads/hos) "tUz" = ( /obj/machinery/door/airlock/medical{ - name = "Paramedic Staging Area"; - req_access_txt = "69" + name = "Paramedic Staging Area" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -63324,17 +63500,20 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /turf/open/floor/plasteel, /area/medical/paramedic) "tUH" = ( /obj/machinery/door/window/westleft{ dir = 4; - name = "Monkey Pen"; - req_access_txt = "9" + name = "Monkey Pen" }, /mob/living/carbon/monkey{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/science/genetics{ + dir = 4 + }, /turf/open/floor/grass, /area/medical/genetics) "tUK" = ( @@ -63367,8 +63546,7 @@ /area/science/xenobiology) "tVb" = ( /obj/machinery/door/airlock/research{ - name = "Genetics Lab"; - req_access_txt = "9" + name = "Genetics Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -63383,6 +63561,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/plasteel/white, /area/medical/genetics) "tVc" = ( @@ -63402,7 +63581,7 @@ dir = 8; network = "tcommsat" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "tVL" = ( /obj/structure/lattice, @@ -63913,8 +64092,7 @@ /area/medical/storage) "ugn" = ( /obj/machinery/door/airlock/maintenance{ - name = "Permabrig Maintenance"; - req_access_txt = "1" + name = "Permabrig Maintenance" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only{ @@ -63926,6 +64104,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/prison) "ugz" = ( @@ -64066,8 +64245,7 @@ /area/crew_quarters/bar) "ukK" = ( /obj/machinery/door/airlock/command{ - name = "Head of Personnel"; - req_access_txt = "57" + name = "Head of Personnel" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -64085,6 +64263,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/hop, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "uld" = ( @@ -64205,7 +64384,6 @@ "umX" = ( /obj/machinery/door/airlock/security/glass{ name = "Armory"; - req_access_txt = "1"; security_level = 1 }, /obj/machinery/door/firedoor/border_only{ @@ -64214,6 +64392,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plasteel/showroomfloor, /area/ai_monitored/security/armory) "uni" = ( @@ -64270,8 +64449,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/window/eastright{ dir = 1; - name = "Chemistry Desk"; - req_access_txt = "33" + name = "Chemistry Desk" }, /obj/machinery/door/poddoor/preopen{ id = "chemistry_shutters"; @@ -64281,6 +64459,9 @@ pixel_x = -8; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry{ + dir = 1 + }, /turf/open/floor/plating, /area/medical/chemistry) "upb" = ( @@ -64348,8 +64529,7 @@ "uqN" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ - name = "Cargo Desk"; - req_access_txt = "31" + name = "Cargo Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -64365,6 +64545,9 @@ pixel_x = -6; pixel_y = -10 }, +/obj/effect/mapping_helpers/windoor/access/all/supply/general{ + dir = 8 + }, /turf/open/floor/plating, /area/quartermaster/office) "uqW" = ( @@ -64397,7 +64580,7 @@ id = "cell3 blast"; name = "Cell 3 Blast Door Control"; pixel_y = -26; - req_access_txt = "63" + req_access = list("brig") }, /turf/open/floor/plasteel, /area/security/prison) @@ -64465,13 +64648,13 @@ /area/medical/medbay/lobby) "usD" = ( /obj/machinery/door/airlock/research{ - name = "Robotics Lab"; - req_one_access_txt = "29;75" + name = "Robotics Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel/white, /area/science/robotics/lab) "usO" = ( @@ -64780,13 +64963,15 @@ idDoor = "telecomms_airlock_exterior"; idSelf = "telecomms_airlock_control"; pixel_x = 7; - pixel_y = -23 + pixel_y = -23; + req_access = list("tcomms") }, /obj/machinery/doorButtons/access_button{ idDoor = "telecomms_airlock_interior"; idSelf = "telecomms_airlock_control"; pixel_x = -23; - pixel_y = 6 + pixel_y = 6; + req_access = list("tcomms") }, /obj/machinery/camera{ c_tag = "Telecomms Server Room Access"; @@ -64847,8 +65032,7 @@ "uBw" = ( /obj/machinery/door/window/eastright{ dir = 8; - name = "Holding Cell"; - req_access_txt = "2" + name = "Holding Cell" }, /obj/structure/cable{ icon_state = "4-8" @@ -64858,6 +65042,9 @@ pixel_x = 6; pixel_y = 24 }, +/obj/effect/mapping_helpers/windoor/access/all/security/brig{ + dir = 8 + }, /turf/open/floor/plasteel, /area/security/prison) "uBx" = ( @@ -64911,8 +65098,7 @@ /area/security/processing) "uDp" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "AI Satellite Monitoring"; - req_access_txt = "10" + name = "AI Satellite Monitoring" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -64920,6 +65106,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/engine/engineering) "uDq" = ( @@ -64933,9 +65120,9 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "12" + name = "Shipbreaking External Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/escapepodbay) "uDL" = ( @@ -65078,13 +65265,13 @@ frequency = 1449; glass = 1; id_tag = "telecomms_airlock_interior"; - name = "Telecomms Server Room Access"; - req_access_txt = "61" + name = "Telecomms Server Room Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/storage) "uGc" = ( @@ -65133,8 +65320,7 @@ /area/crew_quarters/bar) "uHr" = ( /obj/machinery/door/airlock/medical{ - name = "Morgue"; - req_access_txt = "6" + name = "Morgue" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -65146,6 +65332,7 @@ /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/plasteel, /area/medical/morgue) "uHL" = ( @@ -65265,7 +65452,8 @@ id = "kanyewest"; name = "Privacy Shutters"; pixel_x = -6; - pixel_y = 8 + pixel_y = 8; + req_access = list("detective") }, /turf/open/floor/carpet, /area/security/detectives_office) @@ -65366,9 +65554,9 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock{ - name = "Bar Storage"; - req_access_txt = "25" + name = "Bar Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/plasteel, /area/crew_quarters/bar) "uKB" = ( @@ -65406,7 +65594,7 @@ id = "cell2 blast"; name = "Cell 2 Blast Door Control"; pixel_y = -26; - req_access_txt = "63" + req_access = list("brig") }, /turf/open/floor/plasteel, /area/security/prison) @@ -65430,13 +65618,15 @@ }, /obj/machinery/door/window/brigdoor{ dir = 1; - name = "Armory Door"; - req_access_txt = "1" + name = "Armory Door" }, /obj/structure/window/reinforced{ dir = 4; max_integrity = 350 }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "uLO" = ( @@ -65486,8 +65676,7 @@ dir = 8 }, /obj/machinery/door/airlock/mining/glass{ - name = "Mining Dock"; - req_access_txt = "48" + name = "Mining Dock" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -65499,6 +65688,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/brown/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "uMD" = ( @@ -65574,7 +65764,7 @@ name = "Telecommunications server shutters control"; pixel_x = 25; pixel_y = 25; - req_one_access_txt = "19;61" + req_access = list("tcomms") }, /obj/effect/turf_decal/trimline/brown/filled/line/lower, /obj/effect/turf_decal/trimline/neutral/filled/line/lower{ @@ -65611,7 +65801,7 @@ id = "viropen"; name = "Monkey Pen Shutters"; pixel_x = -24; - req_access_txt = "39" + req_access = list("virology") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 @@ -66320,8 +66510,7 @@ /area/crew_quarters/heads/cmo) "vcD" = ( /obj/machinery/door/airlock/engineering{ - name = "Auxillary Base Construction"; - req_one_access_txt = "32;47;48" + name = "Auxillary Base Construction" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -66333,6 +66522,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base, /turf/open/floor/plasteel, /area/construction/mining/aux_base) "vcL" = ( @@ -66423,12 +66613,12 @@ autoclose = 0; heat_proof = 1; id_tag = "toxins_airlock_exterior"; - name = "Mixing Room Exterior Airlock"; - req_access_txt = "8" + name = "Mixing Room Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/toxins, /turf/open/floor/engine, /area/science/mixing/chamber) "vdZ" = ( @@ -66468,8 +66658,7 @@ /area/medical/sleeper) "veD" = ( /obj/machinery/door/airlock{ - name = "Law Office"; - req_access_txt = "38" + name = "Law Office" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -66477,6 +66666,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/lawyer, /turf/open/floor/wood, /area/lawoffice) "veK" = ( @@ -66718,8 +66908,10 @@ }, /obj/machinery/door/window/brigdoor{ dir = 1; - name = "Armory Door"; - req_access_txt = "1" + name = "Armory Door" + }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 1 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) @@ -66954,15 +67146,15 @@ /turf/open/floor/wood, /area/lawoffice) "voe" = ( +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, /obj/machinery/door/window/northleft{ - base_state = "right"; dir = 8; - icon_state = "right"; - name = "Containment Pen"; - req_access_txt = "55" + name = "Containment Pen" }, -/obj/effect/turf_decal/loading_area{ - dir = 4 +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -67251,13 +67443,15 @@ /turf/open/floor/engine, /area/science/xenobiology) "vtX" = ( +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen"; - req_access_txt = "55" + name = "Containment Pen" }, -/obj/effect/turf_decal/loading_area{ - dir = 8 +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -67506,9 +67700,9 @@ dir = 8 }, /obj/machinery/door/window/brigdoor{ - name = "Armory Door"; - req_access_txt = "1" + name = "Armory Door" }, +/obj/effect/mapping_helpers/windoor/access/all/security/general, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "vxS" = ( @@ -67524,8 +67718,7 @@ /area/ai_monitored/turret_protected/aisat_interior) "vxY" = ( /obj/machinery/door/airlock{ - name = "Kitchen cold room"; - req_access_txt = "28" + name = "Kitchen Cold Room" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -67542,6 +67735,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plasteel/freezer, /area/crew_quarters/kitchen) "vyo" = ( @@ -67568,7 +67762,7 @@ id = "aux_base_shutters"; name = "Public Shutters Control"; pixel_y = 24; - req_one_access_txt = "32;47;48" + req_access = list("aux_base") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -67768,8 +67962,7 @@ /area/maintenance/aft) "vBC" = ( /obj/machinery/door/airlock/maintenance{ - name = "Library Maintenance"; - req_one_access_txt = "12;37" + name = "Library Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -67778,6 +67971,8 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/library, /turf/open/floor/plating, /area/maintenance/starboard/fore) "vBJ" = ( @@ -67940,8 +68135,7 @@ "vDW" = ( /obj/machinery/door/airlock/research{ id_tag = "RoboticsFoyer"; - name = "Robotics Surgery Access"; - req_one_access_txt = "29;75" + name = "Robotics Surgery Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -67949,6 +68143,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) "vEi" = ( @@ -68061,7 +68256,7 @@ name = "Biohazard Shutter Control"; pixel_x = 6; pixel_y = 8; - req_access_txt = "47" + req_access = list("science") }, /obj/item/storage/pencil_holder/crew/fancy{ pixel_x = -8; @@ -68149,7 +68344,8 @@ idSelf = "incinerator_access_control"; name = "Incinerator airlock control"; pixel_x = -24; - pixel_y = -8 + pixel_y = -8; + req_access = list("atmospherics") }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -68242,9 +68438,9 @@ }, /obj/machinery/door/airlock/external{ name = "Mining Dock Airlock"; - req_access_txt = "48"; shuttledocked = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/plating, /area/quartermaster/miningdock) "vJi" = ( @@ -68384,6 +68580,9 @@ /obj/structure/disposalpipe/sorting/mail/flip{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/fore) "vMp" = ( @@ -68439,8 +68638,7 @@ dir = 4 }, /obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator and SMES"; - req_one_access_txt = "11;32" + name = "Gravity Generator and SMES" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -68452,6 +68650,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /turf/open/floor/plasteel, /area/engine/engine_smes) "vNd" = ( @@ -68488,7 +68687,8 @@ idDoor = "ai_core_airlock_exterior"; idSelf = "ai_core_airlock_control"; pixel_x = -23; - pixel_y = 7 + pixel_y = 7; + req_access = list("ai_master") }, /obj/machinery/light, /obj/effect/turf_decal/stripes/line{ @@ -68666,9 +68866,9 @@ pixel_y = -3 }, /obj/machinery/door/window/brigdoor{ - name = "Armory Door"; - req_access_txt = "1" + name = "Armory Door" }, +/obj/effect/mapping_helpers/windoor/access/all/security/general, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "vRA" = ( @@ -69110,7 +69310,8 @@ id = "secequipment"; name = "Space Shutters Control"; pixel_x = -1; - pixel_y = 23 + pixel_y = 23; + req_access = list("security") }, /turf/open/floor/plasteel/showroomfloor, /area/security/main) @@ -69123,8 +69324,7 @@ /area/maintenance/starboard/aft) "vZm" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_access_txt = "50" + name = "Cargo Office" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -69148,12 +69348,12 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plasteel, /area/quartermaster/sorting) "vZn" = ( /obj/machinery/door/airlock/maintenance{ - name = "Custodial Maintenance"; - req_access_txt = "26" + name = "Custodial Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -69163,6 +69363,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/plating, /area/maintenance/aft) "vZp" = ( @@ -69498,7 +69699,7 @@ name = "CMO Privacy Shutters Control"; pixel_x = 7; pixel_y = 24; - req_access_txt = "40" + req_access = list("medical") }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) @@ -69681,13 +69882,13 @@ /area/ai_monitored/turret_protected/aisat_interior) "wkE" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = -1; diry = -1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/aft) "wkF" = ( @@ -70024,8 +70225,7 @@ /area/quartermaster/miningdock) "wqL" = ( /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload"; - req_access_txt = "16" + name = "AI Upload" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -70045,6 +70245,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "wqV" = ( @@ -70208,8 +70409,7 @@ /area/maintenance/port/aft) "wvg" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay"; - req_access_txt = "31" + name = "Cargo Bay" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -70220,6 +70420,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plasteel, /area/quartermaster/storage) "wvh" = ( @@ -70249,8 +70450,7 @@ /area/science/nanite) "wwp" = ( /obj/machinery/door/airlock/wood{ - name = "Psychiatrists office"; - req_access_txt = "5" + name = "Psychiatrist's Office" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -70309,8 +70509,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" + name = "Prison Wing" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -70318,6 +70517,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/security/prison/hallway) "wwV" = ( @@ -70467,8 +70667,7 @@ /area/hallway/secondary/entry) "wzQ" = ( /obj/machinery/door/window/westleft{ - name = "Delivery Desk"; - req_access_txt = "50" + name = "Delivery Desk" }, /obj/structure/table/reinforced, /obj/machinery/door/firedoor/border_only{ @@ -70481,6 +70680,9 @@ pixel_x = 8; pixel_y = -3 }, +/obj/effect/mapping_helpers/windoor/access/all/supply/general{ + dir = 8 + }, /turf/open/floor/plating, /area/quartermaster/sorting) "wAc" = ( @@ -70551,8 +70753,7 @@ /area/hallway/secondary/entry) "wCs" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Maintenance"; - req_access_txt = "12;24" + name = "Atmospherics Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -70563,6 +70764,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/fore/secondary) "wCC" = ( @@ -70596,16 +70798,18 @@ /turf/open/floor/plasteel, /area/science/mixing) "wDK" = ( -/obj/machinery/door/window/northleft{ - dir = 4; - name = "Containment Pen"; - req_access_txt = "55" - }, /obj/machinery/door/poddoor/preopen{ id = "xenobio_r"; name = "Right side containment blast door" }, /obj/effect/turf_decal/delivery, +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Containment Pen" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 4 + }, /turf/open/floor/engine, /area/science/xenobiology) "wEe" = ( @@ -70642,13 +70846,13 @@ frequency = 1449; heat_proof = 1; id_tag = "incinerator_airlock_exterior"; - name = "Incinerator Exterior Airlock"; - req_access_txt = "32" + name = "Incinerator Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "wEA" = ( @@ -70919,7 +71123,8 @@ layer = 3.1; name = "Incinerator airlock control"; pixel_x = 22; - pixel_y = 8 + pixel_y = 8; + req_access = list("atmospherics") }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -71023,7 +71228,7 @@ name = "Cell 6 Blast Door Control"; pixel_x = 28; pixel_y = 8; - req_access_txt = "63" + req_access = list("brig") }, /turf/open/floor/plasteel, /area/security/prison) @@ -71452,8 +71657,7 @@ /area/maintenance/aft) "wWx" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" + name = "Security Office" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -71474,6 +71678,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "wWA" = ( @@ -71884,8 +72089,7 @@ /area/security/prison) "xeq" = ( /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" + name = "Medbay Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -71905,6 +72109,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/maintenance/aft) "xer" = ( @@ -71986,14 +72191,14 @@ /area/engine/atmos/distro) "xgu" = ( /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Access" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/maintenance/starboard/aft) "xgF" = ( @@ -72310,14 +72515,15 @@ /area/medical/medbay/central) "xmv" = ( /obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" + name = "Solar Maintenance" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "xmy" = ( @@ -73012,8 +73218,7 @@ /obj/machinery/door/window/southleft{ base_state = "right"; icon_state = "right"; - name = "Armory"; - req_access_txt = "3" + name = "Armory" }, /obj/effect/turf_decal/stripes{ dir = 6 @@ -73028,6 +73233,7 @@ /obj/machinery/light_switch{ pixel_x = 23 }, +/obj/effect/mapping_helpers/windoor/access/all/security/armory, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "xBb" = ( @@ -73053,8 +73259,7 @@ /area/crew_quarters/heads/captain) "xBl" = ( /obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Maintenance"; - req_access_txt = "24" + name = "Atmospherics Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -73066,6 +73271,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/aft) "xBp" = ( @@ -73548,11 +73754,13 @@ /obj/structure/rack, /obj/machinery/door/window/brigdoor{ dir = 4; - name = "Armory Door"; - req_access_txt = "1" + name = "Armory Door" }, /obj/item/card/id/departmental_budget/sec, /obj/item/reagent_containers/syringe/lethal/execution, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "xJQ" = ( @@ -73648,15 +73856,14 @@ /turf/open/floor/plasteel/dark, /area/engine/engineering) "xLY" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/port/aft) "xML" = ( @@ -73913,19 +74120,18 @@ "xRS" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "permainterior"; - name = "Permabrig"; - req_access_txt = "2" + name = "Permabrig" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/dark, /area/security/prison) "xSl" = ( /obj/machinery/door/airlock/research{ - name = "Mech Bay"; - req_one_access_txt = "29;75" + name = "Mech Bay" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_target{ dirx = 1; @@ -73944,6 +74150,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/corner/lower, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plasteel, /area/science/robotics/mechbay) "xSN" = ( @@ -73951,7 +74158,7 @@ id = "phoenixwright"; name = "Lawyer Shutters"; pixel_x = -23; - req_access_txt = "38" + req_access = list("lawyer") }, /turf/open/floor/wood, /area/lawoffice) @@ -74035,8 +74242,7 @@ /area/maintenance/aft) "xUj" = ( /obj/machinery/door/airlock/engineering{ - name = "Port Quarter Solar Access"; - req_access_txt = "10" + name = "Port Quarter Solar Access" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -74053,6 +74259,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "xUn" = ( @@ -74084,13 +74291,13 @@ /area/science/robotics/lab) "xUO" = ( /obj/machinery/door/airlock/external{ - name = "Escape Pod Three"; - req_access_txt = "63" + name = "Escape Pod Three" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/security/main) "xUX" = ( @@ -74250,18 +74457,18 @@ /turf/open/floor/plasteel, /area/security/main) "xZv" = ( -/obj/machinery/door/window/northleft{ - base_state = "right"; - dir = 8; - icon_state = "right"; - name = "Containment Pen"; - req_access_txt = "55" - }, /obj/machinery/door/poddoor/preopen{ id = "xenobio_l"; name = "Left side containment blast door" }, /obj/effect/turf_decal/delivery, +/obj/machinery/door/window/northleft{ + dir = 8; + name = "Containment Pen" + }, +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio{ + dir = 8 + }, /turf/open/floor/engine, /area/science/xenobiology) "xZC" = ( @@ -74467,14 +74674,14 @@ /area/crew_quarters/bar) "ydd" = ( /obj/machinery/door/airlock/atmos{ - name = "Atmospherics Maintenance"; - req_access_txt = "12;24" + name = "Atmospherics Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/maintenance/aft) "yey" = ( @@ -74665,7 +74872,7 @@ normaldoorcontrol = 1; pixel_x = -38; pixel_y = 29; - req_access_txt = "5" + req_access = list("medical") }, /obj/machinery/button/door{ desc = "A remote control switch for the medbay foyer."; @@ -74674,7 +74881,7 @@ normaldoorcontrol = 1; pixel_x = -24; pixel_y = 29; - req_access_txt = "5" + req_access = list("medical") }, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) @@ -74702,8 +74909,7 @@ /area/science/robotics/lab) "yhB" = ( /obj/machinery/door/airlock/highsecurity{ - name = "AI Upload Access"; - req_access_txt = "16" + name = "AI Upload Access" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -74721,6 +74927,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "yhF" = ( @@ -74746,8 +74953,7 @@ /area/storage/primary) "yiM" = ( /obj/machinery/door/airlock/research{ - name = "Xenobiology Lab"; - req_access_txt = "55" + name = "Xenobiology Lab" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -74771,6 +74977,7 @@ /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plasteel/white, /area/science/xenobiology) "yiP" = ( @@ -101011,7 +101218,7 @@ aph lVQ ayL bts -aAb +lLj ttQ bKG bOU @@ -101779,7 +101986,7 @@ hZq apS eqF aph -avt +fGp ayL bty azS @@ -102293,7 +102500,7 @@ apS pRg hPG aph -avt +nca ayL abt pIj @@ -103063,7 +103270,7 @@ lfX pXI gYb qeP -kwN +avf fKm ayW ayv @@ -116419,7 +116626,7 @@ aaa aaa gXs tbG -kGS +aoq fVy alP anf @@ -116936,7 +117143,7 @@ aag aoq aoq alP -fCb +kGS aUs aWC anf @@ -119284,7 +119491,7 @@ baT eHW uJu bhM -bhM +biJ bhM biO blA @@ -119835,10 +120042,10 @@ wbN xZv rgh kOd -hAT +xZv rgh wbN -nca +xZv piv bDb aaa @@ -120089,13 +120296,13 @@ tVa dmv iSr cTn -vtX +qLy piv cTn -vtX +qLy piv kcH -qXB +vtX piv bDb aaa @@ -121368,7 +121575,7 @@ jaq uNH bDb ltQ -wDK +lpP eJq ltQ wDK diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 59ac59e706df..40d784f5321b 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -20,15 +20,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Dormitories" }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "aaT" = ( @@ -50,6 +45,14 @@ /obj/effect/baseturf_helper/asteroid/snow, /turf/open/floor/plating/asteroid/snow/airless, /area/yogs/infiltrator_base/outside) +"abk" = ( +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, +/obj/machinery/door/airlock/centcom{ + name = "Shuttle Control Office" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/supply) "abp" = ( /obj/machinery/vending/coffee, /obj/effect/decal/cleanable/dirt, @@ -107,17 +110,15 @@ /turf/open/floor/plasteel, /area/yogs/infiltrator_base/jail) "acQ" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/yogs/infiltrator_base) "ada" = ( /obj/structure/bed, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = list(150) +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -133,12 +134,11 @@ /turf/open/floor/plasteel, /area/centcom/testchamber) "ado" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/yogs/infiltrator_base) "adr" = ( @@ -232,10 +232,10 @@ /area/yogs/infiltrator_base) "adW" = ( /obj/machinery/door/airlock/external/glass{ - name = "E.V.A. Foyer"; - req_access_txt = "150" + name = "E.V.A. Foyer" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "aed" = ( @@ -244,7 +244,7 @@ "ael" = ( /obj/structure/chair/stool, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, /obj/effect/landmark/start/infiltrator, @@ -256,12 +256,12 @@ /area/yogs/infiltrator_base) "aet" = ( /obj/machinery/door/airlock/security/glass{ - name = "Cell 1"; - req_access_txt = "150" + name = "Cell 1" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/yogs/infiltrator_base/jail) "aev" = ( @@ -284,15 +284,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Bar" }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "aeK" = ( @@ -1359,19 +1354,12 @@ /turf/open/floor/plasteel, /area/centcom/supply) "aiS" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/obj/effect/turf_decal/tile/brown{ +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, /turf/open/floor/plasteel, -/area/centcom/supply) +/area/centcom/control) "aiT" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1431,13 +1419,10 @@ /turf/open/floor/plasteel, /area/centcom/supply) "aja" = ( -/obj/machinery/door/firedoor, +/obj/structure/fans/tiny, /obj/machinery/door/airlock/centcom{ name = "CentCom" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /turf/open/floor/plasteel, /area/centcom/control) "ajb" = ( @@ -1581,12 +1566,9 @@ /area/centcom/supply) "ajr" = ( /obj/machinery/door/airlock/external{ - name = "Supply Shuttle"; - req_access_txt = "106" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 + name = "Supply Shuttle" }, +/obj/effect/mapping_helpers/airlock/access/all/admin/storage, /turf/open/floor/plasteel, /area/centcom/supply) "ajs" = ( @@ -1630,14 +1612,16 @@ layer = 4; name = "Loading Doors"; pixel_x = -27; - pixel_y = -5 + pixel_y = -5; + req_access = list("cent_storage") }, /obj/machinery/button/door/indestructible{ id = "XCCQMLoaddoor2"; layer = 4; name = "Loading Doors"; pixel_x = -27; - pixel_y = 5 + pixel_y = 5; + req_access = list("cent_storage") }, /obj/machinery/computer/cargo{ dir = 4 @@ -2349,17 +2333,16 @@ /area/centcom/control) "akZ" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/control) "ala" = ( /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; - name = "CentCom Stand"; - req_access_txt = "109" + name = "CentCom Stand" }, /obj/machinery/light{ dir = 8 @@ -2393,8 +2376,7 @@ }, /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; - name = "CentCom Stand"; - req_access_txt = "109" + name = "CentCom Stand" }, /turf/open/floor/plasteel/grimy, /area/centcom/control) @@ -2410,8 +2392,7 @@ "alf" = ( /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; - name = "CentCom Stand"; - req_access_txt = "109" + name = "CentCom Stand" }, /obj/machinery/light{ dir = 4 @@ -2609,18 +2590,18 @@ /area/space) "alJ" = ( /obj/machinery/door/airlock/centcom{ - name = "Shuttle Control Office"; - req_access_txt = "109" + name = "Shuttle Control Office" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/supply) "alK" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Supply"; - req_access_txt = "106" + name = "CentCom Supply" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/admin/storage, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/supply) "alL" = ( @@ -2705,12 +2686,10 @@ /turf/open/floor/mineral/titanium/white, /area/centcom/evac) "alT" = ( +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/structure/fans/tiny, /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 + name = "CentCom Security" }, /turf/open/floor/plasteel, /area/centcom/control) @@ -3136,8 +3115,10 @@ /turf/open/floor/grass, /area/centcom/control) "amR" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/centcom/control) "amS" = ( @@ -3644,8 +3625,7 @@ "anQ" = ( /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; - name = "CentCom Stand"; - req_access_txt = "109" + name = "CentCom Stand" }, /obj/machinery/firealarm{ dir = 4; @@ -3661,13 +3641,13 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/admin/general, /turf/open/floor/plasteel/dark, /area/centcom/control) "anR" = ( /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; - name = "CentCom Stand"; - req_access_txt = "109" + name = "CentCom Stand" }, /obj/machinery/firealarm{ dir = 8; @@ -3683,6 +3663,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/admin/general, /turf/open/floor/plasteel/dark, /area/centcom/control) "anS" = ( @@ -4165,8 +4146,7 @@ /area/centcom/ferry) "aoJ" = ( /obj/machinery/door/airlock/centcom{ - name = "Administrative Office"; - req_access_txt = "109" + name = "Administrative Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -4181,6 +4161,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, +/obj/structure/fans/tiny, /turf/open/floor/plasteel/dark, /area/centcom/ferry) "aoK" = ( @@ -4482,18 +4464,25 @@ /area/centcom/supply) "apl" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; dir = 4; icon_state = "rightsecure"; - name = "CentCom Customs"; - req_access_txt = "109" + name = "CentCom Customs" }, /obj/item/clipboard, /obj/item/folder/yellow, /obj/item/pen/red, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/all/admin/storage{ + dir = 4 + }, /turf/open/floor/plasteel, /area/centcom/supply) "apm" = ( @@ -4710,26 +4699,29 @@ }, /area/yogs/infiltrator_base) "apA" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /obj/machinery/turretid{ ailock = 1; + control_area = null; desc = "A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; icon_state = "control_stun"; name = "Security turret control"; pixel_x = 26; - req_access = 150 + req_access = list("syndicate") }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, /turf/open/floor/plasteel, /area/yogs/infiltrator_base/jail) "apB" = ( -/obj/machinery/firealarm, +/obj/machinery/firealarm{ + dir = 4 + }, /turf/closed/indestructible/riveted, /area/centcom/ferry) "apC" = ( @@ -4775,8 +4767,7 @@ /area/centcom/holding) "apF" = ( /obj/machinery/door/airlock/centcom{ - name = "Auxillary Dock"; - req_access_txt = "150" + name = "Auxillary Dock" }, /turf/open/floor/plasteel/dark, /area/centcom/syndicate_mothership/control) @@ -4820,10 +4811,6 @@ /turf/open/floor/carpet/green, /area/centcom/ferry) "apM" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, @@ -4847,10 +4834,6 @@ /obj/item/clothing/gloves/fingerless, /obj/item/clothing/gloves/color/black, /obj/item/clothing/glasses/eyepatch, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, /turf/open/floor/carpet/green, /area/centcom/ferry) "apO" = ( @@ -4882,13 +4865,18 @@ /area/centcom/supply) "apQ" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/structure/window/reinforced{ dir = 4 }, /obj/item/paper_bin, /obj/item/pen/red, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel, /area/centcom/supply) "apR" = ( @@ -4989,10 +4977,6 @@ /obj/structure/table/wood, /obj/item/folder/red, /obj/item/lighter, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -5389,11 +5373,11 @@ /area/centcom/syndicate_mothership/control) "aqQ" = ( /obj/machinery/door/airlock/centcom{ - name = "Administrative Office"; - req_access_txt = "109" + name = "Administrative Office" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/ferry) "aqR" = ( @@ -5402,18 +5386,16 @@ /area/centcom/ferry) "aqS" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/admin/storage, /turf/open/floor/plasteel, /area/centcom/supply) "aqT" = ( /obj/machinery/door/airlock/centcom{ name = "CentCom" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plasteel, /area/centcom/control) @@ -5461,18 +5443,21 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/mecha/combat/durand, +/obj/mecha/combat/durand{ + internals_req_access = null; + operation_req_access = null + }, /turf/open/floor/engine, /area/centcom/testchamber) "arc" = ( /obj/machinery/door/airlock/security/glass{ - name = "Cell 2"; - req_access_txt = "150" + name = "Cell 2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/yogs/infiltrator_base/jail) "ard" = ( @@ -5511,13 +5496,13 @@ /area/centcom/syndicate_mothership/control) "arh" = ( /obj/machinery/door/airlock/centcom{ - name = "Restroom"; - req_access_txt = "150" + name = "Restroom" }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/centcom/syndicate_mothership/control) "ari" = ( @@ -6275,8 +6260,7 @@ /area/centcom/ferry) "asD" = ( /obj/machinery/door/airlock/centcom{ - name = "Administrative Storage"; - req_access_txt = "106" + name = "Administrative Storage" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -6284,9 +6268,8 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/ferry) "asE" = ( @@ -6369,15 +6352,13 @@ "asH" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/vault{ - name = "Vault Door"; - req_access_txt = "53" + name = "Vault Door" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/ferry) "asI" = ( @@ -6423,12 +6404,10 @@ /area/centcom/control) "asL" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 + name = "CentCom Security" }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/evac) "asM" = ( @@ -6525,9 +6504,10 @@ /area/centcom/wizard_station) "asY" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Supply"; - req_access_txt = "106" + name = "CentCom Supply" }, +/obj/effect/mapping_helpers/airlock/access/all/admin/storage, +/obj/structure/fans/tiny, /turf/open/floor/plasteel/dark, /area/centcom/supplypod) "asZ" = ( @@ -6668,10 +6648,13 @@ /area/centcom/ferry) "atu" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Supply"; - req_access_txt = "106" + name = "CentCom Supply" }, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ dir = 8 }, /turf/open/floor/plasteel, @@ -6779,10 +6762,6 @@ /obj/machinery/atmospherics/components/unary/tank/air{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-8" @@ -6798,10 +6777,6 @@ /obj/item/ammo_box/m44, /obj/item/gun/ballistic/revolver/mateba, /obj/structure/table/reinforced, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -6855,8 +6830,10 @@ /turf/open/floor/plasteel, /area/centcom/control) "atL" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ dir = 8 }, /turf/open/floor/plasteel, @@ -6965,9 +6942,9 @@ /area/centcom/testchamber) "aud" = ( /obj/machinery/door/airlock/centcom{ - name = "Primary Hangar"; - req_access_txt = "150" + name = "Primary Hangar" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/centcom/syndicate_mothership/control) "aue" = ( @@ -7323,9 +7300,9 @@ /area/centcom/testchamber) "auJ" = ( /obj/machinery/door/airlock/external/glass{ - name = "Assault Pod Launcher Access"; - req_access_txt = "150" + name = "Assault Pod Launcher Access" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/centcom/syndicate_mothership/control) "auK" = ( @@ -7356,10 +7333,13 @@ /area/centcom/testchamber) "auO" = ( /obj/machinery/door/airlock/centcom{ - name = "Shuttle Control Office"; - req_access_txt = "109" + name = "Shuttle Control Office" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/centcom/ferry) "auP" = ( @@ -7489,10 +7469,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -32 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -7552,11 +7528,13 @@ base_state = "rightsecure"; dir = 1; icon_state = "rightsecure"; - name = "CentCom Customs"; - req_access_txt = "109" + name = "CentCom Customs" }, /obj/machinery/door/window, /obj/effect/turf_decal/bot, +/obj/effect/mapping_helpers/windoor/access/all/admin/general{ + dir = 1 + }, /turf/open/floor/plasteel, /area/centcom/control) "ave" = ( @@ -7677,9 +7655,8 @@ /obj/structure/chair{ dir = 4 }, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = 150 +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/machinery/light/small{ dir = 1 @@ -7739,10 +7716,10 @@ /area/centcom/ferry) "avF" = ( /obj/machinery/door/airlock/centcom{ - name = "Administrative Office"; - req_access_txt = "109" + name = "Administrative Office" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/ferry) "avG" = ( @@ -7750,9 +7727,7 @@ id = "XCCsec1"; name = "XCC Checkpoint 1 Shutters" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/control) "avH" = ( @@ -7788,7 +7763,7 @@ name = "Hanger Bay Shutters"; pixel_x = -8; pixel_y = 24; - req_access_txt = "2" + req_access = list("cent_general") }, /obj/machinery/button/door/indestructible{ id = "XCCsec3"; @@ -7865,9 +7840,6 @@ id = "XCCcustoms2"; name = "XCC Customs 2 Shutters" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /turf/open/floor/plasteel, /area/centcom/control) "avQ" = ( @@ -7924,9 +7896,6 @@ id = "XCCcustoms1"; name = "XCC Customs 1 Shutters" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /turf/open/floor/plasteel, /area/centcom/evac) "avV" = ( @@ -8021,7 +7990,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/mecha/combat/phazon, +/obj/mecha/combat/phazon{ + internals_req_access = null; + operation_req_access = null + }, /turf/open/floor/engine, /area/centcom/testchamber) "awf" = ( @@ -8071,8 +8043,10 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Commander's Desk"; - req_access_txt = "151" + name = "Commander's Desk" + }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/leader{ + dir = 4 }, /turf/open/floor/wood, /area/centcom/syndicate_mothership/control) @@ -8140,27 +8114,24 @@ /turf/open/floor/plasteel, /area/centcom/ferry) "awu" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/ferry) "awv" = ( +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, /obj/machinery/door/poddoor/shutters{ id = "XCCFerry"; name = "XCC Ferry Hangar" }, -/obj/effect/turf_decal/loading_area{ - dir = 4 - }, /turf/open/floor/plasteel, /area/centcom/ferry) "aww" = ( @@ -8168,7 +8139,7 @@ id = "XCCFerry"; name = "Hanger Bay Shutters"; pixel_y = 24; - req_access_txt = "2" + req_access = list("cent_general") }, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -8208,12 +8179,10 @@ /area/centcom/ferry) "awC" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Customs"; - req_access_txt = "109" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 + name = "CentCom Customs" }, +/obj/effect/mapping_helpers/airlock/access/all/admin/captain, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/control) "awE" = ( @@ -8268,13 +8237,9 @@ /turf/open/floor/plasteel, /area/centcom/control) "awJ" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ name = "CentCom" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -8708,7 +8673,8 @@ /obj/machinery/button/door/indestructible{ id = "XCCsec1"; name = "CC Shutter 1 Control"; - pixel_y = -24 + pixel_y = -24; + req_access = list("cent_general") }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -8874,8 +8840,7 @@ /area/centcom/testchamber) "ayj" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -8883,6 +8848,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/plasteel, /area/centcom/control) "ayk" = ( @@ -8936,10 +8902,13 @@ /area/centcom/ferry) "ayr" = ( /obj/machinery/door/airlock/centcom{ - name = "Briefing Room"; - req_access_txt = "101" + name = "Briefing Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/centcom/ferry) "ays" = ( @@ -9164,9 +9133,6 @@ /area/centcom/testchamber) "ayS" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "ayT" = ( @@ -9185,16 +9151,13 @@ /turf/open/floor/plasteel, /area/centcom/testchamber) "ayU" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ name = "CentCom" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/plasteel, /area/centcom/control) "ayV" = ( @@ -9391,7 +9354,7 @@ /obj/machinery/door/airlock/medical/glass{ name = "Infirmary" }, -/obj/effect/turf_decal/stripes/line, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/control) "azl" = ( @@ -9691,7 +9654,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/mecha/medical/odysseus, +/obj/mecha/medical/odysseus{ + internals_req_access = null; + operation_req_access = null + }, /turf/open/floor/engine, /area/centcom/testchamber) "azV" = ( @@ -10561,48 +10527,60 @@ /area/brazil) "aBM" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/plasteel, /area/centcom/evac) "aBN" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/item/storage/fancy/donut_box, /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; dir = 1; icon_state = "rightsecure"; - name = "CentCom Customs"; - req_access_txt = "109" + name = "CentCom Customs" }, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/all/admin/general{ + dir = 1 + }, /turf/open/floor/plasteel, /area/centcom/evac) "aBO" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/item/folder/red, /obj/item/pen/red, /obj/structure/window/reinforced{ dir = 1 }, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/plasteel, /area/centcom/evac) "aBP" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; dir = 1; icon_state = "rightsecure"; - name = "CentCom Customs"; - req_access_txt = "109" + name = "CentCom Customs" }, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/mapping_helpers/windoor/access/all/admin/general{ + dir = 1 + }, /turf/open/floor/plasteel, /area/centcom/evac) "aBQ" = ( @@ -11485,6 +11463,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/plasteel, /area/centcom/control) "aDr" = ( @@ -11499,6 +11478,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/plasteel/dark, /area/centcom/control) "aDs" = ( @@ -11510,22 +11490,32 @@ /area/centcom/control) "aDt" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/item/storage/fancy/donut_box, /obj/structure/window/reinforced{ dir = 4 }, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel, /area/centcom/control) "aDu" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/item/reagent_containers/food/drinks/britcup, /obj/structure/window/reinforced{ dir = 8 }, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plasteel, /area/centcom/control) "aDv" = ( @@ -11677,32 +11667,46 @@ /area/centcom/control) "aDH" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/item/folder/red, /obj/item/pen/red, /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; dir = 4; icon_state = "rightsecure"; - name = "CentCom Customs"; - req_access_txt = "109" + name = "CentCom Customs" }, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/mapping_helpers/windoor/access/all/admin/general{ + dir = 4 + }, /turf/open/floor/plasteel, /area/centcom/control) "aDI" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/item/folder/white, /obj/item/pen/blue, /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; dir = 8; icon_state = "rightsecure"; - name = "CentCom Customs"; - req_access_txt = "109" + name = "CentCom Customs" }, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/effect/mapping_helpers/windoor/access/all/admin/medical{ + dir = 8 + }, /turf/open/floor/plasteel, /area/centcom/control) "aDJ" = ( @@ -11719,9 +11723,10 @@ /area/centcom/control) "aDK" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Supply"; - req_access_txt = "106" + name = "CentCom Supply" }, +/obj/effect/mapping_helpers/airlock/access/all/admin/storage, +/obj/structure/fans/tiny, /turf/open/floor/plasteel/dark, /area/centcom/evac) "aDL" = ( @@ -11910,7 +11915,7 @@ /obj/machinery/door/airlock/centcom{ name = "Thunderdome Booth" }, -/obj/effect/turf_decal/stripes/line, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/control) "aEh" = ( @@ -11964,7 +11969,6 @@ /area/centcom/tdome/tdomeobserve) "aEq" = ( /obj/machinery/door/airlock/external, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aEr" = ( @@ -12063,10 +12067,8 @@ /area/centcom/tdome/tdomeobserve) "aEB" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) @@ -12175,9 +12177,14 @@ /area/centcom/tdome/tdomeobserve) "aEN" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/item/paper/pamphlet/centcom/visitor_info, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aEO" = ( @@ -12439,10 +12446,11 @@ /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; icon_state = "rightsecure"; - name = "Thunderdome Booth"; - req_access_txt = "109" + name = "Thunderdome Booth" }, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/windoor/access/all/admin/captain, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aFs" = ( @@ -12590,9 +12598,8 @@ /obj/machinery/door/airlock/centcom{ name = "Thunderdome Backstage" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aFL" = ( @@ -12896,8 +12903,6 @@ /turf/open/floor/plasteel/white, /area/centcom/tdome/tdomeobserve) "aGv" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aGw" = ( @@ -12906,10 +12911,10 @@ /area/centcom/tdome/tdomeobserve) "aGx" = ( /obj/machinery/door/airlock/centcom{ - name = "Thunderdome"; - req_access_txt = "101" + name = "Thunderdome" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aGy" = ( @@ -12939,7 +12944,7 @@ pixel_y = 32 }, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /turf/open/floor/plasteel/dark/side{ @@ -12981,7 +12986,9 @@ /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aGF" = ( -/obj/structure/closet/secure_closet/freezer/meat, +/obj/structure/closet/secure_closet/freezer/meat{ + req_access = list("cent_general") + }, /obj/item/reagent_containers/food/snacks/meat/rawbacon, /obj/item/reagent_containers/food/snacks/meat/rawbacon, /obj/item/reagent_containers/food/snacks/meat/rawbacon, @@ -13051,7 +13058,9 @@ /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aGI" = ( -/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/structure/closet/secure_closet/freezer/kitchen{ + req_access = list("cent_general") + }, /obj/item/reagent_containers/food/snacks/grown/banana, /obj/item/reagent_containers/food/snacks/grown/banana, /obj/item/reagent_containers/food/snacks/grown/wheat, @@ -13673,7 +13682,6 @@ /area/centcom/tdome/tdomeobserve) "aHK" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 @@ -13683,6 +13691,12 @@ }, /obj/item/reagent_containers/food/drinks/britcup, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aHM" = ( @@ -13727,8 +13741,13 @@ /area/centcom/tdome/tdomeobserve) "aHP" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aHQ" = ( @@ -13765,10 +13784,9 @@ /area/centcom/tdome/tdomeobserve) "aHS" = ( /obj/machinery/door/airlock/centcom{ - name = "Thunderdome Locker Room"; - req_access_txt = "101" + name = "Thunderdome Locker Room" }, -/obj/effect/turf_decal/stripes/line, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aHT" = ( @@ -13804,10 +13822,15 @@ /area/centcom/tdome/tdomeobserve) "aHV" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/item/storage/bag/tray, /obj/item/kitchen/fork, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aHW" = ( @@ -13871,12 +13894,17 @@ /area/centcom/tdome/tdomeobserve) "aIc" = ( /obj/structure/table/reinforced, -/obj/machinery/door/firedoor, /obj/structure/noticeboard{ dir = 1; pixel_y = -32 }, /obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aId" = ( @@ -14097,11 +14125,11 @@ /area/centcom/tdome/tdomeadmin) "aIx" = ( /obj/machinery/door/airlock/centcom{ - name = "Thunderdome Administration"; - req_access_txt = "102" + name = "Thunderdome Administration" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/admin/thunderdome, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeadmin) "aIy" = ( @@ -14274,8 +14302,9 @@ /turf/open/floor/plating, /area/centcom/tdome/tdomeadmin) "aIS" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeadmin) "aIT" = ( @@ -14757,12 +14786,13 @@ /turf/open/floor/pod/dark, /area/yogs/infiltrator_base) "aJX" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/machinery/door/airlock/centcom{ + name = "CentCom Medical Checkpoint" }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/admin/medical, /turf/open/floor/plasteel, -/area/centcom/tdome/tdomeadmin) +/area/centcom/control) "aJZ" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -14843,7 +14873,8 @@ dir = 8 }, /obj/mecha/combat/marauder/mauler{ - internals_req_access = list(303,302) + internals_req_access = null; + operation_req_access = null }, /obj/item/card/id/syndicate, /turf/open/floor/engine, @@ -14854,30 +14885,21 @@ }, /area/centcom/tdome/tdomeadmin) "aKh" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ - name = "Thunderdome Administration"; - req_access_txt = "102" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 + name = "Thunderdome Administration" }, +/obj/effect/mapping_helpers/airlock/access/all/admin/thunderdome, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeadmin) "aKi" = ( /obj/machinery/door/airlock/external/glass{ - name = "E.V.A. Equipment"; - req_access_txt = "150" + name = "E.V.A. Equipment" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/yogs/infiltrator_base/jail) "aKj" = ( @@ -14885,6 +14907,7 @@ name = "Backup Emergency Escape Shuttle" }, /obj/effect/turf_decal/delivery, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeadmin) "aKk" = ( @@ -15061,7 +15084,7 @@ /obj/machinery/button/door/indestructible{ id = "thunderdomehea"; name = "Heavy Supply Control"; - req_access_txt = "102" + req_access = list("cent_thunder") }, /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/neutral{ @@ -15080,7 +15103,7 @@ /obj/machinery/button/door/indestructible{ id = "thunderdome"; name = "Main Blast Doors Control"; - req_access_txt = "102" + req_access = list("cent_thunder") }, /obj/structure/table/reinforced, /obj/machinery/light, @@ -15100,7 +15123,7 @@ /obj/machinery/button/door/indestructible{ id = "thunderdomegen"; name = "General Supply Control"; - req_access_txt = "102" + req_access = list("cent_thunder") }, /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/neutral{ @@ -15268,21 +15291,11 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/rack, -/obj/item/gun/ballistic/automatic/pistol{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/gun/ballistic/automatic/pistol{ - pixel_y = 1 - }, /obj/item/gun/ballistic/automatic/pistol{ pixel_x = -3; - pixel_y = 4 - }, -/obj/item/gun/ballistic/automatic/pistol{ - pixel_x = 2; - pixel_y = -3 + pixel_y = 3 }, +/obj/item/gun/ballistic/automatic/pistol, /turf/open/floor/pod/light, /area/yogs/infiltrator_base) "aKO" = ( @@ -15300,12 +15313,14 @@ /area/centcom/evac) "aKS" = ( /obj/machinery/door/window/northright{ - name = "Security Desk"; - req_access_txt = "103" + name = "Security Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/windoor/access/all/security/general{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium/red, /area/centcom/evac) "aKT" = ( @@ -15347,16 +15362,15 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/machinery/airalarm{ +/obj/machinery/airalarm/syndicate{ dir = 8; - pixel_x = 24; - req_access = 150 + pixel_x = 24 }, -/obj/machinery/turretid{ +/obj/machinery/turretid/syndicate{ icon_state = "control_kill"; lethal = 1; - pixel_y = 28; - req_access = 150 + locked = 1; + pixel_y = 28 }, /turf/open/floor/plasteel/dark/side{ dir = 5 @@ -15413,7 +15427,7 @@ "aLg" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /obj/effect/turf_decal/tile/red{ @@ -15472,7 +15486,9 @@ /area/yogs/infiltrator_base) "aLx" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/plasteel/freezer, +/turf/open/floor/plasteel/freezer{ + dir = 2 + }, /area/yogs/infiltrator_base) "aLz" = ( /obj/effect/turf_decal/stripes/corner, @@ -16033,7 +16049,8 @@ dir = 8 }, /obj/mecha/combat/marauder/seraph{ - internals_req_access = list(303,302) + internals_req_access = null; + operation_req_access = null }, /obj/item/card/id/centcom, /turf/open/floor/engine, @@ -16077,13 +16094,13 @@ /area/centcom/testchamber) "aNk" = ( /obj/machinery/door/airlock/centcom{ - name = "Thunderdome"; - req_access_txt = "101" + name = "Thunderdome" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aNl" = ( @@ -16258,13 +16275,12 @@ /area/centcom/fabric_of_reality) "aNG" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security Checkpoint" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/plasteel, /area/centcom/control) "aNH" = ( @@ -16378,10 +16394,10 @@ /obj/machinery/door/airlock/centcom{ name = "CentCom" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/plasteel, /area/centcom/control) "aNV" = ( @@ -16505,9 +16521,8 @@ /turf/open/floor/plasteel, /area/centcom/testchamber) "aOh" = ( -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = 150 +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/structure/bed, /obj/item/bedsheet/black, @@ -16518,16 +16533,14 @@ /turf/open/floor/bluespace, /area/centcom/testchamber) "aOj" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ - name = "CentCom" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/control) "aOk" = ( @@ -16626,7 +16639,8 @@ dir = 8 }, /obj/mecha/combat/gygax/dark{ - internals_req_access = list(303,302) + internals_req_access = null; + operation_req_access = null }, /obj/item/card/id/syndicate, /turf/open/floor/engine, @@ -16742,7 +16756,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/mecha/combat/gygax, +/obj/mecha/combat/gygax{ + internals_req_access = null; + operation_req_access = null + }, /turf/open/floor/engine, /area/centcom/testchamber) "aOJ" = ( @@ -16755,7 +16772,9 @@ /obj/item/storage/crayons, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/freezer, +/turf/open/floor/plasteel/freezer{ + dir = 2 + }, /area/yogs/infiltrator_base) "aOK" = ( /obj/machinery/door/airlock/external{ @@ -16928,9 +16947,8 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 9 }, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = 150 +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -17119,15 +17137,7 @@ /obj/item/suppressor{ pixel_y = 8 }, -/obj/item/suppressor{ - pixel_y = -3 - }, -/obj/item/suppressor{ - pixel_y = 2 - }, -/obj/item/suppressor{ - pixel_y = 13 - }, +/obj/item/suppressor, /turf/open/floor/pod/light, /area/yogs/infiltrator_base) "aPG" = ( @@ -17237,10 +17247,10 @@ /turf/open/floor/plasteel, /area/centcom/supplypod/loading/three) "aPX" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ - dir = 1 + dir = 4 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "aPY" = ( @@ -17648,23 +17658,16 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/item/radio/headset/syndicate/alt{ - pixel_y = 5 - }, -/obj/item/radio/headset/syndicate/alt{ - pixel_x = 1; - pixel_y = -5 - }, -/obj/item/radio/headset/syndicate/alt{ - pixel_x = 10; - pixel_y = 6 + pixel_x = -3; + pixel_y = 3 }, /obj/item/radio/headset/syndicate/alt{ - pixel_x = 10; - pixel_y = -5 - }, -/obj/item/multitool{ - pixel_x = -6 + pixel_x = -3; + pixel_y = 3 }, +/obj/item/radio/headset/syndicate/alt, +/obj/item/radio/headset/syndicate/alt, +/obj/item/multitool, /turf/open/floor/mineral/plastitanium, /area/yogs/infiltrator_base) "aRa" = ( @@ -17740,7 +17743,8 @@ dir = 8 }, /obj/mecha/combat/marauder{ - internals_req_access = list(303,302) + internals_req_access = null; + operation_req_access = null }, /obj/item/card/id/centcom, /turf/open/floor/engine, @@ -17781,9 +17785,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = list(150) +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /turf/open/floor/plasteel, /area/yogs/infiltrator_base/jail) @@ -18301,8 +18304,7 @@ "aSG" = ( /obj/structure/table, /obj/machinery/microwave{ - pixel_x = -3; - pixel_y = 6 + pixel_y = 8 }, /turf/open/floor/plasteel/cafeteria, /area/centcom/holding) @@ -18413,6 +18415,7 @@ pixel_y = -2 }, /obj/item/toy/cards/deck/syndicate{ + icon_state = "deck_syndicate_full"; pixel_x = -6; pixel_y = 6 }, @@ -18960,11 +18963,11 @@ /area/centcom/holding) "aUn" = ( /obj/machinery/door/airlock/centcom{ - name = "Thunderdome"; - req_access_txt = "101" + name = "Thunderdome" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeobserve) "aUo" = ( @@ -19180,8 +19183,7 @@ /area/centcom/evac) "aUO" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -19189,6 +19191,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/plasteel, /area/centcom/control) "aUR" = ( @@ -19455,7 +19458,9 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/freezer, +/turf/open/floor/plasteel/freezer{ + dir = 2 + }, /area/yogs/infiltrator_base) "aVC" = ( /obj/effect/turf_decal/tile/neutral{ @@ -19639,22 +19644,19 @@ /area/centcom/testchamber) "aWc" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 + name = "CentCom Security" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/evac) "aWf" = ( -/obj/machinery/airalarm{ +/obj/machinery/airalarm/syndicate{ dir = 4; - pixel_x = -24; - req_access = list(150) + pixel_x = -24 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -19886,13 +19888,13 @@ /area/centcom/testchamber) "aWJ" = ( /obj/machinery/door/airlock/centcom{ - name = "Thunderdome Administration"; - req_access_txt = "102" + name = "Thunderdome Administration" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/thunderdome, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/centcom/tdome/tdomeadmin) "aWK" = ( @@ -19936,25 +19938,27 @@ /area/centcom/testchamber) "aWP" = ( /obj/machinery/door/airlock/titanium{ - name = "Cockpit"; - req_access_txt = "109" + name = "Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command, /turf/open/floor/mineral/titanium, /area/centcom/evac) "aWQ" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security" }, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ dir = 8 }, /turf/open/floor/plasteel, @@ -20018,18 +20022,12 @@ /area/yogs/infiltrator_base/jail) "aWY" = ( /obj/machinery/door/airlock/external/glass{ - name = "E.V.A. Equipment"; - req_access_txt = "150" + name = "E.V.A. Equipment" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "aWZ" = ( @@ -20182,11 +20180,10 @@ /area/centcom/supplypod/loading/one) "aXt" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security Checkpoint" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/plasteel, /area/centcom/control) "aXu" = ( @@ -20211,8 +20208,7 @@ id = "testvent"; name = "Testing Chamber Vent Control"; pixel_x = -25; - pixel_y = 5; - req_access_txt = "7" + pixel_y = 5 }, /obj/machinery/button/ignition{ id = "mixingsparker"; @@ -20429,7 +20425,8 @@ dir = 8 }, /obj/mecha/combat/reticence{ - internals_req_access = list(303,302) + internals_req_access = null; + operation_req_access = null }, /turf/open/floor/engine, /area/centcom/testchamber) @@ -20628,10 +20625,8 @@ /area/centcom/testchamber) "aYt" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, @@ -20668,9 +20663,9 @@ /area/centcom/testchamber) "aYA" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Supply"; - req_access_txt = "106" + name = "CentCom Supply" }, +/obj/effect/mapping_helpers/airlock/access/all/admin/storage, /turf/open/floor/plasteel, /area/centcom/supplypod) "aYC" = ( @@ -20872,9 +20867,10 @@ /obj/effect/turf_decal/bot_white, /obj/machinery/door/airlock/centcom{ name = "Equipment Room"; - req_access_txt = "150" + opacity = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/pod/dark, /area/yogs/infiltrator_base) "aZk" = ( @@ -20889,7 +20885,8 @@ dir = 8 }, /obj/mecha/combat/honker{ - internals_req_access = list(303,302) + internals_req_access = null; + operation_req_access = null }, /turf/open/floor/engine, /area/centcom/testchamber) @@ -20942,13 +20939,14 @@ "aZt" = ( /obj/machinery/washing_machine, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/freezer, +/turf/open/floor/plasteel/freezer{ + dir = 2 + }, /area/yogs/infiltrator_base) "aZu" = ( /obj/structure/chair/stool, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = list(150) +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/effect/landmark/start/infiltrator, /obj/effect/turf_decal/tile/bar, @@ -21109,8 +21107,7 @@ /area/centcom/testchamber) "aZJ" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -21118,6 +21115,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/plasteel, /area/centcom/evac) "aZL" = ( @@ -21206,13 +21204,12 @@ /area/centcom/holding) "aZX" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security" }, -/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/admin/storage, /turf/open/floor/plasteel, /area/centcom/supply) "aZY" = ( @@ -21315,10 +21312,25 @@ }, /turf/open/floor/engine, /area/centcom/syndicate_mothership) +"buB" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/centcom/supplypod) "bwc" = ( /obj/machinery/vending/medical, /turf/open/floor/plasteel/bluespace, /area/centcom) +"bwt" = ( +/obj/machinery/door/poddoor/shutters{ + id = "XCCsec3"; + name = "XCC Checkpoint 3 Shutters" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/control) "bwX" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/trimline/secred/filled/corner/lower, @@ -21335,6 +21347,16 @@ /obj/machinery/vending/robotics, /turf/open/floor/plasteel/bluespace, /area/centcom) +"bCI" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/plasteel, +/area/centcom/evac) "bDC" = ( /obj/machinery/cryopod{ dir = 4 @@ -21367,6 +21389,14 @@ }, /turf/open/floor/engine, /area/centcom/syndicate_mothership) +"bPd" = ( +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/turf/open/floor/plasteel, +/area/centcom/control) "bQp" = ( /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/lavendergrass, @@ -21425,7 +21455,7 @@ /area/centcom) "bVV" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = list(150) + req_access = list("syndicate") }, /obj/item/storage/box/donkpockets{ pixel_x = 2 @@ -21443,6 +21473,11 @@ /obj/effect/spawner/lootdrop/donkpockets, /turf/open/floor/plasteel/cafeteria, /area/centcom/syndicate_mothership) +"bXd" = ( +/turf/open/floor/plasteel{ + heat_capacity = 1e+006 + }, +/area/centcom/tdome/tdomeobserve) "bYz" = ( /obj/structure/railing/corner{ dir = 4 @@ -21470,6 +21505,14 @@ icon_state = "info29" }, /area/centcom/testchamber) +"cuz" = ( +/obj/machinery/door/airlock/centcom{ + name = "Thunderdome" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/plasteel, +/area/centcom/tdome/tdomeobserve) "cAw" = ( /obj/machinery/vending/snack, /turf/open/floor/plasteel/bluespace, @@ -21544,14 +21587,12 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = 150 +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/structure/table, /obj/item/storage/toolbox/syndicate, /obj/item/flashlight, -/obj/item/storage/firstaid/regular, /turf/open/floor/mineral/plastitanium, /area/yogs/infiltrator_base) "dgH" = ( @@ -21563,6 +21604,18 @@ /obj/machinery/vending/coffee, /turf/open/floor/plasteel/bluespace, /area/centcom) +"dth" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/centcom/evac) "dwq" = ( /turf/open/indestructible/wiki/info{ icon_state = "info18" @@ -21620,9 +21673,9 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/trimline/secred/filled/end/lower, /obj/machinery/door/airlock/centcom{ - name = "Strike Team Dispatch Bay"; - req_access_txt = "150" + name = "Strike Team Dispatch Bay" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/centcom/syndicate_mothership) "eeI" = ( @@ -21806,13 +21859,28 @@ /obj/machinery/vending/wardrobe, /turf/open/floor/plasteel/bluespace, /area/centcom) +"ggU" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/plasteel, +/area/centcom/control) "gkW" = ( /obj/item/kirbyplants/photosynthetic, /turf/open/floor/wood, /area/centcom/holding) +"gqR" = ( +/obj/machinery/door/poddoor/shutters{ + id = "XCCsec3"; + name = "CC Main Access Shutters" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/control) "gxx" = ( -/obj/machinery/light/small, -/obj/effect/decal/cleanable/dirt, /obj/structure/sink{ dir = 4; pixel_x = 11 @@ -21820,7 +21888,11 @@ /obj/structure/mirror{ pixel_x = 28 }, -/turf/open/floor/plasteel/freezer, +/obj/machinery/light/small, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/freezer{ + dir = 2 + }, /area/yogs/infiltrator_base) "gCx" = ( /obj/effect/landmark/wiki, @@ -21868,26 +21940,35 @@ /area/centcom/testchamber) "gUH" = ( /obj/machinery/door/airlock/centcom{ - name = "Hangar Maintenance"; - req_access_txt = "150" + name = "Hangar Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/centcom/syndicate_mothership) "hcE" = ( /obj/machinery/door/airlock/centcom{ - name = "Ready Room"; - req_access_txt = "150" + name = "Ready Room" }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/trimline/secred/filled/end/lower{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/centcom/syndicate_mothership/control) "hgl" = ( /obj/machinery/vending/wardrobe/sec_wardrobe, /turf/open/floor/plasteel/bluespace, /area/centcom) +"hhx" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/centcom/control) "hog" = ( /obj/effect/turf_decal/stripes/end{ dir = 4 @@ -21961,6 +22042,33 @@ }, /turf/open/floor/plasteel, /area/centcom/testchamber) +"hJE" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/control) +"hSa" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/plasteel/dark, +/area/centcom/control) "hUh" = ( /obj/machinery/vending/sovietsoda, /turf/open/floor/plasteel/bluespace, @@ -21988,9 +22096,13 @@ /area/centcom/testchamber) "ilE" = ( /obj/machinery/door/airlock/centcom{ - name = "Thunderdome Administration"; - req_access_txt = "102" + name = "Thunderdome Administration" }, +/obj/effect/mapping_helpers/airlock/access/all/admin/thunderdome, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/fans/tiny, /turf/open/floor/plasteel/dark, /area/centcom/tdome/tdomeadmin) "ipF" = ( @@ -22008,17 +22120,32 @@ }, /turf/closed/indestructible/opsglass, /area/centcom/syndicate_mothership/control) +"itu" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/plasteel, +/area/centcom/control) "iuu" = ( /obj/machinery/door/airlock/centcom{ - name = "Commander's Quarters"; - req_access_txt = "151" + name = "Commander's Quarters" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/leader, /turf/open/floor/wood, /area/centcom/syndicate_mothership/control) "iuX" = ( /obj/machinery/vending/wardrobe/jani_wardrobe, /turf/open/floor/plasteel/bluespace, /area/centcom) +"ivD" = ( +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/turf/open/floor/plasteel, +/area/centcom/control) "iCm" = ( /turf/open/indestructible/wiki/info{ icon_state = "info19" @@ -22035,6 +22162,23 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/syndicate_mothership) +"iJz" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/plasteel, +/area/centcom/control) +"iOU" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/control) "iSo" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -22063,6 +22207,16 @@ /obj/machinery/vending/plasmaresearch, /turf/open/floor/plasteel/bluespace, /area/centcom) +"jBX" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Medical Checkpoint" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/medical, +/turf/open/floor/plasteel, +/area/centcom/control) "jFI" = ( /obj/structure/railing{ dir = 4 @@ -22203,6 +22357,22 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/syndicate_mothership/control) +"kyK" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/centcom/ferry) "kBy" = ( /obj/machinery/vending/wardrobe/atmos_wardrobe, /turf/open/floor/plasteel/bluespace, @@ -22226,6 +22396,15 @@ icon_state = "info28" }, /area/centcom/testchamber) +"kUZ" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/centcom/control) "kWx" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -22264,6 +22443,16 @@ /obj/item/flashlight/lantern, /turf/open/indestructible/brazil/lostit, /area/brazil) +"lSB" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/plasteel, +/area/centcom/control) "lSY" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/trimline/secred/filled/corner/lower, @@ -22352,6 +22541,14 @@ }, /turf/open/floor/engine, /area/centcom/syndicate_mothership) +"mzp" = ( +/obj/machinery/door/poddoor/shutters{ + id = "XCCcustoms1"; + name = "XCC Customs 1 Shutters" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/evac) "mzy" = ( /obj/structure/bed, /obj/item/bedsheet/prisoner{ @@ -22369,8 +22566,7 @@ /area/centcom/syndicate_mothership/control) "mFl" = ( /obj/machinery/door/airlock/centcom{ - name = "Holding Cells"; - req_access_txt = "150" + name = "Holding Cells" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 @@ -22378,6 +22574,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/centcom/syndicate_mothership) "mFt" = ( @@ -22425,6 +22622,14 @@ icon_state = "title2" }, /area/centcom/testchamber) +"ncM" = ( +/obj/machinery/door/poddoor/shutters{ + id = "nukie_leader_dorm_windows" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/control) "nfW" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light/small{ @@ -22433,9 +22638,11 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ + dir = 2; pixel_y = 24 }, -/obj/machinery/recharge_station/fullupgrade, +/obj/structure/table, +/obj/item/storage/firstaid/regular, /turf/open/floor/mineral/plastitanium, /area/yogs/infiltrator_base) "ngw" = ( @@ -22483,6 +22690,13 @@ /obj/machinery/vending/cart, /turf/open/floor/plasteel/bluespace, /area/centcom) +"nAO" = ( +/obj/machinery/door/airlock/centcom{ + name = "Thunderdome Administration" + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/thunderdome, +/turf/open/floor/plasteel, +/area/centcom/tdome/tdomeadmin) "nDx" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/plasteel/dark, @@ -22499,6 +22713,18 @@ icon_state = "title8" }, /area/centcom/testchamber) +"nNw" = ( +/obj/structure/table/reinforced, +/obj/item/paper/pamphlet/centcom/visitor_info, +/obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/centcom/tdome/tdomeobserve) "nNJ" = ( /turf/open/indestructible/wiki/info{ icon_state = "info8" @@ -22506,12 +22732,12 @@ /area/centcom/testchamber) "nVx" = ( /obj/machinery/door/airlock/centcom{ - name = "Equipment Room"; - req_access_txt = "150" + name = "Equipment Room" }, /obj/effect/turf_decal/trimline/secred/filled/end/lower{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/centcom/syndicate_mothership/control) "nVy" = ( @@ -22582,6 +22808,10 @@ }, /turf/open/floor/engine, /area/centcom/syndicate_mothership) +"oxc" = ( +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/control) "oxS" = ( /obj/item/clothing/shoes/combat/coldres{ pixel_x = 6; @@ -22658,6 +22888,10 @@ }, /turf/open/floor/engine, /area/centcom/syndicate_mothership) +"paa" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/centcom/tdome/tdomeadmin) "pfQ" = ( /obj/effect/decal/fakelattice{ color = "#808080" @@ -22669,6 +22903,14 @@ color = "#808080" }, /area/centcom/syndicate_mothership) +"pjW" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/poddoor/shutters{ + id = "XCCcustoms2"; + name = "XCC Customs 2 Shutters" + }, +/turf/open/floor/plasteel, +/area/centcom/control) "poJ" = ( /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 4 @@ -22826,10 +23068,10 @@ /area/centcom/testchamber) "rmm" = ( /obj/machinery/door/airlock/centcom{ - name = "Exhibit Access"; - req_access_txt = "" + name = "Exhibit Access" }, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/plating, /area/centcom/syndicate_mothership) "rod" = ( @@ -22846,10 +23088,10 @@ dir = 4 }, /obj/machinery/door/airlock/centcom{ - name = "Atmos Room"; - req_access_txt = "150" + name = "Atmos Room" }, /obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/yogs/infiltrator_base) "rxZ" = ( @@ -22928,10 +23170,37 @@ icon_state = "title9" }, /area/centcom/testchamber) +"sqU" = ( +/obj/machinery/door/poddoor/shutters{ + id = "XCCsecdepartment"; + name = "XCC Security Checkpoint Shutters" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/control) "sqW" = ( /obj/machinery/vending/boozeomat, /turf/open/floor/plasteel/bluespace, /area/centcom) +"szv" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/centcom{ + armor = list("melee" = 90, "bullet" = 90, "laser" = 90, "energy" = 90, "bomb" = 90, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 90); + name = "Test Chamber Blast Doors" + }, +/turf/open/floor/plasteel/bluespace, +/area/centcom/testchamber) "sNZ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -22966,10 +23235,10 @@ /area/centcom/syndicate_mothership) "tna" = ( /obj/machinery/door/airlock/external/glass{ - name = "Assault Pod Launcher Access"; - req_access_txt = "150" + name = "Assault Pod Launcher Access" }, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/centcom/syndicate_mothership/control) "tnm" = ( @@ -22999,9 +23268,9 @@ "tKR" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/door/airlock/centcom{ - name = "Temporary Holding Cell"; - req_access_txt = "150" + name = "Temporary Holding Cell" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/centcom/syndicate_mothership) "tLI" = ( @@ -23012,11 +23281,27 @@ /obj/item/flashlight/lantern, /turf/open/indestructible/brazil/narsie, /area/brazil) +"tSh" = ( +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/turf/open/floor/plasteel, +/area/centcom/control) "tVg" = ( /turf/open/indestructible/wiki/info{ icon_state = "256" }, /area/centcom/testchamber) +"tWG" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/medical, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/control) "uav" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/plasteel/dark, @@ -23035,10 +23320,23 @@ /obj/structure/mecha_wreckage/seraph, /turf/open/floor/plating/asteroid/snow/temperatre, /area/centcom/syndicate_mothership) +"ukj" = ( +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plasteel/dark, +/area/centcom/supplypod) "una" = ( /obj/machinery/vending/wardrobe/science_wardrobe, /turf/open/floor/plasteel/bluespace, /area/centcom) +"usR" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/centcom/control) "uwR" = ( /obj/structure/window/reinforced{ dir = 8 @@ -23048,7 +23346,9 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/freezer, +/turf/open/floor/plasteel/freezer{ + dir = 2 + }, /area/yogs/infiltrator_base) "uDo" = ( /obj/item/storage/firstaid/toxin, @@ -23108,7 +23408,7 @@ /area/centcom/tdome/tdomeobserve) "uRI" = ( /obj/structure/closet/secure_closet/freezer/fridge{ - req_access = list(150) + req_access = list("syndicate") }, /obj/item/kitchen/knife/butcher, /obj/item/clothing/suit/apron/chef, @@ -23140,7 +23440,7 @@ /obj/machinery/button/door{ id = "nukie_leader_dorm_windows"; name = "Window Shutters"; - req_access_txt = "151" + req_access = list("syndicate_leader") }, /turf/open/floor/wood, /area/centcom/syndicate_mothership/control) @@ -23219,6 +23519,21 @@ /obj/machinery/vending/wardrobe/medi_wardrobe, /turf/open/floor/plasteel/bluespace, /area/centcom) +"vPo" = ( +/obj/structure/table/reinforced, +/obj/structure/noticeboard{ + dir = 1; + pixel_y = -32 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/centcom/tdome/tdomeobserve) "vPD" = ( /obj/machinery/vending/security, /turf/open/floor/plasteel/bluespace, @@ -23234,9 +23549,9 @@ "vVe" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/door/airlock/public/glass{ - name = "Kitchen"; - req_access_txt = "150" + name = "Kitchen" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/centcom/syndicate_mothership) "vYx" = ( @@ -23253,6 +23568,19 @@ icon_state = "info15" }, /area/centcom/testchamber) +"vYQ" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/turf/open/floor/plasteel, +/area/centcom/evac) "wbL" = ( /obj/machinery/vending/wardrobe/chap_wardrobe, /turf/open/floor/plasteel/bluespace, @@ -23336,6 +23664,14 @@ /obj/machinery/light, /turf/open/floor/mineral/plastitanium/red, /area/centcom/syndicate_mothership/control) +"wNE" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom" + }, +/obj/effect/mapping_helpers/airlock/access/all/admin/general, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/control) "wPo" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -23356,17 +23692,18 @@ /area/centcom/syndicate_mothership) "xfK" = ( /obj/machinery/door/airlock/centcom{ - name = "Storage"; - req_access_txt = "150" + name = "Storage" }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/centcom/syndicate_mothership/control) "xgw" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, /obj/machinery/defibrillator_mount/loaded{ pixel_y = 28 }, @@ -23375,32 +23712,35 @@ layer = 2.9 }, /obj/item/clothing/mask/gas/syndicate{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/clothing/mask/gas/syndicate{ - pixel_x = -4; - pixel_y = -8 + pixel_x = -3; + pixel_y = 3 }, /obj/item/clothing/mask/gas/syndicate{ - pixel_x = 9; - pixel_y = 4 + pixel_x = -3; + pixel_y = 3 }, /obj/item/clothing/mask/gas/syndicate{ - pixel_x = 9; - pixel_y = -8 + pixel_x = 1; + pixel_y = -1 }, /obj/effect/turf_decal/stripes/line{ dir = 10 }, /turf/open/floor/mineral/plastitanium, /area/yogs/infiltrator_base) +"xhp" = ( +/obj/machinery/door/poddoor/shutters{ + id = "XCCsec1"; + name = "XCC Checkpoint 1 Shutters" + }, +/turf/open/floor/plasteel, +/area/centcom/control) "xhO" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/door/airlock/public/glass{ - name = "Canteen"; - req_access_txt = "150" + name = "Canteen" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/centcom/syndicate_mothership) "xia" = ( @@ -23450,10 +23790,26 @@ }, /turf/open/floor/engine/cult, /area/centcom/wizard_station) +"xxx" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/centcom/control) "xzH" = ( /obj/machinery/light/floor, /turf/open/floor/engine, /area/centcom/syndicate_mothership) +"xAh" = ( +/obj/machinery/door/airlock/centcom{ + name = "Thunderdome Backstage" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/centcom/tdome/tdomeobserve) "xGe" = ( /turf/open/indestructible/wiki/info{ icon_state = "info31" @@ -23486,6 +23842,7 @@ /area/centcom/ctf) "yal" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, /obj/item/reagent_containers/food/snacks/chocolatebar{ pixel_x = -3; @@ -23524,7 +23881,9 @@ /obj/machinery/door/window{ name = "Shower Door" }, -/turf/open/floor/plasteel/freezer, +/turf/open/floor/plasteel/freezer{ + dir = 2 + }, /area/yogs/infiltrator_base) (1,1,1) = {" @@ -59649,9 +60008,9 @@ atu amD amD amD -awu +kyK axh -awu +kyK amD amD arz @@ -62249,14 +62608,14 @@ aHI aEp aHZ aIh -aGv +bXd aIx -aIS +paa aJe aJo aIS aWJ -aIS +aJG aJG aJG aIv @@ -62506,14 +62865,14 @@ aGc aHS aFI aFL -aGv +bXd aIx -aIS +paa aJf aJp aIS aWJ -aIS +aJG aJG aJG aIv @@ -63287,8 +63646,8 @@ aIz aIv aIv aIv -aJX -aJX +aJG +aJG aIv aaa aaa @@ -64262,7 +64621,7 @@ amg aiR alo amg -alJ +abk amg aiR aiY @@ -64788,11 +65147,11 @@ aiF arK amQ aio +xhp avG +xhp avG -avG -avG -avG +xhp aio arK amQ @@ -64830,7 +65189,7 @@ aIv aIv aIv aIv -aKh +nAO aIv aIv aXC @@ -64840,7 +65199,7 @@ aNt aNt aWx aNt -aPD +szv aNt aPD aNt @@ -65307,7 +65666,7 @@ atK axl axT ays -amR +aiS azF aAm atP @@ -65322,7 +65681,7 @@ aio aEp aEK aEp -aFK +xAh aEp aEp aEp @@ -65529,7 +65888,7 @@ aaa aaa aaa aiF -aiS +aoN aiZ ajf ajq @@ -65564,7 +65923,7 @@ anp anq anq anq -amR +aiS anq azF aXt @@ -65822,8 +66181,8 @@ aiu aiu aiu ain -atL -atL +xxx +xxx aio aiu aio @@ -66091,7 +66450,7 @@ aDH aiu ain aEv -aEN +nNw aEv aFL aFI @@ -66827,7 +67186,7 @@ aaa aaa aaa alr -alM +ncM alr amN anq @@ -66838,8 +67197,8 @@ aoQ anq anq aqt -aqT -arI +ggU +bwt aNU atM anq @@ -66853,8 +67212,8 @@ aiu anq anq aqT -aBE -aNU +gqR +usR awH anq anp @@ -67869,8 +68228,8 @@ aiu aio aiu aio -atL -atL +xxx +xxx aiu aiu awC @@ -68117,9 +68476,9 @@ ail amQ aio anM +sqU anM -anM -anM +sqU anM aio amQ @@ -68134,12 +68493,12 @@ anp anq anq anq -amR +aiS anq azG -aXt +aJX aut -aNG +jBX aiC aiC aiC @@ -68374,9 +68733,9 @@ ail ain aim aiu -aOj +iJz amk -aOj +iJz aiu aio aio @@ -68391,7 +68750,7 @@ atN axo axo ayy -amR +aiS azG aAp aAT @@ -68406,7 +68765,7 @@ aio aEp aEK aEp -aFK +xAh aEp aEp aEp @@ -68627,8 +68986,8 @@ aiT akS als aiC -akZ -amR +alT +aiC akW aiL aiT @@ -68644,9 +69003,9 @@ atP aUO aio aim -ayU +hhx amk -ayU +hhx aim aio aiu @@ -68669,7 +69028,7 @@ aEp aGQ aHf aHu -aGx +cuz aGM aHW aHW @@ -68884,8 +69243,8 @@ aiU aiU alt aiC -akZ -amR +alT +aiC aiC aiK aiU @@ -68901,9 +69260,9 @@ aiu aut aio avP +pjW avP -avP -avP +pjW avP aio arK @@ -68929,7 +69288,7 @@ aHv aGy aHP aHP -aIc +vPo aEp aEp aMh @@ -69128,7 +69487,7 @@ aiu aiu aim aiu -aja +bPd aiu aiu ajw @@ -69136,14 +69495,14 @@ aiC ajG aiu aiu -aja +tSh aiu aim aiu aiu aio aiu -aja +wNE aiu aiu aiu @@ -69158,9 +69517,9 @@ aim ayj aio aim -aOj +kUZ amk -aOj +kUZ aim aio aiu @@ -69170,7 +69529,7 @@ aim aio aio aio -alT +tWG aio aio aio @@ -70156,7 +70515,7 @@ aiu aiu aim aiu -aja +bPd aiu aiu ajw @@ -70164,14 +70523,14 @@ aiC ajG aiu aiu -aja +itu aiu aim aiu aiu aio aiu -aja +oxc aiu aiu aiu @@ -70199,7 +70558,7 @@ aio aiu aio aoc -akZ +iOU aiC aiC aEB @@ -70427,8 +70786,8 @@ aiT als aiC akZ -amR aiC +hSa aiL aiT aiT @@ -70483,8 +70842,8 @@ aMi aIv aIv aIv -aJX -aJX +aJG +aJG aIv aaa aaa @@ -70684,7 +71043,7 @@ akV alt aiC akZ -amR +aiC ans aiK aiU @@ -71214,19 +71573,19 @@ atR aqx aio aim -ayU +hhx amk -ayU +hhx aim aio aio aio -aUO +lSB aio aio aiu aio -aUO +hJE aio aNO aNO @@ -71244,14 +71603,14 @@ aGc aHS aFP aFL -aGv +bXd aIx -aIS +paa aJe aJo aIS aWJ -aIS +aJG aJG aJG aIv @@ -71471,9 +71830,9 @@ aqV auz aqx avU +mzp avU -avU -avU +mzp avU aqx azL @@ -71501,14 +71860,14 @@ aHR aEp aIg aIr -aGv +bXd aIx -aIS +paa aJf aJp aIS aWJ -aIS +aJG aJG aJG aIv @@ -71723,19 +72082,19 @@ aio aqx aqx aqx -aWc +vYQ aqx aqx aqx arS -awJ +dth axr awJ arS aqx aqx aqx -aWc +bCI aqx aqx aqx @@ -71968,7 +72327,7 @@ akz akX alw akl -akZ +alT aiC akm akm @@ -72002,10 +72361,10 @@ aYn aPz aSu aNO -aNO +ukj aPV aPV -aNO +buB aNO aNO aUw @@ -72477,11 +72836,11 @@ aaa aaa aio aio -aja +bPd aio aio aio -aja +bPd aio aio aio @@ -72993,7 +73352,7 @@ aio aka akm akm -akZ +alT aiC aiC amm @@ -74284,7 +74643,7 @@ akm akm akm akl -akZ +ivD aiC akm akm @@ -75563,7 +75922,7 @@ aio aka akm akm -akZ +alT aiC alV alW diff --git a/_maps/map_files/mining/Jungleland.dmm b/_maps/map_files/mining/Jungleland.dmm index 9a51679d7797..736ee9ac5cd1 100644 --- a/_maps/map_files/mining/Jungleland.dmm +++ b/_maps/map_files/mining/Jungleland.dmm @@ -48,9 +48,6 @@ }, /turf/open/floor/plasteel, /area/mine/laborcamp) -"be" = ( -/turf/open/floor/plating/dirt/jungleland/deep_sand, -/area/jungleland/explored) "bi" = ( /obj/machinery/conveyor{ dir = 10; @@ -237,8 +234,7 @@ /area/jungleland/explored) "gh" = ( /obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Shuttle Security Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Security Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -246,6 +242,10 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/mine/laborcamp/security) "gv" = ( @@ -295,8 +295,7 @@ /area/mine/laborcamp) "hB" = ( /obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Shuttle Security Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Security Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -304,6 +303,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, /turf/open/floor/plasteel, /area/mine/laborcamp) "hD" = ( @@ -378,8 +380,7 @@ /area/mine/laborcamp) "kD" = ( /obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Shuttle Security Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Security Airlock" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -393,6 +394,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/mine/laborcamp/security) "lh" = ( @@ -488,7 +490,7 @@ id = "labor"; name = "Labor Camp Lockdown"; pixel_y = 28; - req_access_txt = "2" + req_access = list("brig") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 @@ -537,10 +539,6 @@ }, /turf/open/floor/plasteel/freezer, /area/mine/laborcamp) -"pA" = ( -/obj/structure/flora/tree/jungle, -/turf/open/floor/plating/dirt/jungleland/deep_sand, -/area/jungleland/explored) "pQ" = ( /obj/structure/chair/stool, /obj/structure/sign/poster/official/obey{ @@ -700,14 +698,14 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - name = "Labor Camp Maintenance"; - req_access_txt = "2" + name = "Labor Camp Maintenance" }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/mine/laborcamp/security) "vE" = ( @@ -1157,10 +1155,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/mine/laborcamp/security) -"Lv" = ( -/obj/structure/flora/junglebush, -/turf/open/floor/plating/dirt/jungleland/deep_sand, -/area/jungleland/explored) "LE" = ( /turf/open/water/smooth/toxic_pit/deep, /area/jungleland/ocean) @@ -1216,10 +1210,6 @@ /obj/structure/flora/tree/jungle/small, /turf/open/floor/plating/dirt/jungleland/deep_sand, /area/jungleland/explored) -"NV" = ( -/obj/structure/flora/tree/jungle/small, -/turf/open/floor/plating/dirt/jungleland/deep_sand, -/area/jungleland/explored) "Oi" = ( /obj/effect/turf_decal/bot, /obj/structure/ore_box, @@ -1385,8 +1375,7 @@ dir = 4 }, /obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Shuttle Security Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Security Airlock" }, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -1395,6 +1384,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/mine/laborcamp/security) "WN" = ( @@ -5571,7 +5561,7 @@ sl FT gv cV -be +Dd LE LE "} @@ -8627,7 +8617,7 @@ Dd vR Dd OJ -Lv +zg UW UW UW @@ -8883,12 +8873,12 @@ UW UW UW Dd -NV +NM zg di -be +Dd di -Lv +zg UW UW LE @@ -9143,11 +9133,11 @@ UW Dd Dd vR -be -be -pA +Dd +Dd +vR mx -Lv +zg UW UW UW @@ -9402,14 +9392,14 @@ UW Dd Dd di -be -Lv +Dd +zg NM di -Lv +zg mx -Lv -be +zg +Dd UW LE LE @@ -9660,11 +9650,11 @@ UW UW Dd Dd -NV +NM +zg zg -Lv di -be +Dd UW UW UW diff --git a/_maps/map_files/mining/Lavaland.dmm b/_maps/map_files/mining/Lavaland.dmm index d767c11c1ea7..faefe499409d 100644 --- a/_maps/map_files/mining/Lavaland.dmm +++ b/_maps/map_files/mining/Lavaland.dmm @@ -1873,8 +1873,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Labor Camp Maintenance"; - req_access_txt = "2" + name = "Labor Camp Maintenance" }, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -1886,6 +1885,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/mine/laborcamp) "sk" = ( @@ -1913,8 +1913,7 @@ dir = 8 }, /obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Shuttle Security Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Security Airlock" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/poddoor/preopen{ @@ -1925,6 +1924,7 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/mine/laborcamp) "sH" = ( @@ -2968,7 +2968,7 @@ id = "labor"; name = "Labor Camp Lockdown"; pixel_y = 28; - req_access_txt = "2" + req_access = list("brig") }, /obj/effect/decal/cleanable/dirt, /obj/structure/fans/tiny, @@ -3054,8 +3054,7 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Monitoring"; - req_access_txt = "2" + name = "Labor Camp Monitoring" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -3070,6 +3069,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/mine/laborcamp) "Sf" = ( @@ -3362,13 +3362,13 @@ dir = 4 }, /obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Shuttle Security Airlock"; - req_access_txt = "2" + name = "Labor Camp Shuttle Security Airlock" }, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, /obj/effect/turf_decal/trimline/red/filled/line, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel, /area/mine/laborcamp) "Yj" = ( diff --git a/_maps/shuttles/assault_pod_default.dmm b/_maps/shuttles/assault_pod_default.dmm index c6c9ed88b52d..dd75aa44e35c 100644 --- a/_maps/shuttles/assault_pod_default.dmm +++ b/_maps/shuttles/assault_pod_default.dmm @@ -2,10 +2,10 @@ "a" = ( /obj/machinery/door/airlock/centcom{ name = "Assault Pod"; - opacity = 1; - req_access_txt = "150" + opacity = 1 }, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/assault_pod) "b" = ( @@ -25,18 +25,17 @@ /obj/machinery/door/airlock/centcom{ aiControlDisabled = 1; name = "Assault Pod"; - opacity = 1; - req_access_txt = "150" + opacity = 1 }, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/assault_pod) "f" = ( /obj/machinery/door/airlock/centcom{ aiControlDisabled = 1; name = "Assault Pod"; - opacity = 1; - req_access_txt = "150" + opacity = 1 }, /obj/docking_port/mobile/assault_pod{ dwidth = 3; @@ -45,6 +44,7 @@ preferred_direction = 4 }, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/assault_pod) "h" = ( diff --git a/_maps/shuttles/cargo_birdboat.dmm b/_maps/shuttles/cargo_birdboat.dmm index 0418aeb4c24a..5bd86e044b68 100644 --- a/_maps/shuttles/cargo_birdboat.dmm +++ b/_maps/shuttles/cargo_birdboat.dmm @@ -81,8 +81,7 @@ /area/shuttle/supply) "o" = ( /obj/machinery/door/airlock/titanium{ - name = "Supply Shuttle Airlock"; - req_access_txt = "31" + name = "Supply Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -90,6 +89,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/shuttle/supply) "p" = ( @@ -98,13 +98,15 @@ id = "QMLoaddoor2"; name = "Loading Doors"; pixel_x = 24; - pixel_y = 8 + pixel_y = 8; + req_access = list("cargo_bay") }, /obj/machinery/button/door{ id = "QMLoaddoor"; name = "Loading Doors"; pixel_x = 24; - pixel_y = -8 + pixel_y = -8; + req_access = list("cargo_bay") }, /obj/machinery/conveyor_switch/oneway{ id = "cargoshuttle" @@ -116,8 +118,7 @@ /area/shuttle/supply) "q" = ( /obj/machinery/door/airlock/titanium{ - name = "Supply Shuttle Airlock"; - req_access_txt = "31" + name = "Supply Shuttle Airlock" }, /obj/docking_port/mobile/supply{ dwidth = 3; @@ -129,6 +130,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/shuttle/supply) "r" = ( diff --git a/_maps/shuttles/cargo_box.dmm b/_maps/shuttles/cargo_box.dmm index 111dc784b5bf..77370830b14c 100644 --- a/_maps/shuttles/cargo_box.dmm +++ b/_maps/shuttles/cargo_box.dmm @@ -24,8 +24,7 @@ /area/shuttle/supply) "g" = ( /obj/machinery/door/airlock/titanium{ - name = "Supply Shuttle Airlock"; - req_access_txt = "31" + name = "Supply Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -33,6 +32,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/shuttle/supply) "h" = ( @@ -41,13 +41,15 @@ id = "QMLoaddoor2"; name = "Loading Doors"; pixel_x = 24; - pixel_y = 8 + pixel_y = 8; + req_access = list("cargo_bay") }, /obj/machinery/button/door{ id = "QMLoaddoor"; name = "Loading Doors"; pixel_x = 24; - pixel_y = -8 + pixel_y = -8; + req_access = list("cargo_bay") }, /obj/machinery/light{ dir = 4 @@ -56,8 +58,7 @@ /area/shuttle/supply) "i" = ( /obj/machinery/door/airlock/titanium{ - name = "Supply Shuttle Airlock"; - req_access_txt = "31" + name = "Supply Shuttle Airlock" }, /obj/docking_port/mobile/supply{ dwidth = 5; @@ -69,6 +70,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/shuttle/supply) "j" = ( diff --git a/_maps/shuttles/cargo_delta.dmm b/_maps/shuttles/cargo_delta.dmm index 4950c207c133..59d333cfb48d 100644 --- a/_maps/shuttles/cargo_delta.dmm +++ b/_maps/shuttles/cargo_delta.dmm @@ -91,8 +91,7 @@ /area/shuttle/supply) "n" = ( /obj/machinery/door/airlock/shuttle{ - name = "Supply Shuttle Airlock"; - req_access_txt = "31" + name = "Supply Shuttle Airlock" }, /obj/effect/decal/cleanable/dirt, /obj/docking_port/mobile/supply{ @@ -106,6 +105,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/shuttle/supply) "o" = ( @@ -120,13 +120,15 @@ id = "cargounload"; name = "Loading Doors"; pixel_x = -24; - pixel_y = 8 + pixel_y = 8; + req_access = list("cargo_bay") }, /obj/machinery/button/door{ id = "cargoload"; name = "Loading Doors"; pixel_x = -24; - pixel_y = -8 + pixel_y = -8; + req_access = list("cargo_bay") }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -147,8 +149,7 @@ /area/shuttle/supply) "r" = ( /obj/machinery/door/airlock/shuttle{ - name = "Supply Shuttle Airlock"; - req_access_txt = "31" + name = "Supply Shuttle Airlock" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only{ @@ -157,6 +158,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/shuttle/supply) "s" = ( diff --git a/_maps/shuttles/cargo_gax.dmm b/_maps/shuttles/cargo_gax.dmm index ef250cb6000c..56498c747a8e 100644 --- a/_maps/shuttles/cargo_gax.dmm +++ b/_maps/shuttles/cargo_gax.dmm @@ -34,8 +34,7 @@ /area/shuttle/supply) "g" = ( /obj/machinery/door/airlock/titanium{ - name = "Supply Shuttle Airlock"; - req_access_txt = "31" + name = "Supply Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -43,12 +42,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/shuttle/supply) "i" = ( /obj/machinery/door/airlock/titanium{ - name = "Supply Shuttle Airlock"; - req_access_txt = "31" + name = "Supply Shuttle Airlock" }, /obj/docking_port/mobile/supply{ dwidth = 5; @@ -60,6 +59,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/plating, /area/shuttle/supply) "j" = ( @@ -110,13 +110,15 @@ id = "QMLoaddoor2"; name = "Loading Doors"; pixel_x = 24; - pixel_y = 8 + pixel_y = 8; + req_access = list("cargo_bay") }, /obj/machinery/button/door{ id = "QMLoaddoor"; name = "Loading Doors"; pixel_x = 24; - pixel_y = -8 + pixel_y = -8; + req_access = list("cargo_bay") }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/supply) diff --git a/_maps/shuttles/cargo_kilo.dmm b/_maps/shuttles/cargo_kilo.dmm index e7e1259b8017..f207bfa4b1b8 100644 --- a/_maps/shuttles/cargo_kilo.dmm +++ b/_maps/shuttles/cargo_kilo.dmm @@ -138,7 +138,7 @@ name = "Off Ramp Toggle"; pixel_x = -24; pixel_y = 6; - req_access_txt = "31" + req_access = list("cargo") }, /obj/machinery/button/door{ id = "QMLoaddoor2"; @@ -146,7 +146,7 @@ name = "On Ramp Toggle"; pixel_x = -24; pixel_y = -6; - req_access_txt = "31" + req_access = list("cargo") }, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/supply) @@ -258,8 +258,7 @@ /area/shuttle/supply) "K" = ( /obj/machinery/door/airlock/shuttle{ - name = "Supply Shuttle Airlock"; - req_access_txt = "31" + name = "Supply Shuttle Airlock" }, /obj/effect/decal/cleanable/dirt, /obj/docking_port/mobile/supply{ @@ -272,12 +271,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/mineral/plastitanium, /area/shuttle/supply) "V" = ( /obj/machinery/door/airlock/shuttle{ - name = "Supply Shuttle Airlock"; - req_access_txt = "31" + name = "Supply Shuttle Airlock" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only{ @@ -286,6 +285,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/open/floor/mineral/plastitanium, /area/shuttle/supply) "W" = ( diff --git a/_maps/shuttles/emergency_48641.dmm b/_maps/shuttles/emergency_48641.dmm index 4b5d3d4ff384..ee75b5944d94 100644 --- a/_maps/shuttles/emergency_48641.dmm +++ b/_maps/shuttles/emergency_48641.dmm @@ -23,6 +23,12 @@ dir = 1 }, /obj/structure/reagent_dispensers/watertank, +/obj/machinery/button/door{ + id = "48641ragecageexit"; + name = "Rage Cage Exit Doors"; + pixel_x = 24; + req_access = list("cmo") + }, /turf/open/floor/plasteel, /area/shuttle/escape) "bB" = ( @@ -63,6 +69,12 @@ }, /turf/open/floor/wood, /area/shuttle/escape) +"cg" = ( +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, +/turf/open/floor/wood, +/area/shuttle/escape) "cY" = ( /obj/structure/window{ dir = 8 @@ -97,6 +109,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/turf_decal/ramp_corner{ + dir = 1 + }, /turf/open/floor/wood, /area/shuttle/escape) "dy" = ( @@ -403,12 +418,12 @@ dir = 8 }, /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_access_txt = "50" + name = "Cargo Office" }, /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plating, /area/shuttle/escape) "pc" = ( @@ -419,6 +434,9 @@ /area/shuttle/escape) "pe" = ( /obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/light/colour_cycle/dancefloor_a, /area/shuttle/escape) "ph" = ( @@ -466,6 +484,9 @@ /area/shuttle/escape) "qU" = ( /obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/light/colour_cycle/dancefloor_b, /area/shuttle/escape) "qW" = ( @@ -476,8 +497,7 @@ /area/shuttle/escape) "ri" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office"; - req_access_txt = "50" + name = "Cargo Office" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -488,6 +508,7 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "rN" = ( @@ -496,7 +517,7 @@ name = "Table Privacy Shutters"; pixel_x = -28; pixel_y = -5; - req_access_txt = "40" + req_access = list("cmo") }, /turf/open/floor/wood, /area/shuttle/escape) @@ -561,6 +582,9 @@ id = "4861tableshutters"; name = "Privacy Shutters" }, +/obj/effect/turf_decal/ramp_middle{ + dir = 8 + }, /turf/open/floor/wood, /area/shuttle/escape) "tA" = ( @@ -587,6 +611,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, /turf/open/floor/light/colour_cycle/dancefloor_b, /area/shuttle/escape) "vD" = ( @@ -650,8 +677,7 @@ "wz" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ - name = "Cargo Desk"; - req_access_txt = "31" + name = "Cargo Desk" }, /obj/item/deskbell/preset/supply{ pixel_x = 8; @@ -663,12 +689,14 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/supply/general{ + dir = 8 + }, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "wB" = ( /obj/machinery/door/window/westleft{ - name = "Bridge"; - req_access_txt = "19" + name = "Bridge" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -676,6 +704,9 @@ /obj/effect/turf_decal/stripes{ dir = 10 }, +/obj/effect/mapping_helpers/windoor/access/all/command/general{ + dir = 8 + }, /turf/open/floor/plasteel, /area/shuttle/escape) "xc" = ( @@ -730,6 +761,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/turf_decal/ramp_corner, /turf/open/floor/light/colour_cycle/dancefloor_a, /area/shuttle/escape) "zB" = ( @@ -777,18 +809,6 @@ /obj/effect/turf_decal/stripes, /turf/open/floor/wood, /area/shuttle/escape) -"Bw" = ( -/obj/machinery/shieldgen{ - anchored = 1 - }, -/obj/machinery/button/door{ - id = "48641ragecageexit"; - name = "Rage Cage Exit Doors"; - pixel_x = 24; - req_access_txt = "40" - }, -/turf/open/floor/plasteel, -/area/shuttle/escape) "Bz" = ( /obj/structure/window/reinforced{ dir = 1 @@ -980,6 +1000,12 @@ dir = 8 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/ramp_middle{ + dir = 4 + }, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, /turf/open/floor/light/colour_cycle/dancefloor_a, /area/shuttle/escape) "HT" = ( @@ -1021,8 +1047,7 @@ "Jg" = ( /obj/machinery/door/window/westleft{ dir = 4; - name = "Bridge"; - req_access_txt = "19" + name = "Bridge" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -1030,6 +1055,9 @@ /obj/effect/turf_decal/stripes{ dir = 6 }, +/obj/effect/mapping_helpers/windoor/access/all/command/general{ + dir = 4 + }, /turf/open/floor/plasteel, /area/shuttle/escape) "JO" = ( @@ -1215,6 +1243,7 @@ /obj/structure/railing{ dir = 4 }, +/obj/effect/turf_decal/ramp_middle, /turf/open/floor/plasteel/stairs, /area/shuttle/escape) "Vm" = ( @@ -1523,7 +1552,7 @@ Xo (9,1,1) = {" gO eo -dn +cg Vl bV yS @@ -1670,7 +1699,7 @@ nD tp KX eC -Bw +Hb bq Lp yw diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm index 137add43adba..ce457bb589f8 100644 --- a/_maps/shuttles/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency_asteroid.dmm @@ -17,8 +17,7 @@ /area/shuttle/escape) "ad" = ( /obj/machinery/door/airlock/security/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -26,6 +25,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "ae" = ( @@ -78,8 +78,7 @@ /area/shuttle/escape) "ak" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Escape Shuttle Infirmary"; - req_access_txt = "5" + name = "Escape Shuttle Infirmary" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -87,17 +86,18 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "al" = ( /obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "am" = ( @@ -383,8 +383,7 @@ /area/shuttle/escape) "bg" = ( /obj/machinery/door/airlock/command/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" + name = "Emergency Shuttle Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -392,6 +391,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "bi" = ( @@ -570,6 +570,19 @@ }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) +"fo" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Emergency Shuttle Brig" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) "lb" = ( /obj/machinery/light, /obj/machinery/door/firedoor/border_only{ @@ -999,7 +1012,7 @@ ac ac ac ah -ad +fo ah bi ah diff --git a/_maps/shuttles/emergency_bar.dmm b/_maps/shuttles/emergency_bar.dmm index 115288d1d00b..c14ed7ef4c5f 100644 --- a/_maps/shuttles/emergency_bar.dmm +++ b/_maps/shuttles/emergency_bar.dmm @@ -152,13 +152,13 @@ /area/shuttle/escape) "az" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" + name = "Emergency Shuttle Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/carpet, /area/shuttle/escape) "aA" = ( @@ -233,8 +233,7 @@ /area/shuttle/escape) "aJ" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -246,12 +245,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel, /area/shuttle/escape) "aK" = ( /obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -259,6 +258,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aL" = ( diff --git a/_maps/shuttles/emergency_birdboat.dmm b/_maps/shuttles/emergency_birdboat.dmm index a9ad698be4be..6987f2fe58d6 100644 --- a/_maps/shuttles/emergency_birdboat.dmm +++ b/_maps/shuttles/emergency_birdboat.dmm @@ -265,24 +265,24 @@ /area/shuttle/escape) "aL" = ( /obj/machinery/door/airlock/command/glass{ - name = "bridge door"; - req_access_txt = "19" + name = "bridge door" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aM" = ( /obj/machinery/door/airlock/security/glass{ - name = "security airlock"; - req_access_txt = "63" + name = "security airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aN" = ( @@ -327,8 +327,7 @@ /area/shuttle/escape) "aU" = ( /obj/machinery/door/airlock/command/glass{ - name = "bridge door"; - req_access_txt = "19" + name = "bridge door" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -336,6 +335,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aV" = ( diff --git a/_maps/shuttles/emergency_box.dmm b/_maps/shuttles/emergency_box.dmm index 4bff7e58417b..1e65948e6d37 100644 --- a/_maps/shuttles/emergency_box.dmm +++ b/_maps/shuttles/emergency_box.dmm @@ -109,13 +109,13 @@ /area/shuttle/escape) "ay" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" + name = "Emergency Shuttle Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "az" = ( @@ -176,8 +176,7 @@ /area/shuttle/escape) "aH" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -185,12 +184,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aI" = ( /obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -198,6 +197,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aJ" = ( diff --git a/_maps/shuttles/emergency_cargo.dmm b/_maps/shuttles/emergency_cargo.dmm index 2f377b118a5a..e3c297024c6c 100644 --- a/_maps/shuttles/emergency_cargo.dmm +++ b/_maps/shuttles/emergency_cargo.dmm @@ -265,13 +265,13 @@ /area/shuttle/escape) "rz" = ( /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/rockvault, /area/shuttle/escape) "rM" = ( @@ -338,9 +338,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" + name = "Emergency Shuttle Cockpit" }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/rockvault, /area/shuttle/escape) "vg" = ( @@ -766,8 +766,7 @@ /area/shuttle/escape) "QE" = ( /obj/machinery/door/airlock/external{ - name = "Emegency Shuttle External Airlock"; - req_access_txt = "2" + name = "Emegency Shuttle External Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -775,6 +774,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "Rh" = ( @@ -825,14 +825,14 @@ name = "Cockpit Window Blast Doors"; pixel_x = 26; pixel_y = 32; - req_access_txt = "19" + req_access = list("command") }, /obj/machinery/button/door{ id = "ock_cargo_door"; name = "Cargo Airlock Blast Doors"; pixel_x = 39; pixel_y = 32; - req_access_txt = "19" + req_access = list("command") }, /turf/open/floor/plasteel/rockvault, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm index 3b4513efaa7b..c00bd3742bde 100644 --- a/_maps/shuttles/emergency_cere.dmm +++ b/_maps/shuttles/emergency_cere.dmm @@ -478,13 +478,13 @@ /area/shuttle/escape) "aR" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" + name = "Emergency Shuttle Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "aS" = ( @@ -603,8 +603,7 @@ /area/shuttle/escape) "bn" = ( /obj/machinery/door/airlock/security/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -612,6 +611,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bo" = ( @@ -631,8 +631,7 @@ /area/shuttle/escape) "bq" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -640,6 +639,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bs" = ( @@ -683,8 +683,7 @@ /area/shuttle/escape) "bv" = ( /obj/machinery/door/airlock/shuttle{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -692,6 +691,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "bw" = ( @@ -1447,8 +1447,7 @@ /area/shuttle/escape) "cP" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engine Room"; - req_one_access_txt = "10;24" + name = "Engine Room" }, /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -1464,6 +1463,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plasteel, /area/shuttle/escape) "cQ" = ( diff --git a/_maps/shuttles/emergency_clown.dmm b/_maps/shuttles/emergency_clown.dmm index 3a4bb392cb11..a00be9dfb5b9 100644 --- a/_maps/shuttles/emergency_clown.dmm +++ b/_maps/shuttles/emergency_clown.dmm @@ -149,8 +149,7 @@ /area/shuttle/escape) "aA" = ( /obj/machinery/door/airlock/bananium/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -158,6 +157,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/bluespace, /area/shuttle/escape) "aB" = ( @@ -507,8 +507,7 @@ /area/shuttle/escape) "IP" = ( /obj/machinery/door/airlock/bananium/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -516,6 +515,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "Jj" = ( diff --git a/_maps/shuttles/emergency_cozy.dmm b/_maps/shuttles/emergency_cozy.dmm index da1000162dd3..8a2fc3b9b789 100644 --- a/_maps/shuttles/emergency_cozy.dmm +++ b/_maps/shuttles/emergency_cozy.dmm @@ -126,9 +126,9 @@ dir = 1 }, /obj/machinery/door/airlock/wood/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" + name = "Emergency Shuttle Cockpit" }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/carpet/royalblue, /area/shuttle/escape) "ot" = ( @@ -349,9 +349,9 @@ dir = 8 }, /obj/machinery/door/airlock/wood{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/carpet/red, /area/shuttle/escape) "Hi" = ( @@ -373,8 +373,7 @@ /area/shuttle/escape) "Ib" = ( /obj/machinery/door/airlock/wood/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -382,6 +381,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/carpet/red, /area/shuttle/escape) "Iu" = ( diff --git a/_maps/shuttles/emergency_cramped.dmm b/_maps/shuttles/emergency_cramped.dmm index 629a20ca4738..2e4c5e9cfc6f 100644 --- a/_maps/shuttles/emergency_cramped.dmm +++ b/_maps/shuttles/emergency_cramped.dmm @@ -11,8 +11,7 @@ /area/shuttle/escape) "c" = ( /obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -20,6 +19,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "d" = ( diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm index d35fd379e0c9..af7af108eb85 100644 --- a/_maps/shuttles/emergency_delta.dmm +++ b/_maps/shuttles/emergency_delta.dmm @@ -785,19 +785,18 @@ /area/shuttle/escape) "bt" = ( /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bu" = ( /obj/machinery/door/airlock/command/glass{ - name = "Cockpit"; - req_access_txt = "19" + name = "Cockpit" }, /obj/effect/turf_decal/stripes/line{ dir = 2 @@ -806,12 +805,12 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel, /area/shuttle/escape) "bv" = ( /obj/machinery/door/airlock/shuttle{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -822,6 +821,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/white, /area/shuttle/escape) "bw" = ( @@ -1024,8 +1024,7 @@ /area/shuttle/escape) "bY" = ( /obj/machinery/door/airlock/command{ - name = "Emergency Recovery Airlock"; - req_access_txt = "19" + name = "Emergency Recovery Airlock" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1036,6 +1035,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel, /area/shuttle/escape) "bZ" = ( @@ -1621,8 +1621,7 @@ /area/shuttle/escape) "Ru" = ( /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -1630,6 +1629,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "Rx" = ( diff --git a/_maps/shuttles/emergency_discoinferno.dmm b/_maps/shuttles/emergency_discoinferno.dmm index 3ce2293de3f2..620cd07cddc3 100644 --- a/_maps/shuttles/emergency_discoinferno.dmm +++ b/_maps/shuttles/emergency_discoinferno.dmm @@ -80,13 +80,12 @@ /turf/open/floor/mineral/gold, /area/shuttle/escape) "p" = ( -/obj/machinery/door/airlock/gold{ - req_access_txt = "19" - }, +/obj/machinery/door/airlock/gold, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/gold, /area/shuttle/escape) "q" = ( diff --git a/_maps/shuttles/emergency_donut.dmm b/_maps/shuttles/emergency_donut.dmm index 506ba56e6d9f..9cd4c795e775 100644 --- a/_maps/shuttles/emergency_donut.dmm +++ b/_maps/shuttles/emergency_donut.dmm @@ -107,13 +107,13 @@ /area/shuttle/escape) "au" = ( /obj/machinery/door/airlock/command/glass{ - name = "Cockpit"; - req_access_txt = "19" + name = "Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "av" = ( @@ -164,8 +164,7 @@ /area/shuttle/escape) "aD" = ( /obj/machinery/door/airlock/public/glass{ - name = "Containment Cell"; - req_access_txt = "2" + name = "Containment Cell" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -173,6 +172,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aE" = ( @@ -221,8 +221,7 @@ /area/shuttle/escape) "aL" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -230,6 +229,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aM" = ( @@ -253,8 +253,7 @@ /area/shuttle/escape) "aP" = ( /obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -262,6 +261,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "aQ" = ( diff --git a/_maps/shuttles/emergency_goon.dmm b/_maps/shuttles/emergency_goon.dmm index 7a17941c7721..569c26f2e5dc 100644 --- a/_maps/shuttles/emergency_goon.dmm +++ b/_maps/shuttles/emergency_goon.dmm @@ -200,8 +200,7 @@ /area/shuttle/escape) "E" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" + name = "Emergency Shuttle Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -209,6 +208,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "F" = ( @@ -235,8 +235,7 @@ /area/shuttle/escape) "K" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -244,6 +243,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "L" = ( diff --git a/_maps/shuttles/emergency_kilo.dmm b/_maps/shuttles/emergency_kilo.dmm index 6fe1f99f8ddb..d642b5830423 100644 --- a/_maps/shuttles/emergency_kilo.dmm +++ b/_maps/shuttles/emergency_kilo.dmm @@ -344,16 +344,16 @@ /area/shuttle/escape) "aJ" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_one_access_txt = "19" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/machinery/door/airlock/command{ + name = "Shuttle Control" + }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "aK" = ( @@ -401,8 +401,7 @@ "aN" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/door/airlock/command{ - name = "Shuttle Control"; - req_one_access_txt = "19" + name = "Shuttle Control" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -410,6 +409,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "aO" = ( @@ -583,8 +583,7 @@ /area/shuttle/escape) "bb" = ( /obj/machinery/door/airlock/shuttle{ - name = "Emergency Shuttle Airlock"; - req_one_access_txt = "63" + name = "Emergency Shuttle Airlock" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -598,6 +597,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "bc" = ( @@ -699,13 +699,13 @@ "bm" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "bn" = ( @@ -1816,13 +1816,13 @@ "qS" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/door/airlock/command{ - name = "Shuttle Control"; - req_one_access_txt = "19" + name = "Shuttle Control" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "qX" = ( diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm index 499db62f610f..44aef294a736 100644 --- a/_maps/shuttles/emergency_luxury.dmm +++ b/_maps/shuttles/emergency_luxury.dmm @@ -298,8 +298,7 @@ /area/shuttle/escape/luxury) "pP" = ( /obj/machinery/door/airlock/security/glass{ - name = "Escape Shuttle Cell"; - req_access_txt = "2" + name = "Escape Shuttle Cell" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -307,6 +306,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/luxury) "rj" = ( @@ -632,8 +632,7 @@ layer = 2.6 }, /obj/machinery/door/airlock/security/glass{ - name = "Undesirables"; - req_access_txt = "2" + name = "Undesirables" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -641,6 +640,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/luxury) "NE" = ( @@ -798,8 +798,7 @@ id = "ohnopoors"; name = "window shutters"; pixel_x = -23; - pixel_y = -9; - req_access_txt = "0" + pixel_y = -9 }, /obj/machinery/door/firedoor/border_only{ dir = 1 diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency_meta.dmm index 3a27d3376aeb..8775f4ad61b8 100644 --- a/_maps/shuttles/emergency_meta.dmm +++ b/_maps/shuttles/emergency_meta.dmm @@ -308,8 +308,7 @@ /area/shuttle/escape) "aH" = ( /obj/machinery/door/airlock/command/glass{ - name = "Cockpit"; - req_access_txt = "19" + name = "Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -317,6 +316,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aI" = ( @@ -409,25 +409,25 @@ /area/shuttle/escape) "aW" = ( /obj/machinery/door/airlock/command{ - name = "Emergency Recovery Airlock"; - req_access_txt = "19" + name = "Emergency Recovery Airlock" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel, /area/shuttle/escape) "aY" = ( /obj/machinery/door/airlock/security/glass{ - name = "Brig"; - req_access_txt = "2" + name = "Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aZ" = ( diff --git a/_maps/shuttles/emergency_mini.dmm b/_maps/shuttles/emergency_mini.dmm index 2542dc3587fb..36099a07dac1 100644 --- a/_maps/shuttles/emergency_mini.dmm +++ b/_maps/shuttles/emergency_mini.dmm @@ -125,13 +125,13 @@ /area/shuttle/escape) "gP" = ( /obj/machinery/door/airlock/security/glass{ - name = "Escape Shuttle Cell"; - req_access_txt = "2" + name = "Escape Shuttle Cell" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "jx" = ( @@ -212,8 +212,7 @@ /area/shuttle/escape) "mf" = ( /obj/machinery/door/airlock/command/glass{ - name = "Escape Shuttle Cockpit"; - req_access_txt = "19" + name = "Escape Shuttle Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -229,6 +228,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "mK" = ( diff --git a/_maps/shuttles/emergency_octa.dmm b/_maps/shuttles/emergency_octa.dmm index 2832cf45285c..e5e769b3b0ba 100644 --- a/_maps/shuttles/emergency_octa.dmm +++ b/_maps/shuttles/emergency_octa.dmm @@ -316,13 +316,13 @@ /area/shuttle/escape) "zj" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" + name = "Emergency Shuttle Cockpit" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "zJ" = ( @@ -488,8 +488,7 @@ /area/shuttle/escape) "Qz" = ( /obj/machinery/door/airlock/shuttle{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -497,6 +496,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "QA" = ( @@ -544,13 +544,13 @@ /area/shuttle/escape) "SM" = ( /obj/machinery/door/airlock/security/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "TQ" = ( @@ -598,7 +598,7 @@ name = "Cockpit Window Blast Doors"; pixel_x = -7; pixel_y = 32; - req_access_txt = "19" + req_access = list("command") }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_omega.dmm b/_maps/shuttles/emergency_omega.dmm index 6080c7f1374d..fe589b93bb90 100644 --- a/_maps/shuttles/emergency_omega.dmm +++ b/_maps/shuttles/emergency_omega.dmm @@ -114,8 +114,7 @@ /area/shuttle/escape) "am" = ( /obj/machinery/door/airlock/command{ - name = "Emergency Recovery Airlock"; - req_access_txt = "19" + name = "Emergency Recovery Airlock" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -127,6 +126,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel, /area/shuttle/escape) "an" = ( @@ -179,8 +179,7 @@ /area/shuttle/escape) "aq" = ( /obj/machinery/door/airlock/shuttle{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -194,6 +193,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/white, /area/shuttle/escape) "ar" = ( @@ -257,13 +257,13 @@ /area/shuttle/escape) "av" = ( /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aw" = ( @@ -272,8 +272,7 @@ /area/shuttle/escape) "ax" = ( /obj/machinery/door/airlock/command/glass{ - name = "Cockpit"; - req_access_txt = "19" + name = "Cockpit" }, /obj/effect/turf_decal/stripes/line{ dir = 2 @@ -285,6 +284,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel, /area/shuttle/escape) "ay" = ( diff --git a/_maps/shuttles/emergency_pool.dmm b/_maps/shuttles/emergency_pool.dmm index 867ae0b50968..8a55a13430e6 100644 --- a/_maps/shuttles/emergency_pool.dmm +++ b/_maps/shuttles/emergency_pool.dmm @@ -109,13 +109,13 @@ /area/shuttle/escape) "ay" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" + name = "Emergency Shuttle Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "az" = ( @@ -176,8 +176,7 @@ /area/shuttle/escape) "aH" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -185,12 +184,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aI" = ( /obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -198,6 +197,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aJ" = ( diff --git a/_maps/shuttles/emergency_pubby.dmm b/_maps/shuttles/emergency_pubby.dmm index 220dbaf4a64f..cb1f47651529 100644 --- a/_maps/shuttles/emergency_pubby.dmm +++ b/_maps/shuttles/emergency_pubby.dmm @@ -562,7 +562,6 @@ /obj/structure/window/reinforced, /obj/structure/table, /obj/item/storage/bag/tray, -/obj/item/clothing/under/waiter, /turf/open/floor/plasteel/cafeteria, /area/shuttle/escape) "bg" = ( @@ -701,13 +700,12 @@ /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bA" = ( -/obj/machinery/door/airlock/public/glass{ - req_access_txt = "2" - }, +/obj/machinery/door/airlock/public/glass, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bB" = ( @@ -780,13 +778,13 @@ /area/shuttle/escape) "bO" = ( /obj/machinery/door/airlock/public/glass{ - name = "Cockpit"; - req_access_txt = "19" + name = "Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plating, /area/shuttle/escape) "bQ" = ( @@ -801,13 +799,13 @@ /area/shuttle/escape) "bT" = ( /obj/machinery/door/airlock/public/glass{ - name = "Brig"; - req_access_txt = "2" + name = "Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "cM" = ( diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm index 14415c1a5ba0..b686d860129e 100644 --- a/_maps/shuttles/emergency_raven.dmm +++ b/_maps/shuttles/emergency_raven.dmm @@ -39,7 +39,7 @@ id = "escape_cockpit_windows"; name = "Cockpit Window Blast Doors"; pixel_x = -7; - req_access_txt = "19" + req_access = list("command") }, /turf/open/floor/plasteel/dark, /area/shuttle/escape) @@ -267,7 +267,7 @@ id = "escape_cockpit_blast"; name = "Cockpit Airlock Blast Doors"; pixel_y = -26; - req_access_txt = "19" + req_access = list("command") }, /obj/effect/turf_decal/raven/two, /turf/open/floor/plasteel/dark, @@ -331,12 +331,12 @@ /area/shuttle/escape) "aS" = ( /obj/machinery/door/airlock/command/glass{ - name = "Cockpit"; - req_access_txt = "19" + name = "Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "aT" = ( @@ -504,8 +504,7 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -513,6 +512,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "bl" = ( @@ -580,8 +580,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/medical/glass{ - name = "Escape Shuttle Infirmary"; - req_one_access_txt = "2;19" + name = "Escape Shuttle Infirmary" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -589,6 +588,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "bp" = ( @@ -664,13 +665,14 @@ dir = 1 }, /obj/machinery/door/airlock/command/glass{ - name = "Cockpit"; - req_one_access_txt = "2;19" + name = "Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/security/basic, +/obj/effect/mapping_helpers/airlock/access/any/command/general, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "by" = ( @@ -2288,8 +2290,7 @@ lethal = 1; pixel_x = 5; pixel_y = 32; - req_access = null; - req_access_txt = "19" + req_access = list("command") }, /turf/open/floor/plasteel/dark, /area/shuttle/escape) @@ -2345,13 +2346,13 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" + name = "Holding Area" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "ew" = ( diff --git a/_maps/shuttles/emergency_rollerdome.dmm b/_maps/shuttles/emergency_rollerdome.dmm index c82af014fd83..a680eac441d9 100644 --- a/_maps/shuttles/emergency_rollerdome.dmm +++ b/_maps/shuttles/emergency_rollerdome.dmm @@ -141,14 +141,13 @@ /turf/open/floor/plating, /area/shuttle/escape) "uS" = ( -/obj/machinery/door/airlock/gold/glass{ - req_access_txt = "19" - }, +/obj/machinery/door/airlock/gold/glass, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/effect/turf_decal/siding/wood, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/wood, /area/shuttle/escape) "vq" = ( diff --git a/_maps/shuttles/emergency_russiafightpit.dmm b/_maps/shuttles/emergency_russiafightpit.dmm index ad60ced7dbbb..93d2b4336994 100644 --- a/_maps/shuttles/emergency_russiafightpit.dmm +++ b/_maps/shuttles/emergency_russiafightpit.dmm @@ -100,7 +100,7 @@ name = "window shutters"; pixel_x = 26; pixel_y = -6; - req_access_txt = "19" + req_access = list("command") }, /obj/structure/chair/comfy/shuttle, /obj/machinery/button/door{ @@ -108,7 +108,7 @@ name = "release bears"; pixel_x = 26; pixel_y = 6; - req_access_txt = "20" + req_access = list("captain") }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) @@ -118,13 +118,13 @@ /area/shuttle/escape) "at" = ( /obj/machinery/door/airlock/public/glass{ - name = "Glorious Leaders"; - req_access_txt = "19" + name = "Glorious Leaders" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "au" = ( @@ -206,8 +206,7 @@ /area/shuttle/escape) "aI" = ( /obj/machinery/door/airlock/security/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -215,6 +214,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "aJ" = ( @@ -252,8 +252,7 @@ /area/shuttle/escape) "aO" = ( /obj/machinery/door/airlock/security/glass{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -261,6 +260,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "aP" = ( diff --git a/_maps/shuttles/emergency_scrapheap.dmm b/_maps/shuttles/emergency_scrapheap.dmm index 3a1105fc48d1..25c1935efd12 100644 --- a/_maps/shuttles/emergency_scrapheap.dmm +++ b/_maps/shuttles/emergency_scrapheap.dmm @@ -100,35 +100,35 @@ /area/shuttle/escape) "aq" = ( /obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "ar" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" + name = "Emergency Shuttle Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/carpet, /area/shuttle/escape) "as" = ( /obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "at" = ( @@ -180,8 +180,7 @@ "az" = ( /obj/structure/grille, /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -189,6 +188,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "aA" = ( @@ -201,8 +201,7 @@ /area/shuttle/escape) "aC" = ( /obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -210,6 +209,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "aD" = ( diff --git a/_maps/shuttles/emergency_supermatter.dmm b/_maps/shuttles/emergency_supermatter.dmm index a0a5bdc750db..eb195219ff9d 100644 --- a/_maps/shuttles/emergency_supermatter.dmm +++ b/_maps/shuttles/emergency_supermatter.dmm @@ -200,13 +200,14 @@ /area/shuttle/escape) "aL" = ( /obj/machinery/door/airlock/external{ - name = "Emergency Launch Catwalk"; - req_access_txt = "10;13" + name = "Emergency Launch Catwalk" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, /turf/open/floor/plating, /area/shuttle/escape) "aM" = ( diff --git a/_maps/shuttles/emergency_transtar.dmm b/_maps/shuttles/emergency_transtar.dmm index d81ff9873254..ec0d19b20c1d 100644 --- a/_maps/shuttles/emergency_transtar.dmm +++ b/_maps/shuttles/emergency_transtar.dmm @@ -541,8 +541,7 @@ /area/shuttle/escape) "GG" = ( /obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -550,6 +549,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "GX" = ( @@ -713,13 +713,13 @@ /area/shuttle/escape) "Rr" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" + name = "Emergency Shuttle Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "RX" = ( diff --git a/_maps/shuttles/emergency_triage.dmm b/_maps/shuttles/emergency_triage.dmm index d7a35a893b74..db03fcc812d7 100644 --- a/_maps/shuttles/emergency_triage.dmm +++ b/_maps/shuttles/emergency_triage.dmm @@ -290,8 +290,7 @@ /area/shuttle/escape) "ma" = ( /obj/machinery/door/airlock/public/glass{ - name = "Triage Shuttle Brig"; - req_access_txt = "2" + name = "Triage Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -299,6 +298,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "mz" = ( @@ -330,13 +330,13 @@ /area/shuttle/escape) "oA" = ( /obj/machinery/door/airlock/public/glass{ - name = "Triage Shuttle Cockpit"; - req_access_txt = "19" + name = "Triage Shuttle Cockpit" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "qa" = ( @@ -390,8 +390,7 @@ /area/shuttle/escape) "uf" = ( /obj/machinery/door/airlock/shuttle{ - name = "Triage Brig Airlock"; - req_access_txt = "2" + name = "Triage Brig Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -399,6 +398,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "uJ" = ( @@ -521,9 +521,9 @@ /obj/item/storage/firstaid/advanced{ pixel_y = 10 }, -/obj/machinery/door/window/brigdoor/southright{ - req_access_txt = "2" - }, +/obj/machinery/door/window/brigdoor/southright, +/obj/effect/mapping_helpers/windoor/access/any/security/general, +/obj/effect/mapping_helpers/windoor/access/any/security/brig_phys, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "El" = ( @@ -790,7 +790,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/closet/secure_closet{ name = "Plasmaman Supplies Locker"; - req_access_txt = "5" + req_access = list("medical") }, /obj/item/clothing/under/plasmaman, /obj/item/clothing/under/plasmaman, diff --git a/_maps/shuttles/emergency_wabbajack.dmm b/_maps/shuttles/emergency_wabbajack.dmm index d83fa3c43a08..fe5e196d9aab 100644 --- a/_maps/shuttles/emergency_wabbajack.dmm +++ b/_maps/shuttles/emergency_wabbajack.dmm @@ -169,8 +169,7 @@ /area/shuttle/escape) "ax" = ( /obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" + name = "Emergency Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -178,6 +177,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/plating, /area/shuttle/escape) "ay" = ( @@ -202,13 +202,13 @@ /area/shuttle/escape) "aB" = ( /obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" + name = "Emergency Shuttle Brig" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/basic, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aC" = ( diff --git a/_maps/shuttles/ferry_meat.dmm b/_maps/shuttles/ferry_meat.dmm index 56eb6ac34b5f..34d636f003cd 100644 --- a/_maps/shuttles/ferry_meat.dmm +++ b/_maps/shuttles/ferry_meat.dmm @@ -13,8 +13,7 @@ /area/shuttle/transport) "d" = ( /obj/machinery/door/airlock/freezer{ - name = "Meat Tradeship Backroom"; - req_access_txt = "28" + name = "Meat Tradeship Backroom" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -22,6 +21,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/plasteel/freezer, /area/shuttle/transport) "e" = ( diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm index 722d9d907760..6890fe623576 100644 --- a/_maps/shuttles/infiltrator_basic.dmm +++ b/_maps/shuttles/infiltrator_basic.dmm @@ -110,7 +110,7 @@ name = "Cockpit View Control"; pixel_x = 32; pixel_y = 32; - req_access_txt = "150" + req_access = list("syndicate") }, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/bridge) @@ -155,8 +155,7 @@ /area/shuttle/syndicate/bridge) "av" = ( /obj/machinery/door/airlock/hatch{ - name = "Cockpit"; - req_access_txt = "150" + name = "Cockpit" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -172,6 +171,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/bridge) "aw" = ( @@ -400,8 +400,7 @@ /area/shuttle/syndicate/eva) "aV" = ( /obj/machinery/door/airlock/external{ - name = "Ready Room"; - req_access_txt = "150" + name = "Ready Room" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -417,12 +416,12 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/hallway) "aW" = ( /obj/machinery/door/airlock/external{ - name = "E.V.A. Gear Storage"; - req_access_txt = "150" + name = "E.V.A. Gear Storage" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -440,6 +439,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/eva) "aX" = ( @@ -462,7 +462,7 @@ id = "smindicate"; name = "external door control"; pixel_y = 26; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/docking_port/mobile{ dheight = 1; @@ -489,9 +489,7 @@ /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/eva) "ba" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -508,6 +506,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/airlock) "bb" = ( @@ -564,9 +563,7 @@ /turf/closed/wall/r_wall/syndicate, /area/shuttle/syndicate/medical) "bl" = ( -/obj/machinery/door/airlock/hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/hatch, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -576,6 +573,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/syndicate/medical) "bm" = ( @@ -595,9 +593,7 @@ /turf/open/floor/circuit/red, /area/shuttle/syndicate/hallway) "bp" = ( -/obj/machinery/door/airlock/hatch{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/hatch, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -607,6 +603,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/syndicate/armory) "bq" = ( @@ -936,13 +933,15 @@ "bZ" = ( /obj/machinery/door/window{ dir = 1; - name = "Surgery"; - req_access_txt = "150" + name = "Surgery" }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/medical) "ca" = ( @@ -1040,13 +1039,15 @@ "ch" = ( /obj/machinery/door/window{ dir = 1; - name = "Technological Storage"; - req_access_txt = "150" + name = "Technological Storage" }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/armory) "ci" = ( @@ -1346,8 +1347,7 @@ }, /obj/machinery/door/window/brigdoor{ dir = 1; - name = "Mass Driver"; - req_access_txt = "150" + name = "Mass Driver" }, /obj/machinery/computer/pod/old{ density = 0; @@ -1355,8 +1355,11 @@ icon_state = "airlock_control_standby"; id = "syndiedriver"; name = "Mass Driver Controller"; - pixel_x = -41; - pixel_y = 8 + pixel_x = -24; + req_access = list("syndicate") + }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general{ + dir = 1 }, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/airlock) diff --git a/_maps/shuttles/infiltrator_cutter.dmm b/_maps/shuttles/infiltrator_cutter.dmm index 121e92899a85..a37ff62f9cc3 100644 --- a/_maps/shuttles/infiltrator_cutter.dmm +++ b/_maps/shuttles/infiltrator_cutter.dmm @@ -7,8 +7,7 @@ dir = 2 }, /obj/machinery/door/airlock/external{ - id_tag = "syndicatecutter_bolt_port"; - req_access_txt = "150" + id_tag = "syndicatecutter_bolt_port" }, /obj/docking_port/mobile{ callTime = 150; @@ -22,6 +21,7 @@ preferred_direction = 4; width = 22 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/yogs/stealthcruiser) "ac" = ( @@ -69,9 +69,9 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - id_tag = "syndicatecutter_bolt_port"; - req_access_txt = "150" + id_tag = "syndicatecutter_bolt_port" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/yogs/stealthcruiser) "aj" = ( @@ -143,7 +143,7 @@ normaldoorcontrol = 1; pixel_x = -4; pixel_y = 25; - req_access_txt = "150"; + req_access = list("syndicate"); specialfunctions = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -349,7 +349,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /turf/open/floor/plasteel/dark/side{ @@ -477,9 +477,8 @@ "bn" = ( /obj/structure/table, /obj/effect/turf_decal/stripes/line, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = 150 +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/effect/landmark/start/infiltrator_objective, /turf/open/floor/mineral/plastitanium, @@ -499,8 +498,7 @@ dir = 8 }, /obj/machinery/door/window/southleft{ - name = "Weapon Storage"; - req_access_txt = "150" + name = "Weapon Storage" }, /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -513,6 +511,7 @@ /obj/item/grenade/plastic/c4{ pixel_x = 13 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general, /turf/open/floor/mineral/plastitanium, /area/shuttle/yogs/stealthcruiser) "bq" = ( @@ -520,8 +519,7 @@ /obj/machinery/door/window/southleft{ base_state = "right"; icon_state = "right"; - name = "Weapon Storage"; - req_access_txt = "150" + name = "Weapon Storage" }, /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -534,6 +532,7 @@ /obj/item/grenade/flashbang{ pixel_x = 5 }, +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general, /turf/open/floor/mineral/plastitanium, /area/shuttle/yogs/stealthcruiser) "br" = ( @@ -542,11 +541,9 @@ name = "tactical chair" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm{ +/obj/machinery/airalarm/syndicate{ dir = 4; - icon_state = "alarm0"; - pixel_x = -24; - req_access = list(150) + pixel_x = -24 }, /obj/effect/turf_decal/tile/red{ dir = 8 @@ -697,7 +694,7 @@ normaldoorcontrol = 1; pixel_x = -4; pixel_y = -25; - req_access_txt = "150"; + req_access = list("syndicate"); specialfunctions = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -760,9 +757,9 @@ }, /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/external{ - id_tag = "syndicatecutter_bolt_starboard"; - req_access_txt = "150" + id_tag = "syndicatecutter_bolt_starboard" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/yogs/stealthcruiser) "bS" = ( @@ -783,9 +780,9 @@ }, /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/external{ - id_tag = "syndicatecutter_bolt_starboard"; - req_access_txt = "150" + id_tag = "syndicatecutter_bolt_starboard" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/yogs/stealthcruiser) "bW" = ( @@ -842,8 +839,7 @@ dir = 4 }, /obj/machinery/door/airlock/security/glass{ - name = "Equipment Room"; - req_access_txt = "150" + name = "Equipment Room" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -851,6 +847,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/shuttle/yogs/stealthcruiser) "qo" = ( @@ -865,11 +862,10 @@ /area/shuttle/yogs/stealthcruiser) "rY" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm{ +/obj/machinery/airalarm/syndicate{ dir = 4; icon_state = "alarm0"; - pixel_x = -24; - req_access = list(150) + pixel_x = -24 }, /turf/open/floor/plasteel/dark, /area/shuttle/yogs/stealthcruiser) @@ -878,8 +874,7 @@ dir = 4 }, /obj/machinery/door/airlock/hatch{ - name = "Cockpit"; - req_access_txt = "150" + name = "Cockpit" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -887,6 +882,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/shuttle/yogs/stealthcruiser) "xE" = ( @@ -916,13 +912,11 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/machinery/turretid{ - icon_state = "control_kill"; +/obj/machinery/turretid/syndicate{ lethal = 1; locked = 1; pixel_x = 30; - pixel_y = -33; - req_access = 150 + pixel_y = -33 }, /turf/open/floor/plasteel/dark, /area/shuttle/yogs/stealthcruiser) @@ -985,15 +979,13 @@ /area/shuttle/yogs/stealthcruiser) "JT" = ( /obj/machinery/recharge_station/fullupgrade, -/obj/machinery/power/apc{ - dir = 8; - name = "Syndicate Cutter APC"; - pixel_x = -25; - req_access = 150 - }, /obj/structure/cable{ icon_state = "0-2" }, +/obj/machinery/power/apc/syndicate{ + name = "Syndicate Cutter APC"; + pixel_x = -25 + }, /turf/open/floor/plating, /area/shuttle/yogs/stealthcruiser) "Lb" = ( @@ -1001,8 +993,7 @@ dir = 4 }, /obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_access_txt = "150" + name = "Engineering" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -1010,6 +1001,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/yogs/stealthcruiser) "Pz" = ( @@ -1022,7 +1014,7 @@ name = "Bridge Blast Door Control"; pixel_x = 25; pixel_y = 8; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 @@ -1032,21 +1024,17 @@ "SN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm{ - dir = 8; - icon_state = "alarm0"; +/obj/machinery/airalarm/syndicate{ pixel_x = 24; - req_access = 150 + dir = 8 }, /turf/open/floor/plating, /area/shuttle/yogs/stealthcruiser) "Vb" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/airalarm{ +/obj/machinery/airalarm/syndicate{ dir = 1; - pixel_y = -24; - req_access = null; - req_access_txt = "150" + pixel_y = -24 }, /obj/machinery/sleeper/syndie/fullupgrade{ dir = 1 diff --git a/_maps/shuttles/labour_box.dmm b/_maps/shuttles/labour_box.dmm index 07fb01ece3cc..8fd488f72c5e 100644 --- a/_maps/shuttles/labour_box.dmm +++ b/_maps/shuttles/labour_box.dmm @@ -38,7 +38,7 @@ id = "gulagshuttleflasher"; name = "Flash Control"; pixel_y = -26; - req_access_txt = "1" + req_access = list("security") }, /obj/machinery/light, /turf/open/floor/mineral/plastitanium/red, @@ -53,8 +53,7 @@ /area/shuttle/labor) "i" = ( /obj/machinery/door/airlock/titanium{ - name = "Labor Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -62,17 +61,18 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/shuttle/labor) "j" = ( /obj/machinery/door/airlock/titanium{ - name = "Labor Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/labor) "k" = ( diff --git a/_maps/shuttles/labour_delta.dmm b/_maps/shuttles/labour_delta.dmm index b716eaa6a5a2..63bc82229917 100644 --- a/_maps/shuttles/labour_delta.dmm +++ b/_maps/shuttles/labour_delta.dmm @@ -45,7 +45,7 @@ id = "gulagshuttleflasher"; name = "Flash Control"; pixel_y = -26; - req_access_txt = "1" + req_access = list("security") }, /obj/machinery/light, /turf/open/floor/mineral/plastitanium/red, @@ -60,8 +60,7 @@ /area/shuttle/labor) "j" = ( /obj/machinery/door/airlock/shuttle{ - name = "Labor Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Shuttle Airlock" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -75,12 +74,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/shuttle/labor) "k" = ( /obj/machinery/door/airlock/shuttle{ - name = "Labor Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Shuttle Airlock" }, /obj/effect/turf_decal/stripes/line{ dir = 2 @@ -89,6 +88,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plasteel/white, /area/shuttle/labor) "l" = ( diff --git a/_maps/shuttles/labour_gax.dmm b/_maps/shuttles/labour_gax.dmm index ca30244c7d31..d0d59a66e6ce 100644 --- a/_maps/shuttles/labour_gax.dmm +++ b/_maps/shuttles/labour_gax.dmm @@ -20,7 +20,7 @@ id = "gulagshuttleflasher"; name = "Flash Control"; pixel_y = -26; - req_access_txt = "1" + req_access = list(SECURITY) }, /obj/machinery/light, /turf/open/floor/mineral/plastitanium/red, @@ -53,8 +53,7 @@ dir = 8 }, /obj/machinery/door/airlock/titanium{ - name = "Labor Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -68,6 +67,7 @@ port_direction = 4; width = 9 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/plating, /area/shuttle/labor) "p" = ( @@ -133,13 +133,13 @@ /area/shuttle/labor) "U" = ( /obj/machinery/door/airlock/titanium{ - name = "Labor Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Shuttle Airlock" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/labor) "X" = ( diff --git a/_maps/shuttles/labour_kilo.dmm b/_maps/shuttles/labour_kilo.dmm index bd52a4808cc9..4205e6cd6a95 100644 --- a/_maps/shuttles/labour_kilo.dmm +++ b/_maps/shuttles/labour_kilo.dmm @@ -40,7 +40,7 @@ id = "gulagshuttleflasher"; name = "Flash Control"; pixel_y = -26; - req_access_txt = "1" + req_access = list("security") }, /obj/machinery/light, /obj/effect/turf_decal/tile/neutral, @@ -249,8 +249,7 @@ /area/shuttle/labor) "M" = ( /obj/machinery/door/airlock/titanium{ - name = "Labor Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Shuttle Airlock" }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -264,12 +263,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/mineral/plastitanium, /area/shuttle/labor) "P" = ( /obj/machinery/door/airlock/titanium{ - name = "Labor Shuttle Airlock"; - req_access_txt = "2" + name = "Labor Shuttle Airlock" }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -279,6 +278,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/mineral/plastitanium, /area/shuttle/labor) diff --git a/_maps/shuttles/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin_syndicate_dropship.dmm index af55602c4901..20785b2db47e 100644 --- a/_maps/shuttles/ruin_syndicate_dropship.dmm +++ b/_maps/shuttles/ruin_syndicate_dropship.dmm @@ -102,7 +102,7 @@ normaldoorcontrol = 1; pixel_x = -24; pixel_y = -6; - req_access_txt = "150"; + req_access = list("syndicate"); specialfunctions = 4 }, /turf/open/floor/plasteel/dark, @@ -142,8 +142,7 @@ /obj/machinery/door/airlock/hatch{ id_tag = "caravansyndicate3_bolt_port"; name = "External Airlock"; - normalspeed = 0; - req_access_txt = "150" + normalspeed = 0 }, /obj/docking_port/mobile{ dir = 2; @@ -160,6 +159,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/caravan/syndicate3) "ha" = ( @@ -213,7 +213,7 @@ name = "Bridge Blast Door Control"; pixel_x = -16; pixel_y = 5; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/machinery/button/door{ id = "caravansyndicate3_bolt_bridge"; @@ -221,7 +221,7 @@ normaldoorcontrol = 1; pixel_x = -16; pixel_y = -5; - req_access_txt = "150"; + req_access = list("syndicate"); specialfunctions = 4 }, /obj/effect/decal/cleanable/dirt, @@ -347,7 +347,7 @@ normaldoorcontrol = 1; pixel_x = -24; pixel_y = 6; - req_access_txt = "150"; + req_access = list("syndicate"); specialfunctions = 4 }, /turf/open/floor/plasteel/dark, @@ -454,16 +454,14 @@ /turf/open/floor/plasteel/dark, /area/shuttle/caravan/syndicate3) "Ij" = ( -/obj/machinery/turretid{ +/obj/machinery/turretid/syndicate{ ailock = 1; control_area = null; desc = "A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; - icon_state = "control_kill"; lethal = 1; name = "Shuttle turret control"; pixel_y = 34; - req_access = null; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -477,8 +475,7 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/hatch{ id_tag = "caravansyndicate3_bolt_bridge"; - name = "Bridge"; - req_access_txt = "150" + name = "Bridge" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -499,6 +496,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/shuttle/caravan/syndicate3) "Jv" = ( @@ -508,8 +506,7 @@ /obj/machinery/door/airlock/hatch{ id_tag = "caravansyndicate3_bolt_starboard"; name = "External Airlock"; - normalspeed = 0; - req_access_txt = "150" + normalspeed = 0 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -518,6 +515,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/caravan/syndicate3) "Lq" = ( @@ -635,8 +633,7 @@ /area/shuttle/caravan/syndicate3) "Vf" = ( /obj/machinery/door/airlock/hatch{ - name = "Ready Room"; - req_access_txt = "150" + name = "Ready Room" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -657,6 +654,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel/dark, /area/shuttle/caravan/syndicate3) "Wr" = ( diff --git a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm index 91766c07c474..e37f895a800a 100644 --- a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm +++ b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm @@ -27,8 +27,7 @@ dir = 8; name = "Syndicate Fighter APC"; pixel_x = -25; - req_access = null; - req_access_txt = "150" + req_access = list("syndicate") }, /obj/machinery/computer/security{ dir = 1; @@ -42,8 +41,7 @@ /obj/machinery/door/airlock/hatch{ id_tag = "caravansyndicate1_bolt"; name = "External Airlock"; - normalspeed = 0; - req_access_txt = "150" + normalspeed = 0 }, /obj/effect/decal/cleanable/dirt, /obj/docking_port/mobile{ @@ -67,23 +65,21 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/shuttle/caravan/syndicate1) "h" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/obj/machinery/turretid{ +/obj/machinery/turretid/syndicate{ ailock = 1; control_area = null; desc = "A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; - icon_state = "control_kill"; lethal = 1; name = "Shuttle turret control"; pixel_x = 32; pixel_y = -28; - req_access = null; - req_access_txt = "150" }, /mob/living/simple_animal/hostile/syndicate/ranged/smg/pilot{ environment_smash = 0 @@ -116,7 +112,7 @@ name = "External Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; - req_access_txt = "150"; + req_access = list("syndicate"); specialfunctions = 4 }, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/shuttles/whiteship_miner.dmm b/_maps/shuttles/whiteship_miner.dmm index 02a05cc6a6f1..655394274916 100644 --- a/_maps/shuttles/whiteship_miner.dmm +++ b/_maps/shuttles/whiteship_miner.dmm @@ -1128,8 +1128,7 @@ }, /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; - pixel_x = -28; - req_access_txt = "0" + pixel_x = -28 }, /turf/open/floor/plasteel/showroomfloor, /area/shuttle/abandoned) diff --git a/_maps/templates/infiltrator_base.dmm b/_maps/templates/infiltrator_base.dmm index 4624825e6751..7b5038d0e23f 100644 --- a/_maps/templates/infiltrator_base.dmm +++ b/_maps/templates/infiltrator_base.dmm @@ -168,9 +168,8 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 9 }, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = 150 +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -290,9 +289,8 @@ /area/yogs/infiltrator_base) "aH" = ( /obj/structure/chair/stool, -/obj/machinery/airalarm{ +/obj/machinery/airalarm/syndicate{ pixel_y = 24; - req_access = list(150) }, /obj/effect/landmark/start/infiltrator, /obj/effect/turf_decal/tile/bar, @@ -424,7 +422,7 @@ "aW" = ( /obj/structure/chair/stool, /obj/machinery/firealarm{ - dir = 4; + dir = 8; pixel_x = 26 }, /obj/effect/landmark/start/infiltrator, @@ -559,10 +557,10 @@ /obj/effect/turf_decal/bot_white, /obj/machinery/door/airlock/centcom{ name = "Equipment Room"; - opacity = 1; - req_access_txt = "150" + opacity = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/pod/dark, /area/yogs/infiltrator_base) "bk" = ( @@ -589,9 +587,8 @@ /turf/open/floor/carpet/black, /area/yogs/infiltrator_base) "bn" = ( -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = 150 +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/structure/bed, /obj/item/bedsheet/black, @@ -654,7 +651,7 @@ pixel_y = 32 }, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /turf/open/floor/plasteel/dark/side{ @@ -678,18 +675,14 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/machinery/airalarm{ +/obj/machinery/airalarm/syndicate{ dir = 8; - icon_state = "alarm0"; - pixel_x = 24; - req_access = 150 + pixel_x = 24 }, -/obj/machinery/turretid{ - icon_state = "control_kill"; +/obj/machinery/turretid/syndicate{ lethal = 1; locked = 1; pixel_y = 28; - req_access = 150 }, /turf/open/floor/plasteel/dark/side{ dir = 5 @@ -740,10 +733,8 @@ /area/yogs/infiltrator_base/jail) "bE" = ( /obj/structure/bed, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = list(150); - req_access_txt = "0" +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -759,9 +750,8 @@ /obj/structure/chair{ dir = 4 }, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = 150 +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/machinery/light/small{ dir = 1 @@ -931,13 +921,13 @@ /area/yogs/infiltrator_base/jail) "bY" = ( /obj/machinery/door/airlock/security/glass{ - name = "Cell 2"; - req_access_txt = "150" + name = "Cell 2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/yogs/infiltrator_base/jail) "bZ" = ( @@ -1021,7 +1011,7 @@ "ch" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ - dir = 8; + dir = 4; pixel_x = -26 }, /obj/effect/turf_decal/tile/red{ @@ -1082,7 +1072,7 @@ icon_state = "control_stun"; name = "Security turret control"; pixel_x = 26; - req_access = 150 + req_access = list("syndicate") }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red, @@ -1097,9 +1087,8 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = 150 +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /obj/structure/table, /obj/item/storage/toolbox/syndicate, @@ -1154,18 +1143,16 @@ /area/yogs/infiltrator_base) "cr" = ( /obj/machinery/door/airlock/external/glass{ - name = "E.V.A. Foyer"; - req_access_txt = "150" + name = "E.V.A. Foyer" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "cs" = ( -/obj/machinery/airalarm{ +/obj/machinery/airalarm/syndicate{ dir = 4; - icon_state = "alarm0"; - pixel_x = -24; - req_access = list(150) + pixel_x = -24 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -1216,21 +1203,19 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/airalarm{ - pixel_y = 24; - req_access = list(150); - req_access_txt = "0" +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 }, /turf/open/floor/plasteel, /area/yogs/infiltrator_base/jail) "cx" = ( /obj/machinery/door/airlock/security/glass{ - name = "Cell 1"; - req_access_txt = "150" + name = "Cell 1" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/yogs/infiltrator_base/jail) "cy" = ( @@ -1265,10 +1250,10 @@ /turf/open/floor/mineral/plastitanium, /area/yogs/infiltrator_base) "cC" = ( +/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ - dir = 4 + dir = 1 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "cD" = ( @@ -1281,7 +1266,7 @@ "cF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ - dir = 8 + dir = 4 }, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) @@ -1394,12 +1379,12 @@ /area/yogs/infiltrator_base/jail) "cN" = ( /obj/machinery/door/airlock/external/glass{ - name = "E.V.A. Equipment"; - req_access_txt = "150" + name = "E.V.A. Equipment" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/yogs/infiltrator_base/jail) "cO" = ( @@ -1424,15 +1409,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) -"cR" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/yogs/infiltrator_base) "cS" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -1442,12 +1418,12 @@ /area/yogs/infiltrator_base) "cT" = ( /obj/machinery/door/airlock/external/glass{ - name = "E.V.A. Equipment"; - req_access_txt = "150" + name = "E.V.A. Equipment" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "cU" = ( @@ -1496,10 +1472,9 @@ /turf/open/floor/plasteel, /area/yogs/infiltrator_base) "cZ" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/yogs/infiltrator_base) "da" = ( @@ -1605,12 +1580,11 @@ /turf/open/floor/plating/asteroid/snow/airless, /area/yogs/infiltrator_base/outside) "di" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating, /area/yogs/infiltrator_base) "dj" = ( @@ -2244,7 +2218,7 @@ bM cd cp cD -cR +bP aj aj aj diff --git a/_maps/templates/lazy_templates/chapel1.dmm b/_maps/templates/lazy_templates/chapel1.dmm index eb24c365d12d..d05ed777201d 100644 --- a/_maps/templates/lazy_templates/chapel1.dmm +++ b/_maps/templates/lazy_templates/chapel1.dmm @@ -49,8 +49,7 @@ "dl" = ( /obj/machinery/door/window{ dir = 8; - name = "Mass Driver"; - req_access_txt = "22" + name = "Mass Driver" }, /obj/machinery/mass_driver{ dir = 4; @@ -60,6 +59,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 8 + }, /turf/open/floor/plating, /area/chapel/main) "du" = ( @@ -142,13 +144,13 @@ /area/chapel/main) "gS" = ( /obj/machinery/door/airlock/public/glass{ - name = "Chapel Office"; - req_access_txt = "22" + name = "Chapel Office" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/office) "hp" = ( @@ -243,8 +245,7 @@ /area/chapel/main) "mP" = ( /obj/machinery/door/airlock{ - name = "Crematorium"; - req_access_txt = "27" + name = "Crematorium" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -261,6 +262,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plasteel/dark, /area/chapel/office) "nb" = ( @@ -496,8 +498,10 @@ "Gl" = ( /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ - name = "Coffin Storage"; - req_access_txt = "22" + name = "Coffin Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -567,8 +571,7 @@ /area/chapel/main) "ML" = ( /obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_access_txt = "27" + name = "Crematorium Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -579,12 +582,13 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plating, /area/template_noop) "Ny" = ( /obj/machinery/door/morgue{ name = "Confession Booth (Chaplain)"; - req_access_txt = "22" + req_access = list("chapel_office") }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -624,8 +628,7 @@ /area/chapel/main) "PO" = ( /obj/machinery/door/airlock/maintenance{ - name = "Chapel Maintenance"; - req_access_txt = "12" + name = "Chapel Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -645,14 +648,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/template_noop) "Qh" = ( /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ dir = 8; - name = "Coffin Storage"; - req_access_txt = "22" + name = "Coffin Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -664,7 +670,7 @@ /turf/open/floor/plasteel/grimy, /area/chapel/office) "Sa" = ( -/obj/structure/altar_of_gods, +/obj/structure/table/altar_of_gods, /turf/open/floor/plasteel/dark, /area/chapel/main) "Sf" = ( @@ -851,7 +857,8 @@ icon_state = "airlock_control_standby"; id = "chapelgun"; name = "Mass Driver Controller"; - pixel_x = 24 + pixel_x = 24; + req_access = list("chapel_office") }, /turf/open/floor/plasteel/dark, /area/chapel/main) diff --git a/_maps/templates/lazy_templates/chapel2.dmm b/_maps/templates/lazy_templates/chapel2.dmm index 34bf2e658ad4..0f47d4878094 100644 --- a/_maps/templates/lazy_templates/chapel2.dmm +++ b/_maps/templates/lazy_templates/chapel2.dmm @@ -150,8 +150,7 @@ /area/chapel/main) "gJ" = ( /obj/machinery/door/airlock/maintenance{ - name = "Chapel Maintenance"; - req_access_txt = "12" + name = "Chapel Maintenance" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -162,6 +161,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/template_noop) "gL" = ( @@ -233,8 +233,7 @@ "kK" = ( /obj/machinery/door/window{ dir = 8; - name = "Mass Driver"; - req_access_txt = "22" + name = "Mass Driver" }, /obj/machinery/mass_driver{ dir = 4; @@ -245,6 +244,9 @@ dir = 8 }, /obj/item/reagent_containers/food/snacks/grown/poppy, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 8 + }, /turf/open/floor/plating, /area/chapel/office) "kU" = ( @@ -275,9 +277,9 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_access_txt = "27" + name = "Crematorium Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plating, /area/template_noop) "mq" = ( @@ -509,7 +511,7 @@ "Dj" = ( /obj/machinery/door/morgue{ name = "Confession Booth (Chaplain)"; - req_access_txt = "22" + req_access = list("chapel_office") }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -722,9 +724,9 @@ /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/public/glass{ - name = "Chapel Office"; - req_access_txt = "22" + name = "Chapel Office" }, +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plasteel/dark, /area/chapel/office) "Kc" = ( @@ -742,8 +744,10 @@ /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ dir = 8; - name = "Coffin Storage"; - req_access_txt = "22" + name = "Coffin Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -790,7 +794,7 @@ /area/chapel/office) "Nz" = ( /obj/structure/railing, -/obj/structure/altar_of_gods, +/obj/structure/table/altar_of_gods, /turf/open/floor/carpet/red, /area/chapel/main) "NN" = ( @@ -873,8 +877,10 @@ "Sq" = ( /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ - name = "Coffin Storage"; - req_access_txt = "22" + name = "Coffin Storage" + }, +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/chapel/office) @@ -1081,8 +1087,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock{ - name = "Crematorium"; - req_access_txt = "27" + name = "Crematorium" }, /obj/structure/cable{ icon_state = "1-2" @@ -1093,6 +1098,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plasteel/dark, /area/chapel/office) "Zw" = ( diff --git a/_maps/templates/lazy_templates/clerk_box.dmm b/_maps/templates/lazy_templates/clerk_box.dmm index a4ddeccf4cb8..3df3dd1d9cca 100644 --- a/_maps/templates/lazy_templates/clerk_box.dmm +++ b/_maps/templates/lazy_templates/clerk_box.dmm @@ -21,9 +21,7 @@ /turf/open/floor/plasteel, /area/clerk) "c" = ( -/obj/machinery/door/window/southleft{ - req_access_txt = "36" - }, +/obj/machinery/door/window/southleft, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -36,6 +34,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/windoor/access/all/service/clerk, /turf/open/floor/plasteel, /area/clerk) "d" = ( @@ -76,13 +75,15 @@ id = "giftshop"; name = "Gift Shop Internal Shutters"; pixel_x = 26; - pixel_y = 24 + pixel_y = 24; + req_access = list("clerk") }, /obj/machinery/button/door{ id = "giftshop_ext"; name = "Gift Shop External Shutters"; pixel_x = 40; - pixel_y = 24 + pixel_y = 24; + req_access = list("clerk") }, /obj/structure/cable{ icon_state = "1-8" @@ -327,8 +328,7 @@ /area/clerk) "A" = ( /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -346,6 +346,7 @@ /obj/effect/turf_decal/tile/green/opposingcorners{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel, /area/clerk) "B" = ( @@ -528,8 +529,7 @@ /area/clerk) "Q" = ( /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -544,6 +544,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel, /area/clerk) "R" = ( diff --git a/_maps/templates/lazy_templates/clerk_gamble.dmm b/_maps/templates/lazy_templates/clerk_gamble.dmm index 8cafe09ef10c..6e9f2e547bd7 100644 --- a/_maps/templates/lazy_templates/clerk_gamble.dmm +++ b/_maps/templates/lazy_templates/clerk_gamble.dmm @@ -275,8 +275,7 @@ /area/clerk) "R" = ( /obj/machinery/door/airlock{ - name = "Gambling Hall"; - req_access_txt = "36" + name = "Gambling Hall" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -287,6 +286,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/wood, /area/clerk) "S" = ( @@ -302,11 +302,11 @@ dir = 1 }, /obj/machinery/door/airlock{ - name = "Gambling Hall"; - req_access_txt = "36" + name = "Gambling Hall" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/wood, /area/clerk) "U" = ( diff --git a/_maps/templates/lazy_templates/clerk_meta.dmm b/_maps/templates/lazy_templates/clerk_meta.dmm index cf9d20b43e56..c332bcdfcf1e 100644 --- a/_maps/templates/lazy_templates/clerk_meta.dmm +++ b/_maps/templates/lazy_templates/clerk_meta.dmm @@ -198,8 +198,7 @@ /area/clerk) "A" = ( /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -217,6 +216,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel/dark, /area/clerk) "B" = ( @@ -306,8 +306,7 @@ /area/clerk) "O" = ( /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -321,6 +320,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/wood, /area/clerk) "P" = ( @@ -361,14 +361,14 @@ }, /obj/effect/turf_decal/tile/yellow/opposingcorners, /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/clerk, /turf/open/floor/plasteel/dark, /area/clerk) "T" = ( diff --git a/_maps/templates/lazy_templates/clerk_pod.dmm b/_maps/templates/lazy_templates/clerk_pod.dmm index 8a532dab3bf5..64c6a4df0820 100644 --- a/_maps/templates/lazy_templates/clerk_pod.dmm +++ b/_maps/templates/lazy_templates/clerk_pod.dmm @@ -245,8 +245,7 @@ dir = 4 }, /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 8 @@ -406,8 +405,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 4 @@ -439,8 +437,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock{ - name = "Gift Shop"; - req_access_txt = "36" + name = "Gift Shop" }, /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 8 diff --git a/_maps/templates/shelter_2.dmm b/_maps/templates/shelter_2.dmm index aabe42b6a117..5bbccc491135 100644 --- a/_maps/templates/shelter_2.dmm +++ b/_maps/templates/shelter_2.dmm @@ -146,8 +146,8 @@ alert = 0; desc = "A display case containing an expensive forgery, probably."; pixel_y = -4; - req_access_txt = "48"; - start_showpiece_type = /obj/item/fakeartefact + start_showpiece_type = /obj/item/fakeartefact; + req_access = list("mining") }, /turf/open/floor/carpet/black, /area/survivalpod) diff --git a/_maps/templates/shipbreaker/old_repair.dmm b/_maps/templates/shipbreaker/old_repair.dmm index faf463f9b3e9..39de43049061 100644 --- a/_maps/templates/shipbreaker/old_repair.dmm +++ b/_maps/templates/shipbreaker/old_repair.dmm @@ -42,15 +42,14 @@ /turf/open/floor/mineral/titanium/airless, /area/template_noop) "l" = ( -/obj/machinery/door/airlock/external/glass{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external/glass, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/plating/airless, /area/template_noop) "m" = ( diff --git a/_maps/templates/shipbreaker/old_syndicate.dmm b/_maps/templates/shipbreaker/old_syndicate.dmm index 372dd1e7849d..b604e1135437 100644 --- a/_maps/templates/shipbreaker/old_syndicate.dmm +++ b/_maps/templates/shipbreaker/old_syndicate.dmm @@ -15,9 +15,9 @@ /area/template_noop) "e" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Storage and Crew Quarters"; - req_access_txt = "150" + name = "Storage and Crew Quarters" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/mineral/plastitanium/airless/broken, /area/template_noop) "f" = ( @@ -32,9 +32,9 @@ /area/template_noop) "g" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Bridge"; - req_access_txt = "150" + name = "Bridge" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/mineral/plastitanium/airless/broken, /area/template_noop) "h" = ( @@ -124,9 +124,8 @@ /turf/open/floor/mineral/plastitanium/red, /area/template_noop) "M" = ( -/obj/machinery/door/airlock/external/glass{ - req_access_txt = "150" - }, +/obj/machinery/door/airlock/external/glass, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/mineral/plastitanium/red/airless, /area/template_noop) "O" = ( diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index fd42046c46a9..35d83e3fe700 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -1,155 +1,248 @@ -// Security equipment, security records, gulag item storage, secbots -#define ACCESS_SECURITY 1 -/// Brig cells+timers, permabrig, gulag+gulag shuttle, prisoner management console -#define ACCESS_BRIG 2 - /// Armory, gulag teleporter, execution chamber -#define ACCESS_ARMORY 3 -///Detective's office, forensics lockers, security+medical records -#define ACCESS_FORENSICS_LOCKERS 4 -/// Medical general access -#define ACCESS_MEDICAL 5 -/// Morgue access -#define ACCESS_MORGUE 6 -/// R&D department, burn chamber on some maps -#define ACCESS_TOX 7 -/// Toxins storage, burn chamber on some maps -#define ACCESS_TOX_STORAGE 8 -/// Genetics access -#define ACCESS_GENETICS 9 -/// Engineering area, power monitor, power flow control console -#define ACCESS_ENGINE 10 -///APCs, EngiVend/YouTool, engineering equipment lockers -#define ACCESS_ENGINE_EQUIP 11 -#define ACCESS_MAINT_TUNNELS 12 -#define ACCESS_EXTERNAL_AIRLOCKS 13 -#define ACCESS_CHANGE_IDS 15 -#define ACCESS_AI_UPLOAD 16 -#define ACCESS_TELEPORTER 17 -#define ACCESS_EVA 18 -/// Bridge, EVA storage windoors, gateway shutters, AI integrity restorer, clone record deletion, comms console -#define ACCESS_HEADS 19 -#define ACCESS_CAPTAIN 20 -#define ACCESS_ALL_PERSONAL_LOCKERS 21 -#define ACCESS_CHAPEL_OFFICE 22 -#define ACCESS_TECH_STORAGE 23 -#define ACCESS_ATMOSPHERICS 24 -#define ACCESS_BAR 25 -#define ACCESS_JANITOR 26 -#define ACCESS_CREMATORIUM 27 -#define ACCESS_KITCHEN 28 -#define ACCESS_ROBO_CONTROL 29 -#define ACCESS_RD 30 -#define ACCESS_CARGO 31 -#define ACCESS_CONSTRUCTION 32 -#define ACCESS_CHEMISTRY 33 -#define ACCESS_HYDROPONICS 35 -#define ACCESS_MANUFACTURING 36 // used by clerk -#define ACCESS_LIBRARY 37 -#define ACCESS_LAWYER 38 -#define ACCESS_VIROLOGY 39 -#define ACCESS_CMO 40 -#define ACCESS_QM 41 -#define ACCESS_COURT 42 -#define ACCESS_SURGERY 45 -#define ACCESS_THEATRE 46 -#define ACCESS_RESEARCH 47 -#define ACCESS_MINING 48 -#define ACCESS_MAILSORTING 50 -#define ACCESS_VAULT 53 -#define ACCESS_MINING_STATION 54 -#define ACCESS_XENOBIOLOGY 55 -#define ACCESS_CE 56 -#define ACCESS_HOP 57 -#define ACCESS_HOS 58 -/// Request console announcements -#define ACCESS_RC_ANNOUNCE 59 -/// Used for events which require at least two people to confirm them -#define ACCESS_KEYCARD_AUTH 60 -/// has access to the entire telecomms satellite / machinery -#define ACCESS_TCOMSAT 61 -#define ACCESS_GATEWAY 62 -/// Outer brig doors, department security posts -#define ACCESS_SEC_DOORS 63 -/// For releasing minerals from the ORM -#define ACCESS_MINERAL_STOREROOM 64 -#define ACCESS_MINISAT 65 -/// Weapon authorization for secbots -#define ACCESS_WEAPONS 66 -/// NTnet diagnostics/monitoring software -#define ACCESS_NETWORK 67 -///Cloning room and clone pod ejection -#define ACCESS_CLONING 68 -///Paramedic Office -#define ACCESS_PARAMEDIC 69 -///Access to the Network admins monitoring room -#define ACCESS_TCOM_ADMIN 70 -#define ACCESS_FREEMINER 71 -#define ACCESS_FREEMINER_CAPTAIN 72 -#define ACCESS_FREEMINER_ENGINEER 73 -//Yogs: Brig Physician access, used for their locker and offices if one is added -#define ACCESS_BRIG_PHYS 74 -#define ACCESS_ROBOTICS 75 // Access to robotics airlocks & buttons only, old ACCESS_ROBOTICS renamed to ACCESS_ROBO_CONTROL -#define ACCESS_SECURE_TECH_STORAGE 76 // Creating this to cleanly fix door remote bug will be equivalent to ACCESS_AI_UPLOAD for Cap and RD -#define ACCESS_PSYCH 77 // For the psych's back office area with the flashes/chem machines -#define ACCESS_RND 78 //rnd console -#define ACCESS_SERVHALL 79 - - //BEGIN CENTCOM ACCESS - /*Should leave plenty of room if we need to add more access levels. - Mostly for admin fun times.*/ -/// General facilities. CentCom ferry. -#define ACCESS_CENT_GENERAL 101 -/// Thunderdome. -#define ACCESS_CENT_THUNDER 102 -/// Special Ops. Captain's display case, Marauder and Seraph mechs. -#define ACCESS_CENT_SPECOPS 103 -/// Medical/Research -#define ACCESS_CENT_MEDICAL 104 -/// Living quarters. -#define ACCESS_CENT_LIVING 105 -/// Generic storage areas. -#define ACCESS_CENT_STORAGE 106 -/// Teleporter. -#define ACCESS_CENT_TELEPORTER 107 -/// Captain's office/ID comp/AI. -#define ACCESS_CENT_CAPTAIN 109 -/// The non-existent CentCom Bar -#define ACCESS_CENT_BAR 110 - - //The Syndicate -/// General Syndicate Access. Includes Syndicate mechs and ruins. -#define ACCESS_SYNDICATE 150 -/// Nuke Op Leader Access -#define ACCESS_SYNDICATE_LEADER 151 - - //Away Missions or Ruins - /*For generic away-mission/ruin access. Why would normal crew have access to a long-abandoned derelict - or a 2000 year-old temple? */ -/// Away general facilities. -#define ACCESS_AWAY_GENERAL 200 -/// Away maintenance -#define ACCESS_AWAY_MAINT 201 -/// Away medical -#define ACCESS_AWAY_MED 202 -/// Away security -#define ACCESS_AWAY_SEC 203 -/// Away engineering -#define ACCESS_AWAY_ENGINE 204 -///Away generic access -#define ACCESS_AWAY_GENERIC1 205 -#define ACCESS_AWAY_GENERIC2 206 -#define ACCESS_AWAY_GENERIC3 207 -#define ACCESS_AWAY_GENERIC4 208 - - //Special, for anything that's basically internal -#define ACCESS_BLOODCULT 250 -#define ACCESS_CLOCKCULT 251 - - - // Mech Access, allows maintanenace of internal components and altering keycard requirements. -#define ACCESS_MECH_MINING 300 -#define ACCESS_MECH_MEDICAL 301 -#define ACCESS_MECH_SECURITY 302 -#define ACCESS_MECH_SCIENCE 303 -#define ACCESS_MECH_ENGINE 304 -#define ACCESS_MECH_FREEMINER 310 +/* READ BEFORE ADDING/REMOVING ACCESSES +* Access is broken down by department, department special functions/rooms, and departmental roles +* The first access for the department will always be its general access function +* Please try to make the strings for any new accesses as close to the name of the define as possible +* If you are going to add an access to the list, make sure to also add it to its respective region further below +* If you're varediting on the map, it uses the string. If you're editing the object directly, use the define name +* +* NOTE: Some of this documentation may be inaccurate, as it originates from /TG/ -Myriad +*/ + + +//--- COMMAND ---// + +/// Command General Access, used for accessing the doors to the bridge, the communications console, and the general access that Tablet/Computer Programs check for "heads". +#define ACCESS_COMMAND "command" +/// Access to critical-to-function AI rooms and equipment such as the AI Core, AI Upload, AI mini-sat maintenance, turret controls, and foam dispensers. +#define ACCESS_AI_MASTER "ai_master" +/// Access to non-critical rooms in the mini-sat the AI usually resides in. Given to Network Admins to let them do maintenance on the AI. +#define ACCESS_AI_SAT "ai_sat" +/// Access to the Teleporter Room, and some cargo crates. +#define ACCESS_TELEPORTER "teleporter" +/// Access to the EVA Storage Room, and some cargo crates. +#define ACCESS_EVA "eva" +/// Access to the vault on the station, for accessing the station's budget, the nuke core, or the Ore Silo. +#define ACCESS_VAULT "vault" +/// Access to make an announcement through the Requests Console found in an office. +#define ACCESS_RC_ANNOUNCE "rc_announce" +/// Access used for events (Red Alert, BSA, Emergency Maintenance) which require at least two people to swipe at the same time to authorize it +#define ACCESS_KEYCARD_AUTH "keycard_auth" +/// Access used to override "personal control" on all personal lockers, meaning you are able to open any of those lockers/wardrobes. +#define ACCESS_PERSONAL_LOCKERS "personal_lockers" +/// Access used for Access-Changing Programs, this one will unlock all options that can be ever given via that program. +#define ACCESS_CHANGE_IDS "change_ids" +/// Access used for the Captain's personal quarters in mapping, the spare ID cabinet, and the antique gun (but only on gamma alert or above). +#define ACCESS_CAPTAIN "captain" + + +//--- SECURITY ---// + +/// Security's General Access, armaments vendor, security lockers, and other secure gear. Applied to things to Officers and Wardens should access, but never Lawyers or Detectives. +#define ACCESS_SECURITY "security" +/// Access to the front doors of the Brig, the "secure" portion of the Courtroom, and department outposts. Given to Lawyers, Heads of Staff, and Detectives. +#define ACCESS_SEC_BASIC "sec_basic" +/// Access to brig cells, brig timers, permabrig, gulag, gulag teleporter, gulag shuttle, prisoner management console, and some security cargo crates. +#define ACCESS_BRIG "brig" +/// Access to the armory, security incinerator (when present), and the execution/re-education chamber. +#define ACCESS_ARMORY "armory" +/// Access for the Detective, their office, and medical data console. Always mixed with ACCESS_SECURITY in the security office/delivery windoor, and the arrivals and departure sec checkpoints. +#define ACCESS_DETECTIVE "detective" +/// Access for the Brig Physician and their locker, also used for the Brig Infirmary doors. +#define ACCESS_BRIG_PHYS "brig_phys" +/// The "Weapons Permit" Access, or the one that lets you walk past secbots without them charging at you as you hold your weaponry. +#define ACCESS_WEAPONS_PERMIT "weapons_permit" +/// Access used for the Head of Security's personal quarters in mapping, as well as other HoS-related things. +#define ACCESS_HOS "hos" + + +//--- ENGINEERING ---// + +/// Engineering General Access, grants access to the standard parts of Engineering and the Engine Room. +#define ACCESS_ENGINEERING "engineering" +/// Access to Atmospherics Sections of the Engineering Department, as well as air alarms. +#define ACCESS_ATMOSPHERICS "atmospherics" +/// Access to all maintenance tunnels on the station. This overrides any "departmental maintenance" access, this has free roaming range everywhere. +#define ACCESS_MAINT_TUNNELS "maint_tunnels" +/// Access to all external "space facing" airlocks on the station. Used such that people don't easily "jump ship", or restict free ingress/egress to only a few points on the station. +#define ACCESS_EXTERNAL_AIRLOCKS "external airlocks" +/// Access to get into APCs, engineering equipment lockers, typically mapped in for key power rooms across the station, engineering vending machines, emitters, and some other stuff. +#define ACCESS_ENGINE_EQUIP "engine_equip" +/// Access to "construction" areas of the station. However, in mapping, it's also used to get access to the front door and lathe room of the engineering department. +#define ACCESS_CONSTRUCTION "construction" +/// Access to the Tech Storage room, containing lots of machine boards and other miscellaneous engineering gear. +#define ACCESS_TECH_STORAGE "tech_storage" +/// Access to the Secure Tech Storage room, containing unreplaceable high-value machine boards. +#define ACCESS_SECURE_TECH "secure_tech" +/// Access to the Telecomms Server Room, traffic control console, machinery, and tablets. +#define ACCESS_TCOMMS "tcomms" +/// Access needed to view message logs recorded on the message monitor console in Telecomms. +#define ACCESS_TCOMMS_ADMIN "tcomms_admin" +/// Access to the Auxiliary Base Room, as well as the ability to launch it. +#define ACCESS_AUX_BASE "aux_base" +/// Access for the Chief Engineer's office, as well as some other CE-related things. +#define ACCESS_CE "ce" + + +//--- MEDICAL ---// + +/// General access to Medbay, like the front doors, the treatment center, the medical records console, defibrillator mounts, and more. +#define ACCESS_MEDICAL "medical" +/// Access to the surgery rooms, as well as the equipment and buttons there. +#define ACCESS_SURGERY "surgery" +/// Access to the Paramedic Staging Area. +#define ACCESS_PARAMEDIC "paramedic" +/// Access to the Morgue. +#define ACCESS_MORGUE "morgue" +/// Access to the chemistry lab, or the smaller room in medical with the multiple chem dispensers and pill pressers. The Chemist's main position. +#define ACCESS_CHEMISTRY "chemistry" +/// Access to the cloning lab, usually adjacent to the genetics lab. Given to Medical Doctors so they can't also enter Genetics. +#define ACCESS_CLONING "cloning" +/// Access to the Virology portion of the medical department, as well as the virology crate. +#define ACCESS_VIROLOGY "virology" +/// Access to the Psychologist's office. +#define ACCESS_PSYCHOLOGY "psychology" +/// Access for the Chief Medical Officer's personal quarters in mapping, as well as some other CMO-related things. +#define ACCESS_CMO "cmo" + + +//--- SUPPLY ---// + +/// General access needed to enter Cargo, allows entry into the Cargo Office and Mail/Delivery Office. +#define ACCESS_CARGO "cargo" +/// Access to the Cargo Bay and Warehouse. Separated from the above to prevent miners processing cargo. +#define ACCESS_CARGO_BAY "cargo_bay" +/// Access to the "on-station" Mining Portion of the Cargo Department. +#define ACCESS_MINING "mining" +/// Access to the "off-station" Mining Station, which contains gear dedicated for miners to do their job best, as well as seek shelter from the inhospitable elements. +#define ACCESS_MINING_STATION "mining_station" +/// Access for the Quartermaster's personal quarters in mapping, as well as some other QM-related things. +#define ACCESS_QM "qm" + + +//--- SCIENCE ---// + +/// General access for Science, allows for entry to the general hallways of Science, as well as the main lathe room. +#define ACCESS_SCIENCE "science" +/// Access needed to research tech nodes at R&D consoles. May also be needed to access some scientific equipment. +#define ACCESS_RESEARCH "research" +/// Access to the Toxins Mixing Lab and Toxins Test Area equipment. +#define ACCESS_TOXINS "toxins" +/// Access to the Toxins Storage Room, where all of the bomb-making gases are stored. +#define ACCESS_TOXINS_STORAGE "toxins_storage" +/// Access to the Experimentation Lab, containing the E.X.P.E.R.I-MENTOR. Uses of this access is set to change in the future. +#define ACCESS_EXPERIMENTATION "experimentation" +/// Access to the Genetics division of Science. +#define ACCESS_GENETICS "genetics" +/// Access to the Robotics division of Science, as well as opening up silicon cyborgs and other simple robots. +#define ACCESS_ROBOTICS "robotics" +/// Access to the Robotics division of Science, as well as opening up silicon cyborgs and other simple robots. +#define ACCESS_ROBO_CONTROL "robo_control" +/// Access to the Xenobiology division of Science. +#define ACCESS_XENOBIOLOGY "xenobiology" +/// Access to the research Server Room, containing the important R&D research servers and AI networking machines. +#define ACCESS_RND_SERVERS "rnd_servers" +/// Access for the Research Director's personal quarters in mapping, the R&D server room, as well as some other RD-related things. +#define ACCESS_RD "rd" + + +//--- SERVICE ---// + +/// General access for Service, allows for entry to the Service Hallway. +#define ACCESS_SERVICE "service" +/// Access to the Theatre, as well as other vending machines related to the theatre. Sometimes also used as the "clown's" access in code. +#define ACCESS_THEATRE "theatre" +/// Access to the Chaplain's office. +#define ACCESS_CHAPEL_OFFICE "chapel_office" +/// Access to the chapel's crematorium. +#define ACCESS_CREMATORIUM "crematorium" +/// Access to the curator's private rooms in the Library and the trophy display cases, as well as access both into and out of the Library via Maintenance. +#define ACCESS_LIBRARY "library" +/// Access to the Bar, the Bar's Backroom, the bar sign, the bar robot portal, and the bar's vending machines. Some other bar-things too. +#define ACCESS_BAR "bar" +/// Access to the Kitchen, the Kitchen's Coldroom, the kitchen's vending machines, and the food robot portal. Some other chef-things too. +#define ACCESS_KITCHEN "kitchen" +/// Access to the Botany Division of the station and some other Botanist things. +#define ACCESS_HYDROPONICS "hydroponics" +/// Access to the Janitor's room, and some tablet apps for control of the station's janitorial equipment. +#define ACCESS_JANITOR "janitor" +/// Access to the Lawyer's office. +#define ACCESS_LAWYER "lawyer" +/// Access to the Gift Shop's back doors. +#define ACCESS_CLERK "clerk" +/// Access used for the Head of Personnel's personal quarters in mapping, as well as the security console and other HoP-related things. +#define ACCESS_HOP "hop" + + + +//--- RUINS ---// +// For generic ruin access. Why would normal crew have access to a long-abandoned derelict or a 2000 year-old temple? + +#define ACCESS_RUINS_GENERAL "ruins_general" +#define ACCESS_RUINS_COMMAND "ruins_command" +#define ACCESS_RUINS_SECURITY "ruins_security" +#define ACCESS_RUINS_ENGINEERING "ruins_engineering" +#define ACCESS_RUINS_MEDICAL "ruins_medical" +#define ACCESS_RUINS_SUPPLY "ruins_supply" +#define ACCESS_RUINS_SCIENCE "ruins_science" +#define ACCESS_RUINS_MAINTENANCE "ruins_maintenance" +#define ACCESS_RUINS_MATERIALS "ruins_materials" +#define ACCESS_RUINS_GENERIC1 "ruins_generic1" +#define ACCESS_RUINS_GENERIC2 "ruins_generic2" +#define ACCESS_RUINS_GENERIC3 "ruins_generic3" +#define ACCESS_RUINS_GENERIC4 "ruins_generic4" + + +//--- MECH ---// +// Mech Access, allows maintanenace of internal components and altering keycard requirements. + +#define ACCESS_MECH_SECURITY "mech_security" +#define ACCESS_MECH_ENGINE "mech_engine" +#define ACCESS_MECH_MEDICAL "mech_medical" +#define ACCESS_MECH_MINING "mech_mining" +#define ACCESS_MECH_SCIENCE "mech_science" +#define ACCESS_MECH_RUINS "mech_ruins" + + +//--- ADMIN ---// +// Used for admin events and things of the like. Lots of extra space for more admin tools in the future + +/// General facilities. Centcom ferry. +#define ACCESS_CENT_GENERAL "cent_general" +#define ACCESS_CENT_THUNDER "cent_thunder" +#define ACCESS_CENT_MEDICAL "cent_medical" +#define ACCESS_CENT_LIVING "cent_living" +#define ACCESS_CENT_STORAGE "cent_storage" +#define ACCESS_CENT_TELEPORTER "cent_teleporter" +#define ACCESS_CENT_CAPTAIN "cent_captain" +#define ACCESS_CENT_BAR "cent_bar" +/// Special Ops. Captain's display case, Marauder/Seraph mechs, . +#define ACCESS_CENT_SPECOPS "cent_specops" ///Remind me to separate to captain, centcom, and syndicate mech access later -SonofSpace + + +//--- ANTAGONISTS ---// + +/// SYNDICATE +#define ACCESS_SYNDICATE "syndicate" +#define ACCESS_SYNDICATE_LEADER "syndicate_leader" + +/// CULTS +#define ACCESS_BLOODCULT "bloodcult" +#define ACCESS_CLOCKCULT "clockcult" + + +//--- MISCELLANEOUS ---// +/// For things that aren't ever supposed to be accessed +#define ACCESS_INACCESSIBLE "inaccessible" + +/// - - - END ACCESS IDS - - - /// + + + +/// A list of access levels that, when added to an ID card, will warn admins. +#define ACCESS_ALERT_ADMINS list(ACCESS_CHANGE_IDS) + +/// Logging define for ID card access changes +#define LOG_ID_ACCESS_CHANGE(user, id_card, change_description) \ + log_game("[key_name(user)] [change_description] to an ID card [(id_card.registered_name) ? "belonging to [id_card.registered_name]." : "with no registered name."]"); \ + user.investigate_log("[change_description] to an ID card [(id_card.registered_name) ? "belonging to [id_card.registered_name]." : "with no registered name."]", INVESTIGATE_ACCESSCHANGES); \ + user.log_message("[change_description] to an ID card [(id_card.registered_name) ? "belonging to [id_card.registered_name]." : "with no registered name."]", LOG_GAME); \ diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 9523a88a6a69..ade0d29210e7 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -185,6 +185,7 @@ #define CLOSED_BLASTDOOR_LAYER 3.13 // ABOVE DOORS #define ABOVE_OBJ_LAYER 3.2 #define ABOVE_WINDOW_LAYER 3.3 +#define WINDOW_HELPER_LAYER 3.31 // Keep above windows/windoors - see mapping_helpers.dm #define SIGN_LAYER 3.4 #define CORGI_ASS_PIN_LAYER 3.41 #define NOT_HIGH_OBJ_LAYER 3.5 diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index dfd10fbb7fb0..4818c912814d 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -11,7 +11,7 @@ var/uses = 20 var/cooldown = 0 var/cooldown_time = 100 - req_access = list(ACCESS_AI_UPLOAD) + req_access = list(ACCESS_AI_MASTER) /obj/machinery/ai_slipper/examine(mob/user) . = ..() diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm index dd8ebae5617c..4ca2c14ebfd8 100644 --- a/code/game/machinery/airlock_control.dm +++ b/code/game/machinery/airlock_control.dm @@ -19,10 +19,10 @@ switch(signal.data["command"]) if("open") - open(1) + open(TRUE) if("close") - close(1) + close(TRUE) if("unlock") locked = FALSE @@ -37,14 +37,14 @@ update_appearance() sleep(0.2 SECONDS) - open(1) + open(TRUE) locked = TRUE update_appearance() if("secure_close") locked = FALSE - close(1) + close(TRUE) locked = TRUE sleep(0.2 SECONDS) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index cf671b652e6d..a6b9983b33ab 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -251,17 +251,17 @@ /obj/machinery/button/door/incinerator_vent_toxmix name = "combustion chamber vent control" id = INCINERATOR_TOXMIX_VENT - req_access = list(ACCESS_TOX) + req_access = list(ACCESS_TOXINS) /obj/machinery/button/door/incinerator_vent_atmos_main name = "turbine vent control" id = INCINERATOR_ATMOS_MAINVENT - req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS) + req_one_access = list(ACCESS_ATMOSPHERICS) /obj/machinery/button/door/incinerator_vent_atmos_aux name = "combustion chamber vent control" id = INCINERATOR_ATMOS_AUXVENT - req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS) + req_one_access = list(ACCESS_ATMOSPHERICS) /obj/machinery/button/door/incinerator_vent_syndicatelava_main name = "turbine vent control" diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 1fb7888d3264..bd36396c5be6 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -1,7 +1,7 @@ /obj/machinery/computer/aifixer name = "\improper AI system integrity restorer" desc = "Used with intelliCards containing nonfunctional AIs to restore them to working order." - req_access = list(ACCESS_CAPTAIN, ACCESS_ROBO_CONTROL, ACCESS_HEADS) + req_access = list(ACCESS_CAPTAIN, ACCESS_ROBO_CONTROL, ACCESS_COMMAND) circuit = /obj/item/circuitboard/computer/aifixer icon_keyboard = "tech_key" icon_screen = "ai-fixer" diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 483c1a64e708..cdf8c0e17c73 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -14,7 +14,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) desc = "You can use this to manage jobs and ID access." icon_screen = "id" icon_keyboard = "id_key" - req_one_access = list(ACCESS_HEADS, ACCESS_CHANGE_IDS) + req_one_access = list(ACCESS_COMMAND, ACCESS_CHANGE_IDS) circuit = /obj/item/circuitboard/computer/card var/obj/item/card/id/modify = null var/mode = 0 diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 6bf547992542..f53bbc8af519 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -12,7 +12,7 @@ desc = "A console used for high-priority announcements and emergencies." icon_screen = "comm" icon_keyboard = "tech_key" - req_access = list(ACCESS_HEADS) + req_access = list(ACCESS_COMMAND) circuit = /obj/item/circuitboard/computer/communications light_color = LIGHT_COLOR_BLUE @@ -72,7 +72,7 @@ /obj/machinery/computer/communications/proc/authenticated_as_non_silicon_head(mob/user) if(issilicon(user)) return FALSE - return ACCESS_HEADS in authorize_access + return ACCESS_COMMAND in authorize_access /// Are we a silicon, OR logged in? /obj/machinery/computer/communications/proc/authenticated(mob/user) @@ -154,7 +154,7 @@ to_chat(usr, span_warning("You need to swipe your ID!")) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE) return - if (!(ACCESS_HEADS in id_card.access)) + if (!(ACCESS_COMMAND in id_card.access)) to_chat(usr, span_warning("You are not authorized to do this!")) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE) return diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 6445ec5627f3..3ea09ec25ee3 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -5,7 +5,7 @@ desc = "This can be used to check medical records." icon_screen = "medcomp" icon_keyboard = "med_key" - req_one_access = list(ACCESS_MEDICAL, ACCESS_FORENSICS_LOCKERS) + req_one_access = list(ACCESS_MEDICAL, ACCESS_DETECTIVE) circuit = /obj/item/circuitboard/computer/med_data var/obj/item/card/id/scan = null var/rank = null diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 89a6cb203103..8c650a44566a 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -7,7 +7,7 @@ desc = "Used to view and edit personnel's security records." icon_screen = "security" icon_keyboard = "security_key" - req_one_access = list(ACCESS_SECURITY, ACCESS_FORENSICS_LOCKERS) + req_one_access = list(ACCESS_SECURITY, ACCESS_DETECTIVE) circuit = /obj/item/circuitboard/computer/secure_data var/screen = MAIN_SCREEN diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index ec4850157003..f813a0e5a397 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -19,7 +19,7 @@ GLOBAL_LIST_EMPTY(cryopod_computers) icon_state = "cellconsole_1" density = FALSE interaction_flags_machine = INTERACT_MACHINE_OFFLINE - req_one_access = list(ACCESS_HEADS, ACCESS_ARMORY) //Heads of staff or the warden can go here to claim recover items from their department that people went were cryodormed with. + req_one_access = list(ACCESS_COMMAND, ACCESS_ARMORY) //Heads of staff or the warden can go here to claim recover items from their department that people went were cryodormed with. var/mode = null //Used for logging people entering cryosleep and important items they are carrying. diff --git a/code/game/machinery/defibrillator_mount.dm b/code/game/machinery/defibrillator_mount.dm index 079a930be5f2..6b45ca93237b 100644 --- a/code/game/machinery/defibrillator_mount.dm +++ b/code/game/machinery/defibrillator_mount.dm @@ -10,7 +10,7 @@ use_power = IDLE_POWER_USE idle_power_usage = 1 power_channel = AREA_USAGE_EQUIP - req_one_access = list(ACCESS_MEDICAL, ACCESS_HEADS, ACCESS_SECURITY) //used to control clamps + req_one_access = list(ACCESS_MEDICAL, ACCESS_COMMAND, ACCESS_SECURITY) //used to control clamps var/obj/item/defibrillator/defib //this mount's defibrillator var/clamps_locked = FALSE //if true, and a defib is loaded, it can't be removed without unlocking the clamps diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 444e9d64a047..02fe326ce40b 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -68,7 +68,7 @@ smoothing_groups = SMOOTH_GROUP_AIRLOCK FASTDMM_PROP(\ - pinned_vars = list("req_access_txt", "req_one_access_txt", "name")\ + pinned_vars = list("req_access", "req_one_access", "name")\ ) interaction_flags_machine = INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON | INTERACT_MACHINE_REQUIRES_SILICON | INTERACT_MACHINE_OPEN @@ -198,38 +198,6 @@ if(cut_wires_on_break) wires.cut_all() -/obj/machinery/door/airlock/LateInitialize() - . = ..() - if(cyclelinkedx || cyclelinkedy) //yogs start - cyclelinkairlock_target() - else - if(cyclelinkeddir) - cyclelinkairlock() //yogs end - if(abandoned) - var/outcome = rand(1,100) - switch(outcome) - if(1 to 9) - var/turf/here = get_turf(src) - for(var/obj/machinery/door/firedoor/FD in here) - qdel(FD) - for(var/turf/closed/T in range(2, src)) - here.place_on_top(T.type) - qdel(src) - return - here.place_on_top(/turf/closed/wall) - qdel(src) - return - if(10 to 11) - lights = FALSE - locked = TRUE - if(12 to 15) - locked = TRUE - if(16 to 23) - welded = TRUE - if(24 to 30) - panel_open = TRUE - update_appearance(UPDATE_ICON) - /obj/machinery/door/airlock/proc/rebuild_parts() if(part_overlays) vis_contents -= part_overlays diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index eaa6c55bb6b3..48dabbc481b7 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -110,7 +110,7 @@ autoclose = FALSE frequency = FREQ_AIRLOCK_CONTROL heat_proof = TRUE - req_access = list(ACCESS_TOX) + req_access = list(ACCESS_TOXINS) /obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior name = "Mixing Room Interior Airlock" @@ -304,7 +304,7 @@ autoclose = FALSE frequency = FREQ_AIRLOCK_CONTROL heat_proof = TRUE - req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS) + req_access = list(ACCESS_ATMOSPHERICS) /obj/machinery/door/airlock/public/glass/incinerator/atmos_interior name = "Turbine Interior Airlock" diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 2993c9b8d9e2..fa2fdd6e1a51 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -477,6 +477,14 @@ /obj/machinery/door/morgue icon = 'icons/obj/doors/doormorgue.dmi' +/obj/machinery/door/morgue/curator + name = "Private Study" + req_access = list(ACCESS_LIBRARY) + +/obj/machinery/door/morgue/chaplain + name = "Confession Booth (Chaplain)" + req_access = list(ACCESS_CHAPEL_OFFICE) + /obj/machinery/door/get_dumping_location(obj/item/storage/source,mob/user) return null diff --git a/code/game/machinery/doors/ministile.dm b/code/game/machinery/doors/ministile.dm index 80aff50254f2..747eae11dcd3 100644 --- a/code/game/machinery/doors/ministile.dm +++ b/code/game/machinery/doors/ministile.dm @@ -15,8 +15,8 @@ layer = OPEN_DOOR_LAYER /obj/machinery/ministile/hop - name = "HOP line turnstile" - req_one_access = list(ACCESS_HEADS) + name = "HoP line turnstile" + req_access = list(ACCESS_COMMAND) /obj/machinery/ministile/Initialize(mapload) . = ..() diff --git a/code/game/machinery/doors/turnstile.dm b/code/game/machinery/doors/turnstile.dm index 8908e968d730..72d76c09c744 100644 --- a/code/game/machinery/doors/turnstile.dm +++ b/code/game/machinery/doors/turnstile.dm @@ -17,7 +17,7 @@ /obj/machinery/turnstile/brig name = "Brig turnstile" //Seccies and brig phys may always pass, either way. - req_one_access = list(ACCESS_SEC_DOORS) + req_access = list(ACCESS_SEC_BASIC) max_integrity = 400 /// Made of damn good steel damage_deflection = 21 /// Same as airlocks! diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 67b9b531dbef..ffb89331b14c 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -392,7 +392,7 @@ /obj/machinery/door/window/brigdoor/security/holding name = "holding cell door" - req_one_access = list(ACCESS_SEC_DOORS, ACCESS_LAWYER) //love for the lawyer + req_one_access = list(ACCESS_SEC_BASIC) //love for the lawyer /obj/machinery/door/window/clockwork name = "brass windoor" diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index fc797c63c39b..f39d22fc2792 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -18,7 +18,7 @@ var/list/codes // assoc. list of transponder codes var/codes_txt = "" // codes as set on map: "tag1;tag2" or "tag1=value;tag2=value" - req_one_access = list(ACCESS_ENGINE, ACCESS_ROBO_CONTROL) + req_one_access = list(ACCESS_ENGINEERING, ACCESS_ROBO_CONTROL) /obj/machinery/navbeacon/Initialize(mapload) . = ..() diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index fb03a4eb3e7d..9570f4e72f4f 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -17,7 +17,7 @@ use_power = IDLE_POWER_USE //this turret uses and requires power idle_power_usage = 50 //when inactive, this turret takes up constant 50 Equipment power active_power_usage = 300 //when active, this turret takes up constant 300 Equipment power - req_access = list(ACCESS_SEC_DOORS) + req_access = list(ACCESS_SEC_BASIC) power_channel = AREA_USAGE_EQUIP //drains power from the EQUIPMENT channel var/scan_range = 7 @@ -799,7 +799,7 @@ var/locked = TRUE var/control_area = null //can be area name, path or nothing. var/ailock = 0 // AI cannot use this - req_access = list(ACCESS_AI_UPLOAD) + req_access = list(ACCESS_AI_MASTER) var/list/obj/machinery/porta_turret/turrets = list() resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF @@ -954,6 +954,10 @@ icon_state = "control_kill" else icon_state = "control_stun" + +/obj/machinery/turretid/syndicate // Please use this when making syndicate bases so we don't have to keep varediting it + icon_state = "control_kill" + req_access = list(ACCESS_SYNDICATE) /obj/item/wallframe/turret_control name = "turret control frame" diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 1c04a95992a0..1b40f28b1b84 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -76,7 +76,7 @@ opacity = FALSE anchored = FALSE pressure_resistance = 2*ONE_ATMOSPHERE - req_access = list(ACCESS_ENGINE) + req_access = list(ACCESS_ENGINEERING) max_integrity = 100 var/active = FALSE var/list/deployed_shields diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm index 8a13d9716913..3fc95dac5a2c 100644 --- a/code/game/machinery/telecomms/computers/logbrowser.dm +++ b/code/game/machinery/telecomms/computers/logbrowser.dm @@ -14,7 +14,7 @@ var/universal_translate = FALSE // set to TRUE if it can translate nonhuman speech - req_access = list(ACCESS_TCOMSAT) + req_access = list(ACCESS_TCOMMS) circuit = /obj/item/circuitboard/computer/comm_server tgui_id = "LogBrowser" diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index d0b15b6428eb..75d11b4379e9 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -129,7 +129,7 @@ do_sparks(1, FALSE, src) authorization_override = TRUE //just in case it wasn't already for some reason. keycard reader is busted. return - if(ACCESS_HEADS in C.access) + if(ACCESS_COMMAND in C.access) if(!authorization_override) authorization_override = TRUE to_chat(user, span_warning("You override the safety protocols on the [src], removing access restrictions from this terminal.")) @@ -625,7 +625,7 @@ if(issilicon(user)) return TRUE id_card = user.get_idcard(hand_first = TRUE) - return ACCESS_HEADS in id_card?.access + return ACCESS_COMMAND in id_card?.access /obj/machinery/mecha_part_fabricator/ui_act(action, list/params) . = ..() diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index 493747e7f82d..fad104b44617 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -10,7 +10,7 @@ deflect_chance = 15 armor = list(MELEE = 40, BULLET = 20, LASER = 10, ENERGY = 0, BOMB = 40, BIO = 0, RAD = 20, FIRE = 100, ACID = 100) max_equip = 6 - internals_req_access = list(ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_MINING, ACCESS_MECH_FREEMINER) + internals_req_access = list(ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_MINING, ACCESS_MECH_RUINS) var/list/cargo = new var/cargo_capacity = 15 var/hides = 0 diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index f0ab2f890b99..1e2411717af1 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -20,7 +20,7 @@ RLD throw_range = 5 w_class = WEIGHT_CLASS_NORMAL materials = list(/datum/material/iron=100000) - req_access_txt = "11" + req_access = list(ACCESS_ENGINEERING) armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50) resistance_flags = FIRE_PROOF var/datum/effect_system/spark_spread/spark_system diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index cc0346f3d7e1..7e91ff0ec0bb 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -608,7 +608,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/syndicate name = "agent card" - access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_MINERAL_STOREROOM) + access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE) var/anyone = FALSE //Can anyone forge the ID or just syndicate? var/forged = FALSE //have we set a custom name and job assignment, or will we use what we're given when we chameleon change? @@ -804,7 +804,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/captains_spare/temporary/Initialize(mapload) . = ..() access -= ACCESS_CHANGE_IDS - access -= ACCESS_HEADS + access -= ACCESS_COMMAND addtimer(CALLBACK(src, PROC_REF(wipe_id)), 50 SECONDS) /obj/item/card/id/captains_spare/temporary/proc/wipe_id() @@ -921,7 +921,7 @@ update_label("John Doe", "Clowny") originalassignment = "Occupying Officer" /obj/item/card/id/ert/occupying/Initialize(mapload) - access = list(ACCESS_SECURITY,ACCESS_BRIG,ACCESS_WEAPONS,ACCESS_SEC_DOORS,ACCESS_MAINT_TUNNELS)+get_ert_access("sec") + access = list(ACCESS_SECURITY, ACCESS_BRIG, ACCESS_WEAPONS_PERMIT ,ACCESS_SEC_BASIC, ACCESS_MAINT_TUNNELS)+get_ert_access("sec") . = ..() /obj/item/card/id/ert/Initialize(mapload) @@ -1029,22 +1029,22 @@ update_label("John Doe", "Clowny") /obj/item/card/id/mining name = "mining ID" - access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM) + access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_CARGO) /obj/item/card/id/away name = "a perfectly generic identification card" desc = "A perfectly generic identification card. Looks like it could use some flavor." - access = list(ACCESS_AWAY_GENERAL) + access = list(ACCESS_RUINS_GENERAL) registered_age = null /obj/item/card/id/away/hotel name = "Staff ID" desc = "A staff ID used to access the hotel's doors." - access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_MAINT) + access = list(ACCESS_RUINS_GENERAL, ACCESS_RUINS_MAINTENANCE) /obj/item/card/id/away/hotel/securty name = "Officer ID" - access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_MAINT, ACCESS_AWAY_SEC) + access = list(ACCESS_RUINS_GENERAL, ACCESS_RUINS_MAINTENANCE, ACCESS_RUINS_SECURITY) /obj/item/card/id/away/old name = "a perfectly generic identification card" @@ -1056,21 +1056,21 @@ update_label("John Doe", "Clowny") desc = "A faded Charlie Station ID card. You can make out the rank \"Security Officer\"." assignment = "Charlie Station Security Officer" originalassignment = "Security Officer" - access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_SEC) + access = list(ACCESS_RUINS_GENERAL, ACCESS_RUINS_SECURITY) /obj/item/card/id/away/old/sci name = "Charlie Station Scientist's ID card" desc = "A faded Charlie Station ID card. You can make out the rank \"Scientist\"." assignment = "Charlie Station Scientist" originalassignment = "Scientist" - access = list(ACCESS_AWAY_GENERAL) + access = list(ACCESS_RUINS_GENERAL) /obj/item/card/id/away/old/eng name = "Charlie Station Engineer's ID card" desc = "A faded Charlie Station ID card. You can make out the rank \"Station Engineer\"." assignment = "Charlie Station Engineer" originalassignment = "Engineer" - access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_ENGINE) + access = list(ACCESS_RUINS_GENERAL, ACCESS_RUINS_ENGINEERING) /obj/item/card/id/away/old/apc name = "APC Access ID" diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 0145954ef3a7..3391a2e15743 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -149,7 +149,7 @@ /// Changes the access requirements to a cyborg's cover to need freeminer engineer access. /obj/item/borg/upgrade/panel_access_remover/freeminer/action(mob/living/silicon/robot/R, user = usr) - R.req_access = list(ACCESS_FREEMINER_ENGINEER) + R.req_access = list(ACCESS_RUINS_ENGINEERING) new /obj/item/borg/upgrade/panel_access_remover/freeminer(R.drop_location()) // Makes this upgrade "re-usable" by creating a new one while using all the functionality of `one_use`. return TRUE diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 1da5d6788361..031c717e2957 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -149,7 +149,7 @@ /obj/structure/closet/secure_closet/psych name = "psychiatrist's cabinet" desc = "Packed with a psychiatrist's tools of the trade" - req_access = list(ACCESS_PSYCH) + req_access = list(ACCESS_PSYCHOLOGY) icon_state = "cabinet" /obj/structure/closet/secure_closet/psych/PopulateContents() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index e2fc4320778c..19c2a818d043 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -1,7 +1,7 @@ /obj/structure/closet/secure_closet/personal desc = "It's a secure locker for personnel. The first card swiped gains control." name = "personal closet" - req_access = list(ACCESS_ALL_PERSONAL_LOCKERS) + req_access = list(ACCESS_PERSONAL_LOCKERS) var/registered_name = null /obj/structure/closet/secure_closet/personal/PopulateContents() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index e69c3f2f8911..fb4b429ee32c 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -158,7 +158,7 @@ /obj/structure/closet/secure_closet/detective name = "\improper detective's cabinet" - req_access = list(ACCESS_FORENSICS_LOCKERS) + req_access = list(ACCESS_DETECTIVE) icon_state = "cabinet" resistance_flags = FLAMMABLE max_integrity = 70 @@ -197,8 +197,7 @@ /obj/structure/closet/secure_closet/evidence anchored = TRUE name = "Secure Evidence Closet" - req_access_txt = "0" - req_one_access_txt = list(ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS) + req_access = list(ACCESS_ARMORY, ACCESS_DETECTIVE) /obj/structure/closet/secure_closet/brig/PopulateContents() ..() @@ -211,7 +210,7 @@ /obj/structure/closet/secure_closet/courtroom name = "courtroom locker" - req_access = list(ACCESS_COURT) + req_access = list(ACCESS_SEC_BASIC) /obj/structure/closet/secure_closet/courtroom/PopulateContents() ..() @@ -231,7 +230,7 @@ /obj/structure/closet/secure_closet/contraband/heads anchored = TRUE name = "Contraband Locker" - req_access = list(ACCESS_HEADS) + req_access = list(ACCESS_COMMAND) /obj/structure/closet/secure_closet/armory1 name = "armory armor locker" @@ -289,7 +288,7 @@ /obj/structure/closet/secure_closet/lethalshots name = "shotgun lethal rounds" - req_access = list(ACCESS_ARMORY) + req_access = list(ACCESS_SECURITY) icon_state = "tac" /obj/structure/closet/secure_closet/lethalshots/PopulateContents() @@ -297,12 +296,13 @@ for(var/i in 1 to 3) new /obj/item/storage/box/lethalshot(src) -//Yogs Start: Brig Pysh Closet +//Yogs Start: Brig Phys Closet /obj/structure/closet/secure_closet/physician name = "\improper brig physician's cabinet" - req_access = list(ACCESS_BRIG_PHYS) icon = 'yogstation/icons/obj/closet.dmi' icon_state = "physician" + + req_access = list(ACCESS_BRIG_PHYS) resistance_flags = FLAMMABLE max_integrity = 70 door_anim_time = 0 diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm index b50ecc86deb1..7a0b3c2d6d00 100644 --- a/code/game/objects/structures/fireaxe.dm +++ b/code/game/objects/structures/fireaxe.dm @@ -278,6 +278,8 @@ desc = "There is a small label that reads \"For Emergency use only\".
There are bolts under it's glass cover for easy disassembly using a wrench." icon = 'icons/obj/wallmounts.dmi' icon_state = "spareid" + + req_access = list(ACCESS_CAPTAIN) alert = TRUE armor = list(MELEE = 30, BULLET = 20, LASER = 0, ENERGY = 100, BOMB = 10, BIO = 100, RAD = 100, FIRE = 90, ACID = 50) axe = FALSE diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index bc3050dfb0d6..29952732a6b5 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -129,4 +129,4 @@ /obj/structure/noticeboard/staff name = "Staff Notice Board" desc = "Important notices from the heads of staff." - req_access = list(ACCESS_HEADS) + req_access = list(ACCESS_COMMAND) diff --git a/code/game/objects/structures/stairs.dm b/code/game/objects/structures/stairs.dm index 9c6225a364e5..bcf7e57fae4d 100644 --- a/code/game/objects/structures/stairs.dm +++ b/code/game/objects/structures/stairs.dm @@ -8,9 +8,9 @@ /obj/structure/stairs name = "stairs" - icon = 'icons/obj/stairs.dmi' - icon_state = "stairs" - layer = EMISSIVE_FLOOR_LAYER + icon = 'goon/icons/turfs/floors.dmi' + icon_state = "stairs_alone" + layer = BELOW_OPEN_DOOR_LAYER anchored = TRUE move_resist = INFINITY @@ -18,18 +18,6 @@ var/terminator_mode = STAIR_TERMINATOR_AUTOMATIC var/turf/listeningTo -/obj/structure/stairs/north - dir = NORTH - -/obj/structure/stairs/south - dir = SOUTH - -/obj/structure/stairs/east - dir = EAST - -/obj/structure/stairs/west - dir = WEST - /obj/structure/stairs/Initialize(mapload) GLOB.stairs += src if(force_open_above) @@ -96,14 +84,6 @@ for(var/mob/living/buckled as anything in climber.buckled_mobs) buckled.pulling?.move_from_pull(buckled, loc, buckled.glide_size) - -/obj/structure/stairs/update_icon_state() - . = ..() - if(isTerminator()) - icon_state = "stairs_t" - else - icon_state = "stairs" - /obj/structure/stairs/vv_edit_var(var_name, var_value) . = ..() if(!.) @@ -157,24 +137,66 @@ return FALSE return TRUE -// For the sake of keeping the same sprite as /turf/open/floor/plasteel/stairs/goon/stairs -// One-tile stairs -/obj/structure/stairs/goon - icon = 'goon/icons/turfs/floors.dmi' - icon_state = "stairs_alone" - base_icon_state = "stairs_alone" -// Middle -/obj/structure/stairs/goon/wide +/obj/structure/stairs/wide_mid icon_state = "stairs_middle" base_icon_state = "stairs_middle" -// Left side -/obj/structure/stairs/goon/wide/left +/obj/structure/stairs/wide_left icon_state = "stairs_wide" base_icon_state = "stairs_wide" -// Right side -/obj/structure/stairs/goon/wide/right +/obj/structure/stairs/wide_right icon_state = "stairs2_wide" base_icon_state = "stairs2_wide" + + +/obj/structure/stairs/white + icon_state = "medstairs_alone" + base_icon_state = "medstairs_alone" + +/obj/structure/stairs/white/wide_mid + icon_state = "medstairs_middle" + base_icon_state = "medstairs_middle" + +/obj/structure/stairs/white/wide_left + icon_state = "medstairs_wide" + base_icon_state = "medstairs_wide" + +/obj/structure/stairs/white/wide_right + icon_state = "medstairs2_wide" + base_icon_state = "medstairs2_wide" + + +/obj/structure/stairs/wood + icon_state = "woodstairs_alone" + base_icon_state = "woodstairs_alone" + +/obj/structure/stairs/wood/wide_mid + icon_state = "woodstairs_middle" + base_icon_state = "woodstairs_middle" + +/obj/structure/stairs/wood/wide_left + icon_state = "woodstairs_wide" + base_icon_state = "woodstairs_wide" + +/obj/structure/stairs/wood/wide_right + icon_state = "woodstairs2_wide" + base_icon_state = "woodstairs2_wide" + + +/obj/structure/stairs/dark + icon_state = "darkstairs_alone" + base_icon_state = "darkstairs_alone" + +/obj/structure/stairs/dark/wide_mid + icon_state = "darkstairs_middle" + base_icon_state = "darkstairs_middle" + +/obj/structure/stairs/dark/wide_left + icon_state = "darkstairs_wide" + base_icon_state = "darkstairs_wide" + +/obj/structure/stairs/dark/wide_right + icon_state = "darkstairs2_wide" + base_icon_state = "darkstairs2_wide" diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index a7c12f562874..94c2b1fd8274 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -523,7 +523,7 @@ M.check_access() if (ACCESS_MAINT_TUNNELS in M.req_access) M.req_access = list() - M.req_one_access = list(ACCESS_BRIG,ACCESS_ENGINE) + M.req_one_access = list(ACCESS_BRIG,ACCESS_ENGINEERING) message_admins("[key_name_admin(mob_user)] made all maint doors engineering and brig access-only.") if("infinite_sec") if(!check_rights_for(rights, R_DEBUG)) diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 4502ee44bf61..fc2b55cf00d7 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -182,13 +182,13 @@ name = "engine air alarm" locked = FALSE req_access = null - req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ENGINE) + req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ENGINEERING) /obj/machinery/airalarm/mixingchamber name = "chamber air alarm" locked = FALSE req_access = null - req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_TOX, ACCESS_TOX_STORAGE) + req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE) /obj/machinery/airalarm/all_access name = "all-access air alarm" @@ -201,7 +201,7 @@ req_access = list(ACCESS_SYNDICATE) /obj/machinery/airalarm/away //general away mission access - req_access = list(ACCESS_AWAY_GENERAL) + req_access = list(ACCESS_RUINS_GENERAL) /obj/machinery/airalarm/directional/north //Pixel offsets get overwritten on New() dir = SOUTH diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 8c47f56b93ec..7ea0c3396c75 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -534,7 +534,7 @@ if("restricted") restricted = !restricted if(restricted) - req_access = list(ACCESS_ENGINE) + req_access = list(ACCESS_ENGINEERING) else req_access = list() . = TRUE diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index ecd6b3766a20..e83e71935e97 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -727,7 +727,7 @@ name = "Incendiary Weapons Crate" desc = "Burn, baby burn. Contains three incendiary grenades, three plasma canisters, and a flamethrower. Requires Armory access to open." cost = 1500 - access = ACCESS_HEADS + access = ACCESS_COMMAND contains = list(/obj/item/gun/flamethrower/full, /obj/item/tank/internals/plasma, /obj/item/tank/internals/plasma, @@ -929,7 +929,7 @@ name = "Engineering Gear Crate" desc = "Gear up with three toolbelts, high-visibility vests, welding goggles, hardhats, and two pairs of meson goggles!" cost = 1300 - access_view = ACCESS_ENGINE + access_view = ACCESS_ENGINEERING contains = list(/obj/item/storage/belt/utility, /obj/item/storage/belt/utility, /obj/item/storage/belt/utility, @@ -980,7 +980,7 @@ name = "P.A.C.M.A.N Generator Crate" desc = "Engineers can't set up the engine? Not an issue for you, once you get your hands on this P.A.C.M.A.N. Generator! Takes in plasma and spits out sweet sweet energy." cost = 2500 - access_view = ACCESS_ENGINE + access_view = ACCESS_ENGINEERING contains = list(/obj/machinery/power/port_gen/pacman) crate_name = "PACMAN generator crate" crate_type = /obj/structure/closet/crate/engineering/electrical @@ -1042,7 +1042,7 @@ desc = "The pride of Nanotrasen Naval Command. The legendary Bluespace Artillery Cannon is a devastating feat of human engineering and testament to wartime determination. Highly advanced research is required for proper construction. " cost = 15000 special = TRUE - access_view = ACCESS_HEADS + access_view = ACCESS_COMMAND contains = list(/obj/item/circuitboard/machine/bsa/front, /obj/item/circuitboard/machine/bsa/middle, /obj/item/circuitboard/machine/bsa/back, @@ -1055,7 +1055,7 @@ desc = "Secure the longevity of the current state of humanity within this massive library of scientific knowledge, capable of granting superhuman powers and abilities. Highly advanced research is required for proper construction. Also contains five DNA probes." cost = 12000 special = TRUE - access_view = ACCESS_HEADS + access_view = ACCESS_COMMAND contains = list( /obj/item/circuitboard/machine/dna_vault, /obj/item/dna_probe, @@ -1071,7 +1071,7 @@ desc = "Contains five DNA probes for use in the DNA vault." cost = 3000 special = TRUE - access_view = ACCESS_HEADS + access_view = ACCESS_COMMAND contains = list(/obj/item/dna_probe, /obj/item/dna_probe, /obj/item/dna_probe, @@ -1086,7 +1086,7 @@ desc = "Protect the very existence of this station with these Anti-Meteor defenses. Contains three Shield Generator Satellites." cost = 3000 special = TRUE - access_view = ACCESS_HEADS + access_view = ACCESS_COMMAND contains = list( /obj/machinery/satellite/meteor_shield, /obj/machinery/satellite/meteor_shield, @@ -1100,7 +1100,7 @@ desc = "A control system for the Shield Generator Satellite system." cost = 5000 special = TRUE - access_view = ACCESS_HEADS + access_view = ACCESS_COMMAND contains = list(/obj/item/circuitboard/computer/sat_control) crate_name= "shield control board crate" @@ -1111,7 +1111,7 @@ /datum/supply_pack/engine group = "Engine Construction" - access_view = ACCESS_ENGINE + access_view = ACCESS_ENGINEERING crate_type = /obj/structure/closet/crate/engineering /datum/supply_pack/engine/emitter @@ -1290,7 +1290,7 @@ name = "50 Empty License Plates" desc = "'Put those prisoners to work' - Jedi Yoda probably" cost = 1000 // 50 * 25 - 1000 = 250 credits profit - access_view = ACCESS_SEC_DOORS + access_view = ACCESS_SEC_BASIC contains = list(/obj/item/stack/license_plates/empty/fifty) crate_name = "empty license plate crate" @@ -1347,7 +1347,7 @@ name = "BZ Canister Crate" desc = "Contains a canister of BZ. Requires Toxins access to open." cost = 8000 - access = ACCESS_TOX_STORAGE + access = ACCESS_TOXINS_STORAGE access_view = ACCESS_ATMOSPHERICS contains = list(/obj/machinery/portable_atmospherics/canister/bz) crate_name = "BZ canister crate" @@ -1742,15 +1742,15 @@ /datum/supply_pack/science group = "Science" - access_view = ACCESS_RESEARCH + access_view = ACCESS_SCIENCE crate_type = /obj/structure/closet/crate/science /datum/supply_pack/science/plasma name = "Plasma Assembly Crate" desc = "Everything you need to burn something to the ground, this contains three plasma assembly sets. Each set contains a plasma tank, igniter, proximity sensor, and timer! Warranty void if exposed to high temperatures. Requires Toxins access to open." cost = 1000 - access = ACCESS_TOX_STORAGE - access_view = ACCESS_TOX_STORAGE + access = ACCESS_TOXINS_STORAGE + access_view = ACCESS_TOXINS_STORAGE contains = list(/obj/item/tank/internals/plasma, /obj/item/tank/internals/plasma, /obj/item/tank/internals/plasma, diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 235b2ecfb3f8..040acec84f26 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -136,28 +136,40 @@ /// Gets all station access /proc/get_all_accesses() - return list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, - ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_RD, - ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_CHEMISTRY, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS, - ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, - ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_HEADS, ACCESS_CAPTAIN, ACCESS_ALL_PERSONAL_LOCKERS, - ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH_STORAGE, ACCESS_CHAPEL_OFFICE, ACCESS_ATMOSPHERICS, ACCESS_KITCHEN, - ACCESS_BAR, ACCESS_JANITOR, ACCESS_CREMATORIUM, ACCESS_ROBO_CONTROL, ACCESS_ROBOTICS, ACCESS_CARGO, ACCESS_CONSTRUCTION, - ACCESS_HYDROPONICS, ACCESS_LIBRARY, ACCESS_LAWYER, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_QM, ACCESS_SURGERY, - ACCESS_THEATRE, ACCESS_RESEARCH, ACCESS_RND, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_WEAPONS, - ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, - ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_RC_ANNOUNCE, - ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_NETWORK, ACCESS_CLONING, ACCESS_TCOM_ADMIN, ACCESS_PARAMEDIC, ACCESS_MANUFACTURING, ACCESS_BRIG_PHYS, ACCESS_PSYCH, ACCESS_SERVHALL) //YOGS - yogs jobs + return list( + // Service/Civilian + ACCESS_SERVICE, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_LAWYER, ACCESS_CLERK, ACCESS_HOP, + // Security + ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_DETECTIVE, ACCESS_BRIG_PHYS, ACCESS_WEAPONS_PERMIT, ACCESS_MECH_SECURITY, ACCESS_HOS, + // Medical + ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_PARAMEDIC, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_CLONING, ACCESS_VIROLOGY, ACCESS_PSYCHOLOGY, ACCESS_MECH_MEDICAL, ACCESS_CMO, + // Science + ACCESS_SCIENCE, ACCESS_RESEARCH, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_EXPERIMENTATION, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_XENOBIOLOGY, ACCESS_RND_SERVERS, ACCESS_MECH_SCIENCE, ACCESS_RD, + // Engineering + ACCESS_ENGINEERING, ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ENGINE_EQUIP, ACCESS_CONSTRUCTION, ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH, ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_AUX_BASE, ACCESS_MECH_ENGINE, ACCESS_CE, + // Supply + ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_QM, + // Command + ACCESS_COMMAND, ACCESS_AI_MASTER, ACCESS_AI_SAT, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_VAULT, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_PERSONAL_LOCKERS, ACCESS_CHANGE_IDS, ACCESS_CAPTAIN) /// Gets all centcom accesses /proc/get_all_centcom_access() return list(ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE, ACCESS_CENT_TELEPORTER, ACCESS_CENT_CAPTAIN) -/// Gets all accesses between 1 and 500 +/// Every access in the game, temp solution /proc/get_debug_access() - . = list() - for(var/i = 1; i <= 500; i++) - . += i + return list( + ACCESS_SERVICE, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_LAWYER, ACCESS_CLERK, ACCESS_HOP, + ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_DETECTIVE, ACCESS_BRIG_PHYS, ACCESS_WEAPONS_PERMIT, ACCESS_MECH_SECURITY, ACCESS_HOS, + ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_PARAMEDIC, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_CLONING, ACCESS_VIROLOGY, ACCESS_PSYCHOLOGY, ACCESS_MECH_MEDICAL, ACCESS_CMO, + ACCESS_SCIENCE, ACCESS_RESEARCH, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_EXPERIMENTATION, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_XENOBIOLOGY, ACCESS_RND_SERVERS, ACCESS_MECH_SCIENCE, ACCESS_RD, + ACCESS_ENGINEERING, ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ENGINE_EQUIP, ACCESS_CONSTRUCTION, ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH, ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_AUX_BASE, ACCESS_MECH_ENGINE, ACCESS_CE, + ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_QM, + ACCESS_COMMAND, ACCESS_AI_MASTER, ACCESS_AI_SAT, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_VAULT, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_PERSONAL_LOCKERS, ACCESS_CHANGE_IDS, ACCESS_CAPTAIN, + ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE, ACCESS_CENT_TELEPORTER, ACCESS_CENT_CAPTAIN, + ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER, ACCESS_BLOODCULT, ACCESS_CLOCKCULT, + ACCESS_RUINS_GENERAL, ACCESS_RUINS_COMMAND, ACCESS_RUINS_SECURITY, ACCESS_RUINS_ENGINEERING, ACCESS_RUINS_MEDICAL, ACCESS_RUINS_SUPPLY, ACCESS_RUINS_SCIENCE, ACCESS_RUINS_MAINTENANCE, ACCESS_RUINS_MATERIALS, ACCESS_RUINS_GENERIC1, ACCESS_RUINS_GENERIC2, ACCESS_RUINS_GENERIC3, ACCESS_RUINS_GENERIC4, ACCESS_MECH_RUINS, + ACCESS_INACCESSIBLE) // Killing myself /// Gets access for ERT /proc/get_ert_access(class) @@ -175,207 +187,272 @@ /proc/get_all_syndicate_access() return list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) -/// Gets access from region ID +/// Gets access from region ID - Overlap between departments for the sake of ID Console and door remote grouping /proc/get_region_accesses(code) switch(code) if(0) return get_all_accesses() - if(1) //station general - return list(ACCESS_KITCHEN,ACCESS_BAR, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_THEATRE, ACCESS_LAWYER, ACCESS_MANUFACTURING, ACCESS_SERVHALL) - if(2) //security - return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_MECH_SECURITY, ACCESS_HOS) - if(3) //medbay - return list(ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_MECH_MEDICAL, ACCESS_CMO, ACCESS_PARAMEDIC, ACCESS_BRIG_PHYS, ACCESS_PSYCH) // yogs - Yog jobs - if(4) //research - return list(ACCESS_RESEARCH, ACCESS_RND, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_GENETICS, ACCESS_ROBO_CONTROL, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, ACCESS_MINISAT, ACCESS_RD, ACCESS_NETWORK, ACCESS_AI_UPLOAD) - if(5) //engineering and maintenance - return list(ACCESS_CONSTRUCTION, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH_STORAGE, ACCESS_ATMOSPHERICS, ACCESS_MECH_ENGINE, ACCESS_TCOMSAT, ACCESS_MINISAT, ACCESS_CE, ACCESS_TCOM_ADMIN, ACCESS_RC_ANNOUNCE) // yogs - Yog jobs - if(6) //supply - return list(ACCESS_MAILSORTING, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_QM, ACCESS_VAULT) - if(7) //command - return list(ACCESS_HEADS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_SECURE_TECH_STORAGE, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_GATEWAY, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_HOP, ACCESS_CAPTAIN, ACCESS_VAULT) + if(1) // Service/Civilian + return list(ACCESS_SERVICE, + ACCESS_THEATRE, + ACCESS_CHAPEL_OFFICE, + ACCESS_CREMATORIUM, + ACCESS_LIBRARY, + ACCESS_BAR, + ACCESS_KITCHEN, + ACCESS_HYDROPONICS, + ACCESS_JANITOR, + ACCESS_LAWYER, + ACCESS_CLERK, + ACCESS_HOP) + if(2) // Security + return list(ACCESS_SECURITY, + ACCESS_SEC_BASIC, + ACCESS_BRIG, + ACCESS_ARMORY, + ACCESS_DETECTIVE, + ACCESS_BRIG_PHYS, + ACCESS_WEAPONS_PERMIT, + ACCESS_LAWYER, + ACCESS_MECH_SECURITY, + ACCESS_HOS) + if(3) // Medical + return list(ACCESS_MEDICAL, + ACCESS_SURGERY, + ACCESS_PARAMEDIC, + ACCESS_MORGUE, + ACCESS_CHEMISTRY, + ACCESS_CLONING, + ACCESS_VIROLOGY, + ACCESS_PSYCHOLOGY, + ACCESS_GENETICS, + ACCESS_BRIG_PHYS, + ACCESS_MECH_MEDICAL, + ACCESS_CMO) + if(4) // Science + return list(ACCESS_SCIENCE, + ACCESS_RESEARCH, + ACCESS_TOXINS, + ACCESS_TOXINS_STORAGE, + ACCESS_EXPERIMENTATION, + ACCESS_GENETICS, + ACCESS_ROBOTICS, + ACCESS_ROBO_CONTROL, + ACCESS_XENOBIOLOGY, + ACCESS_RND_SERVERS, + ACCESS_AI_MASTER, + ACCESS_AI_SAT, + ACCESS_MECH_SCIENCE, + ACCESS_RD) + if(5) // Engineering + return list(ACCESS_ENGINEERING, + ACCESS_ATMOSPHERICS, + ACCESS_MAINT_TUNNELS, + ACCESS_EXTERNAL_AIRLOCKS, + ACCESS_ENGINE_EQUIP, + ACCESS_CONSTRUCTION, + ACCESS_TECH_STORAGE, + ACCESS_SECURE_TECH, + ACCESS_TCOMMS, + ACCESS_TCOMMS_ADMIN, + ACCESS_AUX_BASE, + ACCESS_AI_SAT, + ACCESS_MECH_ENGINE, + ACCESS_CE) + if(6) // Supply + return list(ACCESS_CARGO, + ACCESS_CARGO_BAY, + ACCESS_MINING, + ACCESS_MINING_STATION, + ACCESS_VAULT, + ACCESS_MECH_MINING, + ACCESS_QM) + if(7) // Command + return list(ACCESS_COMMAND, + ACCESS_AI_MASTER, + ACCESS_AI_SAT, + ACCESS_TELEPORTER, + ACCESS_EVA, + ACCESS_VAULT, + ACCESS_SECURE_TECH, + ACCESS_RND_SERVERS, + ACCESS_RC_ANNOUNCE, + ACCESS_KEYCARD_AUTH, + ACCESS_TCOMMS_ADMIN, + ACCESS_PERSONAL_LOCKERS, + ACCESS_CHANGE_IDS, + ACCESS_HOP, + ACCESS_CAPTAIN) /// Gets the name from region ID /proc/get_region_accesses_name(code) switch(code) if(0) return "All" - if(1) //station general - return "General" - if(2) //security + if(1) // Service/Civilian + return "Service" + if(2) // Security return "Security" - if(3) //medbay + if(3) // Medical return "Medbay" - if(4) //research - return "Research" - if(5) //engineering and maintenance + if(4) // Science + return "Science" + if(5) // Engineering return "Engineering" - if(6) //supply + if(6) // Supply return "Supply" - if(7) //command + if(7) // Command return "Command" /// Gets teh description for an access /proc/get_access_desc(A) switch(A) - if(ACCESS_CARGO) - return "Cargo Bay" + if(ACCESS_COMMAND) + return "Command General" + if(ACCESS_AI_MASTER) // Yog + return "AI Master Access" + if(ACCESS_AI_SAT) // Yog + return "AI Satellite" + if(ACCESS_TELEPORTER) + return "Teleporter" + if(ACCESS_EVA) + return "EVA" + if(ACCESS_VAULT) + return "Vault" + if(ACCESS_RC_ANNOUNCE) + return "RC Announcements" + if(ACCESS_KEYCARD_AUTH) + return "Keycode Auth." + if(ACCESS_PERSONAL_LOCKERS) + return "Personal Lockers" + if(ACCESS_CHANGE_IDS) + return "ID Console" + if(ACCESS_CAPTAIN) + return "Captain's Quarters" if(ACCESS_SECURITY) - return "Security" + return "Security General" + if(ACCESS_SEC_BASIC) + return "Security Basic" if(ACCESS_BRIG) - return "Holding Cells" - if(ACCESS_COURT) - return "Courtroom" - if(ACCESS_FORENSICS_LOCKERS) - return "Forensics" + return "Brig" + if(ACCESS_ARMORY) + return "Armory" + if(ACCESS_DETECTIVE) + return "Detective's Office" + if(ACCESS_BRIG_PHYS) // Yog + return "Brig Infirmary" + if(ACCESS_WEAPONS_PERMIT) + return "Weapons Permit" + if(ACCESS_HOS) + return "HoS Office" + if(ACCESS_ENGINEERING) + return "Engineering General" + if(ACCESS_ATMOSPHERICS) + return "Atmospherics" + if(ACCESS_MAINT_TUNNELS) + return "Maintenance Tunnels" + if(ACCESS_EXTERNAL_AIRLOCKS) + return "External Airlocks" + if(ACCESS_ENGINE_EQUIP) + return "Power & Engineering Equipment" + if(ACCESS_CONSTRUCTION) + return "Construction" + if(ACCESS_TECH_STORAGE) + return "Tech Storage" + if(ACCESS_SECURE_TECH) + return "Secure Tech Storage" + if(ACCESS_TCOMMS) + return "Telecommunications" + if(ACCESS_TCOMMS_ADMIN) // Yog + return "Telecomms. Systems Admin" + if(ACCESS_AUX_BASE) + return "Auxiliary Base" + if(ACCESS_CE) + return "CE Office" if(ACCESS_MEDICAL) - return "Medical" - if(ACCESS_GENETICS) - return "Genetics Lab" + return "Medbay General" + if(ACCESS_SURGERY) + return "Surgery" + if(ACCESS_PARAMEDIC) // Yog + return "Paramedic Staging" if(ACCESS_MORGUE) return "Morgue" - if(ACCESS_RND) - return "R&D Lab and Console" - if(ACCESS_TOX) - return "Toxins Lab" - if(ACCESS_TOX_STORAGE) - return "Toxins Lab Storage" if(ACCESS_CHEMISTRY) return "Chemistry Lab" + if(ACCESS_CLONING) + return "Cloning Lab" + if(ACCESS_VIROLOGY) + return "Virology Lab" + if(ACCESS_PSYCHOLOGY) + return "Psychiatrist's Office" + if(ACCESS_CMO) + return "CMO Office" + if(ACCESS_CARGO) + return "Cargo General" + if(ACCESS_CARGO_BAY) + return "Cargo Bay" + if(ACCESS_MINING) + return "Mining" + if(ACCESS_MINING_STATION) + return "Mining Station" + if(ACCESS_QM) + return "QM Office" + if(ACCESS_SCIENCE) + return "Science General" + if(ACCESS_RESEARCH) + return "Research Console" + if(ACCESS_TOXINS) + return "Toxins Lab" + if(ACCESS_TOXINS_STORAGE) + return "Toxins Storage" + if(ACCESS_EXPERIMENTATION) // Yog + return "Experimentation Lab" + if(ACCESS_GENETICS) + return "Genetics Lab" + if(ACCESS_ROBOTICS) + return "Robotics Lab" + if(ACCESS_ROBO_CONTROL) + return "Robotics Bot Control" + if(ACCESS_XENOBIOLOGY) + return "Xenobiology Lab" + if(ACCESS_RND_SERVERS) // Yog + return "R&D Server Room" if(ACCESS_RD) return "RD Office" - if(ACCESS_BAR) - return "Bar" - if(ACCESS_JANITOR) - return "Custodial Closet" - if(ACCESS_ENGINE) - return "Engineering" - if(ACCESS_ENGINE_EQUIP) - return "Power and Engineering Equipment" - if(ACCESS_MAINT_TUNNELS) - return "Maintenance" - if(ACCESS_EXTERNAL_AIRLOCKS) - return "External Airlocks" - if(ACCESS_CHANGE_IDS) - return "ID Console" - if(ACCESS_AI_UPLOAD) - return "AI Chambers" - if(ACCESS_TELEPORTER) - return "Teleporter" - if(ACCESS_EVA) - return "EVA" - if(ACCESS_HEADS) - return "Bridge" - if(ACCESS_CAPTAIN) - return "Captain" - if(ACCESS_ALL_PERSONAL_LOCKERS) - return "Personal Lockers" + if(ACCESS_SERVICE) + return "Service General" + if(ACCESS_THEATRE) + return "Theatre Backstage" if(ACCESS_CHAPEL_OFFICE) return "Chapel Office" - if(ACCESS_TECH_STORAGE) - return "Technical Storage" - if(ACCESS_SECURE_TECH_STORAGE) - return "Secure Tech Storage" - if(ACCESS_ATMOSPHERICS) - return "Atmospherics" if(ACCESS_CREMATORIUM) return "Crematorium" - if(ACCESS_ARMORY) - return "Armory" - if(ACCESS_CONSTRUCTION) - return "Construction" + if(ACCESS_LIBRARY) + return "Library" + if(ACCESS_BAR) + return "Bar" if(ACCESS_KITCHEN) return "Kitchen" if(ACCESS_HYDROPONICS) return "Hydroponics" - if(ACCESS_LIBRARY) - return "Library" + if(ACCESS_JANITOR) + return "Janitor's Closet" if(ACCESS_LAWYER) return "Law Office" - if(ACCESS_ROBO_CONTROL) - return "Robotics Control" - if(ACCESS_ROBOTICS) - return "Robotics" - if(ACCESS_VIROLOGY) - return "Virology" - if(ACCESS_CMO) - return "CMO Office" - if(ACCESS_QM) - return "Quartermaster" - if(ACCESS_SURGERY) - return "Surgery" - if(ACCESS_THEATRE) - return "Theatre" - if(ACCESS_RESEARCH) - return "Science" - if(ACCESS_MINING) - return "Mining" - if(ACCESS_MAILSORTING) - return "Cargo Office" - if(ACCESS_VAULT) - return "Main Vault" - if(ACCESS_MINING_STATION) - return "Mining EVA" - if(ACCESS_XENOBIOLOGY) - return "Xenobiology Lab" + if(ACCESS_CLERK) // Yog + return "Gift Shop" if(ACCESS_HOP) return "HoP Office" - if(ACCESS_HOS) - return "HoS Office" - if(ACCESS_CE) - return "CE Office" - if(ACCESS_RC_ANNOUNCE) - return "RC Announcements" - if(ACCESS_KEYCARD_AUTH) - return "Keycode Auth." - if(ACCESS_TCOMSAT) - return "Telecommunications" - if(ACCESS_GATEWAY) - return "Gateway" - if(ACCESS_SEC_DOORS) - return "Brig" - if(ACCESS_MINERAL_STOREROOM) - return "Mineral Storage" - if(ACCESS_MINISAT) - return "AI Satellite" - if(ACCESS_WEAPONS) - return "Weapon Permit" - if(ACCESS_NETWORK) - return "Network Access" - if(ACCESS_CLONING) - return "Cloning Room" - if(ACCESS_MECH_MINING) - return "Mining Mech Access" + if(ACCESS_MECH_SECURITY) + return "Security Mech Access" + if(ACCESS_MECH_ENGINE) + return "Engineering Mech Access" if(ACCESS_MECH_MEDICAL) return "Medical Mech Access" - if(ACCESS_MECH_SECURITY) - return "Security Mech Access" + if(ACCESS_MECH_MINING) + return "Mining Mech Access" if(ACCESS_MECH_SCIENCE) return "Science Mech Access" - if(ACCESS_MECH_ENGINE) - return "Engineering Mech Access" - // yogs start - Yog jobs - if(ACCESS_PARAMEDIC) - return "Paramedic" - if(ACCESS_TCOM_ADMIN) - return "Tcomms Admin" - if(ACCESS_PSYCH) - return "Psychiatrist's Office" - if(ACCESS_MANUFACTURING) - return "Clerk" - if(ACCESS_BRIG_PHYS) - return "Brig Physician" - if(ACCESS_MECH_FREEMINER) - return "Freeminer Mech" - if(ACCESS_FREEMINER) - return "Freeminer" - if(ACCESS_FREEMINER_ENGINEER) - return "Freeminer Engineer" - if(ACCESS_FREEMINER_CAPTAIN) - return "Freeminer Captain" - if(ACCESS_SERVHALL) - return "Service Hall" - // yogs end /// Get descriptions for centcom accesses /proc/get_centcom_access_desc(A) diff --git a/code/modules/jobs/job_types/artist.dm b/code/modules/jobs/job_types/artist.dm index 72640a4efd7a..a641b47c8d3e 100644 --- a/code/modules/jobs/job_types/artist.dm +++ b/code/modules/jobs/job_types/artist.dm @@ -11,7 +11,7 @@ outfit = /datum/outfit/job/artist alt_titles = list("Painter", "Composer", "Artisan") added_access = list() - base_access = list(ACCESS_SERVHALL) + base_access = list(ACCESS_SERVICE) paycheck = PAYCHECK_ASSISTANT paycheck_department = ACCOUNT_CIV diff --git a/code/modules/jobs/job_types/atmospheric_technician.dm b/code/modules/jobs/job_types/atmospheric_technician.dm index 292d92e020e1..01444973c938 100644 --- a/code/modules/jobs/job_types/atmospheric_technician.dm +++ b/code/modules/jobs/job_types/atmospheric_technician.dm @@ -14,7 +14,7 @@ outfit = /datum/outfit/job/atmos added_access = list(ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE) - base_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION, ACCESS_MECH_ENGINE, ACCESS_MINERAL_STOREROOM, ACCESS_ENGINE, ACCESS_EXTERNAL_AIRLOCKS) + base_access = list(ACCESS_ENGINEERING, ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MECH_ENGINE) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_ENG display_order = JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm index 84cfa3dd6686..3b1b842dd426 100644 --- a/code/modules/jobs/job_types/bartender.dm +++ b/code/modules/jobs/job_types/bartender.dm @@ -14,7 +14,7 @@ outfit = /datum/outfit/job/bartender added_access = list(ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_MORGUE) - base_access = list(ACCESS_BAR, ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS, ACCESS_SERVHALL) + base_access = list(ACCESS_SERVICE, ACCESS_BAR, ACCESS_WEAPONS_PERMIT) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV display_order = JOB_DISPLAY_ORDER_BARTENDER diff --git a/code/modules/jobs/job_types/botanist.dm b/code/modules/jobs/job_types/botanist.dm index 48a0552745e0..e413975af63f 100644 --- a/code/modules/jobs/job_types/botanist.dm +++ b/code/modules/jobs/job_types/botanist.dm @@ -13,7 +13,7 @@ alt_titles = list("Ecologist", "Agriculturist", "Botany Greenhorn", "Hydroponicist", "Gardener") added_access = list(ACCESS_BAR, ACCESS_KITCHEN) - base_access = list(ACCESS_HYDROPONICS, ACCESS_MORGUE, ACCESS_MINERAL_STOREROOM, ACCESS_SERVHALL) + base_access = list(ACCESS_SERVICE, ACCESS_HYDROPONICS, ACCESS_MORGUE) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV display_order = JOB_DISPLAY_ORDER_BOTANIST diff --git a/code/modules/jobs/job_types/cargo_technician.dm b/code/modules/jobs/job_types/cargo_technician.dm index 5179809e55af..d8f6f027bec7 100644 --- a/code/modules/jobs/job_types/cargo_technician.dm +++ b/code/modules/jobs/job_types/cargo_technician.dm @@ -14,8 +14,8 @@ alt_titles = list("Deliveryperson", "Mail Service", "Exports Handler", "Cargo Trainee", "Crate Pusher", "Courier") - added_access = list(ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION) - base_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM) + added_access = list(ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION) + base_access = list(ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_MAINT_TUNNELS, ACCESS_MECH_MINING) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_CAR diff --git a/code/modules/jobs/job_types/centcom.dm b/code/modules/jobs/job_types/centcom.dm index 3a8907261a69..04dad777aeb1 100644 --- a/code/modules/jobs/job_types/centcom.dm +++ b/code/modules/jobs/job_types/centcom.dm @@ -37,7 +37,7 @@ W.icon = 'icons/obj/card.dmi' //Bypasses modularisation. W.icon_state = "centcom" W.access = get_centcom_access("CentCom Official") - W.access += ACCESS_WEAPONS + W.access += ACCESS_WEAPONS_PERMIT W.assignment = "CentCom Official" W.originalassignment = "CentCom Official" W.registered_name = H.real_name diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm index ca69cc105367..9cbe7fb3a0fa 100644 --- a/code/modules/jobs/job_types/chaplain.dm +++ b/code/modules/jobs/job_types/chaplain.dm @@ -14,7 +14,7 @@ alt_titles = list("Priest", "Preacher", "Cleric", "Exorcist", "Vicar") added_access = list() - base_access = list(ACCESS_MORGUE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_THEATRE, ACCESS_SERVHALL) + base_access = list(ACCESS_SERVICE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_MORGUE, ACCESS_THEATRE) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_CIV diff --git a/code/modules/jobs/job_types/chemist.dm b/code/modules/jobs/job_types/chemist.dm index f15b5a5dd66a..79137924c466 100644 --- a/code/modules/jobs/job_types/chemist.dm +++ b/code/modules/jobs/job_types/chemist.dm @@ -17,7 +17,7 @@ outfit = /datum/outfit/job/chemist added_access = list(ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_CLONING) - base_access = list(ACCESS_MEDICAL, ACCESS_CHEMISTRY, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM) + base_access = list(ACCESS_MEDICAL, ACCESS_CHEMISTRY, ACCESS_MECH_MEDICAL) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm index 1d974c89c824..de80adfed05c 100644 --- a/code/modules/jobs/job_types/chief_engineer.dm +++ b/code/modules/jobs/job_types/chief_engineer.dm @@ -19,11 +19,13 @@ outfit = /datum/outfit/job/ce - added_access = list(ACCESS_CAPTAIN) - base_access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH_STORAGE, ACCESS_MAINT_TUNNELS, - ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ATMOSPHERICS, ACCESS_EVA, ACCESS_TCOM_ADMIN, - ACCESS_HEADS, ACCESS_CONSTRUCTION, ACCESS_SEC_DOORS, ACCESS_MINISAT, ACCESS_MECH_ENGINE, - ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_MINERAL_STOREROOM) + added_access = list(ACCESS_CAPTAIN, ACCESS_AI_MASTER) + base_access = list(ACCESS_COMMAND, ACCESS_ENGINEERING, ACCESS_CE, ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, + ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ENGINE_EQUIP, ACCESS_CONSTRUCTION, ACCESS_TECH_STORAGE, + ACCESS_SECURE_TECH, ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_AUX_BASE, + ACCESS_MECH_ENGINE, ACCESS_SEC_BASIC, ACCESS_EVA, ACCESS_AI_SAT, + ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH) + paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_ENG diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index 70ecfd847e23..c24f83422b19 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -19,10 +19,13 @@ outfit = /datum/outfit/job/cmo - added_access = list(ACCESS_CAPTAIN) //Yogs: Gives CMO access to the brig physicians locker - base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_HEADS, ACCESS_MINERAL_STOREROOM, - ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE, ACCESS_MECH_MEDICAL, - ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_BRIG_PHYS, ACCESS_PARAMEDIC, ACCESS_PSYCH) //Yogs: Gives CMO access to the brig physicians locker + added_access = list(ACCESS_CAPTAIN, ACCESS_AI_SAT, ACCESS_AI_MASTER) //Yogs: Gives CMO access to the brig physicians locker + base_access = list(ACCESS_COMMAND, ACCESS_MEDICAL, ACCESS_CMO, ACCESS_SURGERY, + ACCESS_PARAMEDIC, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_CLONING, + ACCESS_VIROLOGY, ACCESS_PSYCHOLOGY, ACCESS_GENETICS, ACCESS_BRIG_PHYS, + ACCESS_MECH_MEDICAL, ACCESS_SEC_BASIC, ACCESS_MAINT_TUNNELS, ACCESS_EVA, + ACCESS_BRIG_PHYS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH) + paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_MED diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm index 912acbdfc686..ba6ef66ff7aa 100644 --- a/code/modules/jobs/job_types/clown.dm +++ b/code/modules/jobs/job_types/clown.dm @@ -12,8 +12,9 @@ alt_titles = list("Entertainer", "Comedian", "Jester", "Improv Artist") - added_access = list() - base_access = list(ACCESS_THEATRE, ACCESS_SERVHALL) + added_access = list(ACCESS_MAINT_TUNNELS) + base_access = list(ACCESS_SERVICE, ACCESS_THEATRE) + paycheck = PAYCHECK_MINIMAL paycheck_department = ACCOUNT_SRV diff --git a/code/modules/jobs/job_types/cook.dm b/code/modules/jobs/job_types/cook.dm index b1f7c3440cdf..30fae7c1729a 100644 --- a/code/modules/jobs/job_types/cook.dm +++ b/code/modules/jobs/job_types/cook.dm @@ -14,7 +14,8 @@ alt_titles = list("Chef", "Hash Slinger", "Sous-chef", "Culinary Artist", "Culinarian") added_access = list(ACCESS_HYDROPONICS, ACCESS_BAR) - base_access = list(ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_MINERAL_STOREROOM, ACCESS_SERVHALL) + base_access = list(ACCESS_SERVICE, ACCESS_KITCHEN, ACCESS_MORGUE) + paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV diff --git a/code/modules/jobs/job_types/curator.dm b/code/modules/jobs/job_types/curator.dm index c3bfe90965cc..7052f0f3acbc 100644 --- a/code/modules/jobs/job_types/curator.dm +++ b/code/modules/jobs/job_types/curator.dm @@ -13,8 +13,9 @@ alt_titles = list("Librarian", "Journalist", "Archivist", "Cartographer", "Space Archaeologist") - added_access = list() - base_access = list(ACCESS_LIBRARY, ACCESS_CONSTRUCTION, ACCESS_MINING_STATION, ACCESS_SERVHALL) + added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_AUX_BASE) + base_access = list(ACCESS_SERVICE, ACCESS_LIBRARY, ACCESS_CONSTRUCTION, ACCESS_MINING_STATION) + paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_CIV mind_traits = list(TRAIT_BLOODSUCKER_HUNTER) diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm index 89def9e56e1b..6524f497c56c 100644 --- a/code/modules/jobs/job_types/detective.dm +++ b/code/modules/jobs/job_types/detective.dm @@ -17,8 +17,8 @@ alt_titles = list("Forensic Analyst", "Private Eye") - added_access = list() - base_access = list(ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_MECH_SECURITY, ACCESS_COURT, ACCESS_BRIG, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) + added_access = list(ACCESS_EXTERNAL_AIRLOCKS) + base_access = list(ACCESS_SEC_BASIC, ACCESS_DETECTIVE, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_BRIG, ACCESS_WEAPONS_PERMIT, ACCESS_MECH_SECURITY) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_SEC mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) diff --git a/code/modules/jobs/job_types/geneticist.dm b/code/modules/jobs/job_types/geneticist.dm index 48c91a4329b4..9140376187a4 100644 --- a/code/modules/jobs/job_types/geneticist.dm +++ b/code/modules/jobs/job_types/geneticist.dm @@ -13,8 +13,9 @@ outfit = /datum/outfit/job/geneticist - added_access = list(ACCESS_CHEMISTRY, ACCESS_XENOBIOLOGY, ACCESS_ROBO_CONTROL, ACCESS_TECH_STORAGE, ACCESS_RND) - base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM) + added_access = list(ACCESS_CHEMISTRY, ACCESS_RESEARCH) + base_access = list(ACCESS_MEDICAL, ACCESS_SCIENCE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MORGUE, ACCESS_MECH_MEDICAL) + paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index 9d429aee2402..1b9cb3eda21f 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -20,13 +20,19 @@ outfit = /datum/outfit/job/hop added_access = list(ACCESS_CAPTAIN) - base_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS, - ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, 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_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, - ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, - ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION, - ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MANUFACTURING, ACCESS_SERVHALL) //yogs - added ACCESS_MANUFACTURING as it's the clerk's + base_access = list(ACCESS_COMMAND, ACCESS_SERVICE, ACCESS_CARGO, ACCESS_HOP, + ACCESS_CHANGE_IDS, ACCESS_PERSONAL_LOCKERS, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, + ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_BAR, ACCESS_KITCHEN, + ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_LAWYER, ACCESS_CLERK, + ACCESS_CARGO_BAY, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_QM, + ACCESS_MECH_MINING, ACCESS_SEC_BASIC, ACCESS_MAINT_TUNNELS, ACCESS_EVA, + ACCESS_WEAPONS_PERMIT, ACCESS_AI_SAT, ACCESS_MEDICAL, ACCESS_ENGINEERING, + ACCESS_AUX_BASE, ACCESS_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, + ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_VAULT, ACCESS_RC_ANNOUNCE, + ACCESS_KEYCARD_AUTH) + + + paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_SRV diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index f3e3820d7a46..173c9f052cef 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -20,11 +20,17 @@ outfit = /datum/outfit/job/hos mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) - added_access = list(ACCESS_CAPTAIN) - base_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MECH_SECURITY, - ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_ATMOSPHERICS, // yogs - HoS needs same access as engineering armband - ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING, - ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM, ACCESS_BRIG_PHYS) //Yogs: Gives HoS access to the brig physicians locker + added_access = list(ACCESS_CAPTAIN, ACCESS_AI_MASTER) + base_access = list(ACCESS_COMMAND, ACCESS_SECURITY, ACCESS_HOS, ACCESS_SEC_BASIC, + ACCESS_BRIG, ACCESS_ARMORY, ACCESS_DETECTIVE, ACCESS_BRIG_PHYS, + ACCESS_WEAPONS_PERMIT, ACCESS_LAWYER, ACCESS_MECH_SECURITY, + ACCESS_MORGUE, ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_PARAMEDIC, + ACCESS_ENGINEERING, ACCESS_ATMOSPHERICS, ACCESS_CONSTRUCTION, ACCESS_AUX_BASE, + ACCESS_EXTERNAL_AIRLOCKS, ACCESS_SCIENCE, ACCESS_TOXINS, ACCESS_EXPERIMENTATION, + ACCESS_XENOBIOLOGY, ACCESS_ROBOTICS, ACCESS_AI_SAT, ACCESS_CARGO, + ACCESS_CARGO_BAY, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MAINT_TUNNELS, + ACCESS_EVA, ACCESS_PERSONAL_LOCKERS, ACCESS_VAULT, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH) + paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_SEC diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm index 1f1230523a4b..e74ac4e6e67b 100644 --- a/code/modules/jobs/job_types/janitor.dm +++ b/code/modules/jobs/job_types/janitor.dm @@ -13,7 +13,9 @@ alt_titles = list("Custodian", "Sanitation Worker", "Cleaner", "Caretaker", "Maid") added_access = list() - base_access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_RESEARCH, ACCESS_MEDICAL, ACCESS_SERVHALL) + base_access = list(ACCESS_SERVICE, ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_CARGO, + ACCESS_SCIENCE, ACCESS_MEDICAL, ACCESS_CONSTRUCTION) + paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV diff --git a/code/modules/jobs/job_types/lawyer.dm b/code/modules/jobs/job_types/lawyer.dm index c02350bfb5ee..e900a962bb6c 100644 --- a/code/modules/jobs/job_types/lawyer.dm +++ b/code/modules/jobs/job_types/lawyer.dm @@ -14,7 +14,8 @@ outfit = /datum/outfit/job/lawyer added_access = list() - base_access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS, ACCESS_SERVHALL) + base_access = list(ACCESS_SERVICE, ACCESS_SEC_BASIC, ACCESS_LAWYER) + paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_CIV mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index e2a782ececef..284c7c33629b 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -14,8 +14,10 @@ outfit = /datum/outfit/job/doctor - added_access = list(ACCESS_CHEMISTRY, ACCESS_GENETICS) - base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM) + added_access = list(ACCESS_CHEMISTRY, ACCESS_GENETICS, ACCESS_VIROLOGY) + base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CLONING, + ACCESS_MECH_MEDICAL) + paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm index 8819aed7e85d..a972ffa52594 100644 --- a/code/modules/jobs/job_types/mime.dm +++ b/code/modules/jobs/job_types/mime.dm @@ -12,8 +12,8 @@ alt_titles = list("Mute Entertainer", "Silent Jokester", "Pantomimist") - added_access = list() - base_access = list(ACCESS_THEATRE, ACCESS_SERVHALL) + added_access = list(ACCESS_MAINT_TUNNELS) + base_access = list(ACCESS_SERVICE, ACCESS_THEATRE) paycheck = PAYCHECK_MINIMAL paycheck_department = ACCOUNT_SRV diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm index ca92acfb1dea..86432c33764b 100644 --- a/code/modules/jobs/job_types/quartermaster.dm +++ b/code/modules/jobs/job_types/quartermaster.dm @@ -8,10 +8,16 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" + outfit = /datum/outfit/job/quartermaster + alt_titles = list("Stock Controller", "Cargo Coordinator", "Shipping Overseer", "Postmaster General") + added_access = list() - base_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_VAULT, ACCESS_RC_ANNOUNCE) + base_access = list(ACCESS_CARGO, ACCESS_QM, ACCESS_CARGO_BAY, ACCESS_MINING, + ACCESS_MINING_STATION, ACCESS_MAINT_TUNNELS, ACCESS_MECH_MINING, + ACCESS_VAULT, ACCESS_AUX_BASE, ACCESS_RC_ANNOUNCE) + paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_CAR display_order = JOB_DISPLAY_ORDER_QUARTERMASTER diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm index 4504449a16e7..21537077bb69 100644 --- a/code/modules/jobs/job_types/research_director.dm +++ b/code/modules/jobs/job_types/research_director.dm @@ -22,11 +22,13 @@ outfit = /datum/outfit/job/rd added_access = list(ACCESS_CAPTAIN) - base_access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE, - ACCESS_TOX_STORAGE, ACCESS_TELEPORTER, ACCESS_SEC_DOORS, ACCESS_MECH_SCIENCE, - ACCESS_RESEARCH, ACCESS_RND, ACCESS_ROBO_CONTROL, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD, - ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, - ACCESS_TECH_STORAGE, ACCESS_MINISAT, ACCESS_MAINT_TUNNELS, ACCESS_NETWORK) + base_access = list(ACCESS_COMMAND, ACCESS_SCIENCE, ACCESS_RD, ACCESS_RESEARCH, + ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_EXPERIMENTATION, ACCESS_GENETICS, + ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_XENOBIOLOGY, ACCESS_RND_SERVERS, + ACCESS_AI_MASTER, ACCESS_AI_SAT, ACCESS_MECH_SCIENCE, ACCESS_TELEPORTER, + ACCESS_AUX_BASE, ACCESS_SEC_BASIC, ACCESS_MAINT_TUNNELS, ACCESS_RC_ANNOUNCE, + ACCESS_KEYCARD_AUTH) + paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_SCI diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm index 24a090244dc9..ffd5560039da 100644 --- a/code/modules/jobs/job_types/roboticist.dm +++ b/code/modules/jobs/job_types/roboticist.dm @@ -13,8 +13,10 @@ outfit = /datum/outfit/job/roboticist - added_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_XENOBIOLOGY, ACCESS_GENETICS, ACCESS_RND) - base_access = list(ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_RESEARCH, ACCESS_MECH_SCIENCE, ACCESS_MECH_ENGINE, ACCESS_MECH_MEDICAL, ACCESS_MECH_MINING, ACCESS_MINERAL_STOREROOM) + added_access = list(ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_XENOBIOLOGY, ACCESS_GENETICS, ACCESS_RESEARCH, ACCESS_EXPERIMENTATION) + base_access = list(ACCESS_SCIENCE, ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_MORGUE, + ACCESS_MECH_SCIENCE, ACCESS_MECH_ENGINE, ACCESS_MECH_MEDICAL, ACCESS_MECH_MINING) + paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_SCI diff --git a/code/modules/jobs/job_types/scientist.dm b/code/modules/jobs/job_types/scientist.dm index cdb4bce39e17..f0f851633a56 100644 --- a/code/modules/jobs/job_types/scientist.dm +++ b/code/modules/jobs/job_types/scientist.dm @@ -12,8 +12,9 @@ alt_titles = list("Researcher", "Toxins Specialist", "Physicist", "Test Associate", "Anomalist", "Quantum Physicist", "Theoretical Physicist", "Xenobiologist", "Explosives Technician", "Hypothetical Physicist") outfit = /datum/outfit/job/scientist - added_access = list(ACCESS_ROBO_CONTROL, ACCESS_TECH_STORAGE, ACCESS_GENETICS) - base_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_RND, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM) + added_access = list(ACCESS_ROBO_CONTROL, ACCESS_GENETICS) + base_access = list(ACCESS_SCIENCE, ACCESS_RESEARCH, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, + ACCESS_EXPERIMENTATION, ACCESS_XENOBIOLOGY, ACCESS_AUX_BASE, ACCESS_MECH_SCIENCE) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_SCI diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index eb7df690e7c3..fed23668d65b 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -17,8 +17,10 @@ alt_titles = list("Threat Response Officer", "Civilian Protection Officer", "Corporate Officer", "Peacekeeper") - added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_FORENSICS_LOCKERS) - base_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MECH_SECURITY, ACCESS_MINERAL_STOREROOM) // See /datum/job/officer/get_access() + added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_DETECTIVE, ACCESS_BRIG_PHYS) + base_access = list(ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_WEAPONS_PERMIT, + ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MECH_SECURITY) // See /datum/job/officer/get_access() + paycheck = PAYCHECK_HARD paycheck_department = ACCOUNT_SEC mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) @@ -70,35 +72,35 @@ GLOBAL_LIST_INIT(available_depts_sec, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICA switch(department) if(SEC_DEPT_SUPPLY) ears = /obj/item/radio/headset/headset_sec/alt/department/supply - dep_access = list(ACCESS_MAILSORTING, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_CARGO) + dep_access = list(ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_MINING, ACCESS_MINING_STATION) destination = /area/security/checkpoint/supply spawn_point = locate(/obj/effect/landmark/start/depsec/supply) in GLOB.department_security_spawns accessory = /obj/item/clothing/accessory/armband/cargo minimal_lightup_areas |= GLOB.supply_lightup_areas if(SEC_DEPT_ENGINEERING) ears = /obj/item/radio/headset/headset_sec/alt/department/engi - dep_access = list(ACCESS_CONSTRUCTION, ACCESS_ENGINE, ACCESS_ATMOSPHERICS) + dep_access = list(ACCESS_ENGINEERING, ACCESS_ATMOSPHERICS, ACCESS_CONSTRUCTION, ACCESS_TECH_STORAGE, ACCESS_TCOMMS) destination = /area/security/checkpoint/engineering spawn_point = locate(/obj/effect/landmark/start/depsec/engineering) in GLOB.department_security_spawns accessory = /obj/item/clothing/accessory/armband/engine minimal_lightup_areas |= GLOB.engineering_lightup_areas if(SEC_DEPT_MEDICAL) ears = /obj/item/radio/headset/headset_sec/alt/department/med - dep_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CLONING) + dep_access = list(ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_PARAMEDIC, ACCESS_CHEMISTRY, ACCESS_CLONING, ACCESS_VIROLOGY, ACCESS_PSYCHOLOGY, ACCESS_GENETICS) destination = /area/security/checkpoint/medical spawn_point = locate(/obj/effect/landmark/start/depsec/medical) in GLOB.department_security_spawns accessory = /obj/item/clothing/accessory/armband/medblue minimal_lightup_areas |= GLOB.medical_lightup_areas if(SEC_DEPT_SCIENCE) ears = /obj/item/radio/headset/headset_sec/alt/department/sci - dep_access = list(ACCESS_RESEARCH, ACCESS_TOX, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY) + dep_access = list(ACCESS_SCIENCE, ACCESS_TOXINS, ACCESS_EXPERIMENTATION, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY) destination = /area/security/checkpoint/science spawn_point = locate(/obj/effect/landmark/start/depsec/science) in GLOB.department_security_spawns accessory = /obj/item/clothing/accessory/armband/science minimal_lightup_areas |= GLOB.science_lightup_areas if(SEC_DEPT_SERVICE) ears = /obj/item/radio/headset/headset_sec/alt/department/service - dep_access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_LIBRARY, ACCESS_THEATRE, ACCESS_JANITOR, ACCESS_CHAPEL_OFFICE, ACCESS_MANUFACTURING ) + dep_access = list(ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CLERK) destination = /area/security/checkpoint/service spawn_point = locate(/obj/effect/landmark/start/depsec/service) in GLOB.department_security_spawns accessory = /obj/item/clothing/accessory/armband/service diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index 63ba452eadea..af917644e4e2 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -12,8 +12,10 @@ outfit = /datum/outfit/job/miner - added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_QM, ACCESS_RESEARCH, ACCESS_RND) - base_access = list(ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM) + added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO_BAY, ACCESS_QM, ACCESS_SCIENCE, + ACCESS_RESEARCH, ACCESS_AUX_BASE) + base_access = list(ACCESS_CARGO, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING) + paycheck = PAYCHECK_HARD paycheck_department = ACCOUNT_CAR diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm index 7cea11c4e731..aab47082a52a 100644 --- a/code/modules/jobs/job_types/station_engineer.dm +++ b/code/modules/jobs/job_types/station_engineer.dm @@ -14,9 +14,10 @@ outfit = /datum/outfit/job/engineer - added_access = list(ACCESS_ATMOSPHERICS, ACCESS_RESEARCH, ACCESS_RND) - base_access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_MECH_ENGINE, - ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_TCOMSAT, ACCESS_MINERAL_STOREROOM) + added_access = list(ACCESS_ATMOSPHERICS, ACCESS_SCIENCE, ACCESS_RESEARCH) + base_access = list(ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_MECH_ENGINE, + ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_AUX_BASE) + paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_ENG @@ -61,20 +62,24 @@ GLOBAL_LIST_INIT(available_depts_eng, list(ENG_DEPT_MEDICAL, ENG_DEPT_SCIENCE, E switch(department) if(ENG_DEPT_SUPPLY) ears = /obj/item/radio/headset/headset_eng/department/supply - dep_access = list(ACCESS_MAILSORTING, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_CARGO) + dep_access = list(ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_MINING, ACCESS_MINING_STATION) accessory = /obj/item/clothing/accessory/armband/cargo + minimal_lightup_areas |= GLOB.supply_lightup_areas if(ENG_DEPT_MEDICAL) ears = /obj/item/radio/headset/headset_eng/department/med - dep_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_VIROLOGY, ACCESS_GENETICS) + dep_access = list(ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_GENETICS) accessory = /obj/item/clothing/accessory/armband/medblue + minimal_lightup_areas |= GLOB.medical_lightup_areas if(ENG_DEPT_SCIENCE) ears = /obj/item/radio/headset/headset_eng/department/sci - dep_access = list(ACCESS_RESEARCH, ACCESS_TOX, ACCESS_XENOBIOLOGY, ACCESS_TOX_STORAGE) + dep_access = list(ACCESS_SCIENCE, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_EXPERIMENTATION, ACCESS_XENOBIOLOGY) accessory = /obj/item/clothing/accessory/armband/science + minimal_lightup_areas |= GLOB.science_lightup_areas if(ENG_DEPT_SERVICE) ears = /obj/item/radio/headset/headset_eng/department/service - dep_access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_LIBRARY, ACCESS_THEATRE, ACCESS_JANITOR, ACCESS_CHAPEL_OFFICE, ACCESS_MANUFACTURING, ACCESS_SERVHALL) + dep_access = list(ACCESS_SERVICE, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CLERK) accessory = /obj/item/clothing/accessory/armband/service + if(accessory) var/obj/item/clothing/under/U = H.w_uniform diff --git a/code/modules/jobs/job_types/synthetic.dm b/code/modules/jobs/job_types/synthetic.dm index c850d2c54171..5e648fdf9b10 100644 --- a/code/modules/jobs/job_types/synthetic.dm +++ b/code/modules/jobs/job_types/synthetic.dm @@ -1,16 +1,11 @@ GLOBAL_LIST_INIT(synthetic_base_access, list( - ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, - ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_RD, - ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_CHEMISTRY, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS, - ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, - ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_HEADS, ACCESS_CAPTAIN, ACCESS_ALL_PERSONAL_LOCKERS, - ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH_STORAGE, ACCESS_CHAPEL_OFFICE, ACCESS_ATMOSPHERICS, ACCESS_KITCHEN, - ACCESS_BAR, ACCESS_JANITOR, ACCESS_CREMATORIUM, ACCESS_ROBO_CONTROL, ACCESS_ROBOTICS, ACCESS_CARGO, ACCESS_CONSTRUCTION, - ACCESS_HYDROPONICS, ACCESS_LIBRARY, ACCESS_LAWYER, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_QM, ACCESS_SURGERY, - ACCESS_THEATRE, ACCESS_RESEARCH, ACCESS_RND, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_WEAPONS, - ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, - ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_RC_ANNOUNCE, - ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_NETWORK, ACCESS_CLONING, ACCESS_TCOM_ADMIN, ACCESS_PARAMEDIC, ACCESS_MANUFACTURING, ACCESS_BRIG_PHYS, ACCESS_PSYCH, ACCESS_SERVHALL)) + ACCESS_SERVICE, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_LAWYER, ACCESS_CLERK, ACCESS_HOP, + ACCESS_SECURITY, ACCESS_SEC_BASIC, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_DETECTIVE, ACCESS_BRIG_PHYS, ACCESS_WEAPONS_PERMIT, ACCESS_LAWYER, ACCESS_MECH_SECURITY, ACCESS_HOS, + ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_PARAMEDIC, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_PSYCHOLOGY, ACCESS_GENETICS, ACCESS_BRIG_PHYS, ACCESS_MECH_MEDICAL, ACCESS_CMO, + ACCESS_SCIENCE, ACCESS_RESEARCH, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_EXPERIMENTATION, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_XENOBIOLOGY, ACCESS_RND_SERVERS, ACCESS_AI_MASTER, ACCESS_AI_SAT, ACCESS_MECH_SCIENCE, ACCESS_RD, + ACCESS_ENGINEERING, ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ENGINE_EQUIP, ACCESS_CONSTRUCTION, ACCESS_TECH_STORAGE, ACCESS_SECURE_TECH, ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_AUX_BASE, ACCESS_MECH_ENGINE, ACCESS_CE, + ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_VAULT, ACCESS_MECH_MINING, ACCESS_QM, + ACCESS_COMMAND, ACCESS_AI_MASTER, ACCESS_AI_SAT, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_VAULT, ACCESS_SECURE_TECH, ACCESS_RND_SERVERS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMMS_ADMIN, ACCESS_PERSONAL_LOCKERS, ACCESS_CHANGE_IDS, ACCESS_HOP, ACCESS_CAPTAIN)) GLOBAL_LIST_EMPTY(synthetic_added_access) diff --git a/code/modules/jobs/job_types/virologist.dm b/code/modules/jobs/job_types/virologist.dm index 9a64807262db..918a071ff94d 100644 --- a/code/modules/jobs/job_types/virologist.dm +++ b/code/modules/jobs/job_types/virologist.dm @@ -18,7 +18,8 @@ alt_titles = list("Microbiologist", "Pathologist", "Junior Disease Researcher", "Epidemiologist", "Disease Control Expert") added_access = list(ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_GENETICS, ACCESS_CLONING) - base_access = list(ACCESS_MEDICAL, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM) + base_access = list(ACCESS_MEDICAL, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL) + paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index 3bf719b03290..7e0791411c37 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -19,8 +19,10 @@ alt_titles = list("Brig Watchman", "Brig Superintendent", "Security Dispatcher", "Prison Supervisor") - added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_FORENSICS_LOCKERS, ACCESS_BRIG_PHYS, ACCESS_MEDICAL) //they get medical access because apparently the windoors AREN'T BRIG PHYS ACCESS - base_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_MECH_SECURITY, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) // See /datum/job/warden/get_access() + added_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_DETECTIVE) + base_access = list(ACCESS_SECURITY, ACCESS_ARMORY, ACCESS_SEC_BASIC, ACCESS_BRIG, + ACCESS_MECH_SECURITY, ACCESS_WEAPONS_PERMIT, ACCESS_BRIG_PHYS, ACCESS_EXTERNAL_AIRLOCKS) // See /datum/job/warden/get_access() + paycheck = PAYCHECK_HARD paycheck_department = ACCOUNT_SEC mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) diff --git a/code/modules/mapping/access_helpers/airlock_helpers.dm b/code/modules/mapping/access_helpers/airlock_helpers.dm new file mode 100644 index 000000000000..1830fa2bc1c4 --- /dev/null +++ b/code/modules/mapping/access_helpers/airlock_helpers.dm @@ -0,0 +1,851 @@ +/obj/effect/mapping_helpers/airlock/access + layer = DOOR_ACCESS_HELPER_LAYER + icon_state = "access_helper" + +// These are mutually exclusive; can't have req_any and req_all +/obj/effect/mapping_helpers/airlock/access/any/payload(obj/machinery/door/airlock/airlock) + if(airlock.req_access != null) + log_mapping("[src] access helper at [AREACOORD(src)] tried to set req_one_access, but req_access was already set!") + else + var/list/access_list = get_access() + airlock.req_one_access += access_list + +/obj/effect/mapping_helpers/airlock/access/all/payload(obj/machinery/door/airlock/airlock) + if(airlock.req_one_access != null) + log_mapping("[src] access helper at [AREACOORD(src)] tried to set req_one_access, but req_access was already set!") + else + var/list/access_list = get_access() + airlock.req_access += access_list + +/obj/effect/mapping_helpers/airlock/access/proc/get_access() + var/list/access = list() + return access + + +//// HELPERS START - PLEASE KEEP EVERYTHING IN THE SAME ORDER AS IN ACCESS.DM THANKS + +/// REQ ANY /// +// Applies onto req_one_access (only requires ONE of the given accesses to open) + +//--- COMMAND ---// + +/obj/effect/mapping_helpers/airlock/access/any/command + icon_state = "access_helper_com" + +/obj/effect/mapping_helpers/airlock/access/any/command/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_COMMAND + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/command/ai_master/get_access() + var/list/access_list = ..() + access_list += ACCESS_AI_MASTER + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/command/ai_sat/get_access() + var/list/access_list = ..() + access_list += ACCESS_AI_SAT + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/command/teleporter/get_access() + var/list/access_list = ..() + access_list += ACCESS_TELEPORTER + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/command/eva/get_access() + var/list/access_list = ..() + access_list += ACCESS_EVA + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/command/vault/get_access() + var/list/access_list = ..() + access_list += ACCESS_VAULT + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/command/captain/get_access() + var/list/access_list = ..() + access_list += ACCESS_CAPTAIN + return access_list + + +//--- SECURITY ---// + +/obj/effect/mapping_helpers/airlock/access/any/security + icon_state = "access_helper_sec" + +/obj/effect/mapping_helpers/airlock/access/any/security/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_SECURITY + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/security/basic/get_access() + var/list/access_list = ..() + access_list += ACCESS_SEC_BASIC + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/security/brig/get_access() + var/list/access_list = ..() + access_list += ACCESS_BRIG + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/security/armory/get_access() + var/list/access_list = ..() + access_list += ACCESS_ARMORY + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/security/detective/get_access() + var/list/access_list = ..() + access_list += ACCESS_DETECTIVE + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/security/brig_phys/get_access() + var/list/access_list = ..() + access_list += ACCESS_BRIG_PHYS + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/security/hos/get_access() + var/list/access_list = ..() + access_list += ACCESS_HOS + return access_list + + +//--- ENGINEERING ---// + +/obj/effect/mapping_helpers/airlock/access/any/engineering + icon_state = "access_helper_eng" + +/obj/effect/mapping_helpers/airlock/access/any/engineering/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_ENGINEERING + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos/get_access() + var/list/access_list = ..() + access_list += ACCESS_ATMOSPHERICS + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/get_access() + var/list/access_list = ..() + access_list += ACCESS_MAINT_TUNNELS + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/engineering/external/get_access() + var/list/access_list = ..() + access_list += ACCESS_EXTERNAL_AIRLOCKS + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/engineering/equipment/get_access() + var/list/access_list = ..() + access_list += ACCESS_ENGINE_EQUIP + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction/get_access() + var/list/access_list = ..() + access_list += ACCESS_CONSTRUCTION + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/engineering/tech_storage/get_access() + var/list/access_list = ..() + access_list += ACCESS_TECH_STORAGE + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/engineering/secure_tech/get_access() + var/list/access_list = ..() + access_list += ACCESS_SECURE_TECH + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcomms/get_access() + var/list/access_list = ..() + access_list += ACCESS_TCOMMS + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/engineering/aux_base/get_access() + var/list/access_list = ..() + access_list += ACCESS_AUX_BASE + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/engineering/ce/get_access() + var/list/access_list = ..() + access_list += ACCESS_CE + return access_list + + +//--- MEDICAL ---// + +/obj/effect/mapping_helpers/airlock/access/any/medical + icon_state = "access_helper_med" + +/obj/effect/mapping_helpers/airlock/access/any/medical/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_MEDICAL + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/medical/surgery/get_access() + var/list/access_list = ..() + access_list += ACCESS_SURGERY + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/medical/paramedic/get_access() + var/list/access_list = ..() + access_list += ACCESS_PARAMEDIC + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/medical/morgue/get_access() + var/list/access_list = ..() + access_list += ACCESS_MORGUE + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/medical/chemistry/get_access() + var/list/access_list = ..() + access_list += ACCESS_CHEMISTRY + +/obj/effect/mapping_helpers/airlock/access/any/medical/cloning/get_access() + var/list/access_list = ..() + access_list += ACCESS_CLONING + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/medical/virology/get_access() + var/list/access_list = ..() + access_list += ACCESS_VIROLOGY + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/medical/psychology/get_access() + var/list/access_list = ..() + access_list += ACCESS_PSYCHOLOGY + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/medical/cmo/get_access() + var/list/access_list = ..() + access_list += ACCESS_CMO + return access_list + + +//--- SUPPLY ---// + +/obj/effect/mapping_helpers/airlock/access/any/supply + icon_state = "access_helper_sup" + +/obj/effect/mapping_helpers/airlock/access/any/supply/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_CARGO + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/supply/cargo_bay/get_access() + var/list/access_list = ..() + access_list += ACCESS_CARGO_BAY + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/supply/mining/get_access() + var/list/access_list = ..() + access_list += ACCESS_MINING + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station/get_access() + var/list/access_list = ..() + access_list += ACCESS_MINING_STATION + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/supply/qm/get_access() + var/list/access_list = ..() + access_list += ACCESS_QM + return access_list + + +//--- SCIENCE ---// + +/obj/effect/mapping_helpers/airlock/access/any/science + icon_state = "access_helper_sci" + +/obj/effect/mapping_helpers/airlock/access/any/science/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_SCIENCE + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/science/research/get_access() + var/list/access_list = ..() + access_list += ACCESS_RESEARCH + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/science/toxins/get_access() + var/list/access_list = ..() + access_list += ACCESS_TOXINS + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/science/toxins_storage/get_access() + var/list/access_list = ..() + access_list += ACCESS_TOXINS_STORAGE + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/science/experimentation/get_access() + var/list/access_list = ..() + access_list += ACCESS_EXPERIMENTATION + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/science/genetics/get_access() + var/list/access_list = ..() + access_list += ACCESS_GENETICS + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/science/robotics/get_access() + var/list/access_list = ..() + access_list += ACCESS_ROBOTICS + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/science/xenobio/get_access() + var/list/access_list = ..() + access_list += ACCESS_XENOBIOLOGY + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/science/rnd_servers/get_access() + var/list/access_list = ..() + access_list += ACCESS_RND_SERVERS + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/science/rd/get_access() + var/list/access_list = ..() + access_list += ACCESS_RD + return access_list + + +//--- SERVICE ---// +/obj/effect/mapping_helpers/airlock/access/any/service + icon_state = "access_helper_serv" + +/obj/effect/mapping_helpers/airlock/access/any/service/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_SERVICE + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/service/theatre/get_access() + var/list/access_list = ..() + access_list += ACCESS_THEATRE + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/service/chapel_office/get_access() + var/list/access_list = ..() + access_list += ACCESS_CHAPEL_OFFICE + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/service/crematorium/get_access() + var/list/access_list = ..() + access_list += ACCESS_CREMATORIUM + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/service/library/get_access() + var/list/access_list = ..() + access_list += ACCESS_LIBRARY + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/service/bar/get_access() + var/list/access_list = ..() + access_list += ACCESS_BAR + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/service/kitchen/get_access() + var/list/access_list = ..() + access_list += ACCESS_KITCHEN + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics/get_access() + var/list/access_list = ..() + access_list += ACCESS_HYDROPONICS + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/service/janitor/get_access() + var/list/access_list = ..() + access_list += ACCESS_JANITOR + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/service/lawyer/get_access() + var/list/access_list = ..() + access_list += ACCESS_LAWYER + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/service/clerk/get_access() + var/list/access_list = ..() + access_list += ACCESS_CLERK + return access_list + +/obj/effect/mapping_helpers/airlock/access/any/service/hop/get_access() + var/list/access_list = ..() + access_list += ACCESS_HOP + return access_list + + +/// REQ ALL /// +// Applies onto req_access (requires ALL of the given accesses to open) +// Note: If a door only has one access req, - always - use this type + +//--- COMMAND ---// + +/obj/effect/mapping_helpers/airlock/access/all/command + icon_state = "access_helper_com" + +/obj/effect/mapping_helpers/airlock/access/all/command/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_COMMAND + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/command/ai_master/get_access() + var/list/access_list = ..() + access_list += ACCESS_AI_MASTER + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/command/ai_sat/get_access() + var/list/access_list = ..() + access_list += ACCESS_AI_SAT + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/command/teleporter/get_access() + var/list/access_list = ..() + access_list += ACCESS_TELEPORTER + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/command/eva/get_access() + var/list/access_list = ..() + access_list += ACCESS_EVA + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/command/vault/get_access() + var/list/access_list = ..() + access_list += ACCESS_VAULT + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/command/captain/get_access() + var/list/access_list = ..() + access_list += ACCESS_CAPTAIN + return access_list + + +//--- SECURITY ---// + +/obj/effect/mapping_helpers/airlock/access/all/security + icon_state = "access_helper_sec" + +/obj/effect/mapping_helpers/airlock/access/all/security/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_SECURITY + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/security/basic/get_access() + var/list/access_list = ..() + access_list += ACCESS_SEC_BASIC + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/security/brig/get_access() + var/list/access_list = ..() + access_list += ACCESS_BRIG + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/security/armory/get_access() + var/list/access_list = ..() + access_list += ACCESS_ARMORY + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/security/detective/get_access() + var/list/access_list = ..() + access_list += ACCESS_DETECTIVE + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/security/brig_phys/get_access() + var/list/access_list = ..() + access_list += ACCESS_BRIG_PHYS + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/security/hos/get_access() + var/list/access_list = ..() + access_list += ACCESS_HOS + return access_list + + +//--- ENGINEERING ---// + +/obj/effect/mapping_helpers/airlock/access/all/engineering + icon_state = "access_helper_eng" + +/obj/effect/mapping_helpers/airlock/access/all/engineering/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_ENGINEERING + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos/get_access() + var/list/access_list = ..() + access_list += ACCESS_ATMOSPHERICS + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance/get_access() + var/list/access_list = ..() + access_list += ACCESS_MAINT_TUNNELS + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/engineering/external/get_access() + var/list/access_list = ..() + access_list += ACCESS_EXTERNAL_AIRLOCKS + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment/get_access() + var/list/access_list = ..() + access_list += ACCESS_ENGINE_EQUIP + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction/get_access() + var/list/access_list = ..() + access_list += ACCESS_CONSTRUCTION + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage/get_access() + var/list/access_list = ..() + access_list += ACCESS_TECH_STORAGE + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/engineering/secure_tech/get_access() + var/list/access_list = ..() + access_list += ACCESS_SECURE_TECH + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcomms/get_access() + var/list/access_list = ..() + access_list += ACCESS_TCOMMS + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base/get_access() + var/list/access_list = ..() + access_list += ACCESS_AUX_BASE + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/engineering/ce/get_access() + var/list/access_list = ..() + access_list += ACCESS_CE + return access_list + + +//--- MEDICAL ---// + +/obj/effect/mapping_helpers/airlock/access/all/medical + icon_state = "access_helper_med" + +/obj/effect/mapping_helpers/airlock/access/all/medical/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_MEDICAL + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery/get_access() + var/list/access_list = ..() + access_list += ACCESS_SURGERY + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic/get_access() + var/list/access_list = ..() + access_list += ACCESS_PARAMEDIC + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue/get_access() + var/list/access_list = ..() + access_list += ACCESS_MORGUE + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry/get_access() + var/list/access_list = ..() + access_list += ACCESS_CHEMISTRY + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/medical/cloning/get_access() + var/list/access_list = ..() + access_list += ACCESS_CLONING + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/medical/virology/get_access() + var/list/access_list = ..() + access_list += ACCESS_VIROLOGY + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/medical/psychology/get_access() + var/list/access_list = ..() + access_list += ACCESS_PSYCHOLOGY + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/medical/cmo/get_access() + var/list/access_list = ..() + access_list += ACCESS_CMO + return access_list + + +//--- SUPPLY ---// + +/obj/effect/mapping_helpers/airlock/access/all/supply + icon_state = "access_helper_sup" + +/obj/effect/mapping_helpers/airlock/access/all/supply/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_CARGO + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay/get_access() + var/list/access_list = ..() + access_list += ACCESS_CARGO_BAY + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/supply/mining/get_access() + var/list/access_list = ..() + access_list += ACCESS_MINING + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station/get_access() + var/list/access_list = ..() + access_list += ACCESS_MINING_STATION + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/supply/qm/get_access() + var/list/access_list = ..() + access_list += ACCESS_QM + return access_list + + +//--- SCIENCE ---// + +/obj/effect/mapping_helpers/airlock/access/all/science + icon_state = "access_helper_sci" + +/obj/effect/mapping_helpers/airlock/access/all/science/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_SCIENCE + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/science/research/get_access() + var/list/access_list = ..() + access_list += ACCESS_RESEARCH + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/science/toxins/get_access() + var/list/access_list = ..() + access_list += ACCESS_TOXINS + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/science/toxins_storage/get_access() + var/list/access_list = ..() + access_list += ACCESS_TOXINS_STORAGE + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/science/experimentation/get_access() + var/list/access_list = ..() + access_list += ACCESS_EXPERIMENTATION + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/science/genetics/get_access() + var/list/access_list = ..() + access_list += ACCESS_GENETICS + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/science/robotics/get_access() + var/list/access_list = ..() + access_list += ACCESS_ROBOTICS + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio/get_access() + var/list/access_list = ..() + access_list += ACCESS_XENOBIOLOGY + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/science/rnd_servers/get_access() + var/list/access_list = ..() + access_list += ACCESS_RND_SERVERS + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/science/rd/get_access() + var/list/access_list = ..() + access_list += ACCESS_RD + return access_list + + +//--- SERVICE ---// +/obj/effect/mapping_helpers/airlock/access/all/service + icon_state = "access_helper_serv" + +/obj/effect/mapping_helpers/airlock/access/all/service/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_SERVICE + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/service/theatre/get_access() + var/list/access_list = ..() + access_list += ACCESS_THEATRE + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office/get_access() + var/list/access_list = ..() + access_list += ACCESS_CHAPEL_OFFICE + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium/get_access() + var/list/access_list = ..() + access_list += ACCESS_CREMATORIUM + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/service/library/get_access() + var/list/access_list = ..() + access_list += ACCESS_LIBRARY + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/service/bar/get_access() + var/list/access_list = ..() + access_list += ACCESS_BAR + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen/get_access() + var/list/access_list = ..() + access_list += ACCESS_KITCHEN + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics/get_access() + var/list/access_list = ..() + access_list += ACCESS_HYDROPONICS + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/service/janitor/get_access() + var/list/access_list = ..() + access_list += ACCESS_JANITOR + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/service/lawyer/get_access() + var/list/access_list = ..() + access_list += ACCESS_LAWYER + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/service/clerk/get_access() + var/list/access_list = ..() + access_list += ACCESS_CLERK + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/service/hop/get_access() + var/list/access_list = ..() + access_list += ACCESS_HOP + return access_list + + +//--- RUINS ---// +// Only giving req all to non-station helpers to cut down on bloat, feel free to add req any in the future if needed + +/obj/effect/mapping_helpers/airlock/access/all/ruins + icon_state = "access_helper_ruin" + +/obj/effect/mapping_helpers/airlock/access/all/ruins/general/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_GENERAL) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/ruins/command/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_COMMAND) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/ruins/security/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_SECURITY) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/ruins/engineering/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_ENGINEERING) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/ruins/medical/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_MEDICAL) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/ruins/supply/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_SUPPLY) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/ruins/science/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_SCIENCE) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/ruins/maintenance/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_MAINTENANCE) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/ruins/generic1/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_GENERIC1) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/ruins/generic2/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_GENERIC2) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/ruins/generic3/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_GENERIC3) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/ruins/generic4/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_GENERIC4) + return access_list + + +//--- ADMIN ---// + +/obj/effect/mapping_helpers/airlock/access/all/admin + icon_state = "access_helper_adm" + +/obj/effect/mapping_helpers/airlock/access/all/admin/general/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_GENERAL) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/admin/thunderdome/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_THUNDER) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/admin/medical/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_MEDICAL) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/admin/living/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_LIVING) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/admin/storage/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_STORAGE) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/admin/teleporter/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_TELEPORTER) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/admin/captain/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_CAPTAIN) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/admin/bar/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_BAR) + return access_list + + +//--- SYNDICATE ---// + +/obj/effect/mapping_helpers/airlock/access/all/syndicate + icon_state = "access_helper_syn" + +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_SYNDICATE) + return access_list + +/obj/effect/mapping_helpers/airlock/access/all/syndicate/leader/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_SYNDICATE_LEADER) + return access_list diff --git a/code/modules/mapping/access_helpers/windoor_helpers.dm b/code/modules/mapping/access_helpers/windoor_helpers.dm new file mode 100644 index 000000000000..e27e9210cec0 --- /dev/null +++ b/code/modules/mapping/access_helpers/windoor_helpers.dm @@ -0,0 +1,850 @@ +/obj/effect/mapping_helpers/windoor/access + icon_state = "windoor_access" + +// These are mutually exclusive; can't have req_any and req_all +/obj/effect/mapping_helpers/windoor/access/any/payload(obj/machinery/door/window/windoor) + if(windoor.req_access != null) + log_mapping("[src] access helper at [AREACOORD(src)] tried to set req_one_access, but req_access was already set!") + else + var/list/access_list = get_access() + windoor.req_one_access += access_list + +/obj/effect/mapping_helpers/windoor/access/all/payload(obj/machinery/door/window/windoor) + if(windoor.req_one_access != null) + log_mapping("[src] access helper at [AREACOORD(src)] tried to set req_one_access, but req_access was already set!") + else + var/list/access_list = get_access() + windoor.req_access += access_list + +/obj/effect/mapping_helpers/windoor/access/proc/get_access() + var/list/access = list() + return access + + +//// HELPERS START - PLEASE KEEP EVERYTHING IN THE SAME ORDER AS IN ACCESS.DM THANKS + +/// REQ ANY /// +// Applies onto req_one_access (only requires ONE of the given accesses to open) + +//--- COMMAND ---// + +/obj/effect/mapping_helpers/windoor/access/any/command + icon_state = "windoor_access_com" + +/obj/effect/mapping_helpers/windoor/access/any/command/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_COMMAND + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/command/ai_master/get_access() + var/list/access_list = ..() + access_list += ACCESS_AI_MASTER + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/command/ai_sat/get_access() + var/list/access_list = ..() + access_list += ACCESS_AI_SAT + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/command/teleporter/get_access() + var/list/access_list = ..() + access_list += ACCESS_TELEPORTER + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/command/eva/get_access() + var/list/access_list = ..() + access_list += ACCESS_EVA + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/command/vault/get_access() + var/list/access_list = ..() + access_list += ACCESS_VAULT + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/command/captain/get_access() + var/list/access_list = ..() + access_list += ACCESS_CAPTAIN + return access_list + + +//--- SECURITY ---// + +/obj/effect/mapping_helpers/windoor/access/any/security + icon_state = "windoor_access_sec" + +/obj/effect/mapping_helpers/windoor/access/any/security/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_SECURITY + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/security/basic/get_access() + var/list/access_list = ..() + access_list += ACCESS_SEC_BASIC + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/security/brig/get_access() + var/list/access_list = ..() + access_list += ACCESS_BRIG + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/security/armory/get_access() + var/list/access_list = ..() + access_list += ACCESS_ARMORY + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/security/detective/get_access() + var/list/access_list = ..() + access_list += ACCESS_DETECTIVE + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/security/brig_phys/get_access() + var/list/access_list = ..() + access_list += ACCESS_BRIG_PHYS + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/security/hos/get_access() + var/list/access_list = ..() + access_list += ACCESS_HOS + return access_list + + +//--- ENGINEERING ---// + +/obj/effect/mapping_helpers/windoor/access/any/engineering + icon_state = "windoor_access_eng" + +/obj/effect/mapping_helpers/windoor/access/any/engineering/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_ENGINEERING + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/engineering/atmos/get_access() + var/list/access_list = ..() + access_list += ACCESS_ATMOSPHERICS + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/engineering/maintenance/get_access() + var/list/access_list = ..() + access_list += ACCESS_MAINT_TUNNELS + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/engineering/external/get_access() + var/list/access_list = ..() + access_list += ACCESS_EXTERNAL_AIRLOCKS + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/engineering/equipment/get_access() + var/list/access_list = ..() + access_list += ACCESS_ENGINE_EQUIP + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/engineering/construction/get_access() + var/list/access_list = ..() + access_list += ACCESS_CONSTRUCTION + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/engineering/tech_storage/get_access() + var/list/access_list = ..() + access_list += ACCESS_TECH_STORAGE + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/engineering/secure_tech/get_access() + var/list/access_list = ..() + access_list += ACCESS_SECURE_TECH + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/engineering/tcomms/get_access() + var/list/access_list = ..() + access_list += ACCESS_TCOMMS + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/engineering/aux_base/get_access() + var/list/access_list = ..() + access_list += ACCESS_AUX_BASE + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/engineering/ce/get_access() + var/list/access_list = ..() + access_list += ACCESS_CE + return access_list + + +//--- MEDICAL ---// + +/obj/effect/mapping_helpers/windoor/access/any/medical + icon_state = "windoor_access_med" + +/obj/effect/mapping_helpers/windoor/access/any/medical/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_MEDICAL + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/medical/surgery/get_access() + var/list/access_list = ..() + access_list += ACCESS_SURGERY + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/medical/paramedic/get_access() + var/list/access_list = ..() + access_list += ACCESS_PARAMEDIC + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/medical/morgue/get_access() + var/list/access_list = ..() + access_list += ACCESS_MORGUE + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/medical/chemistry/get_access() + var/list/access_list = ..() + access_list += ACCESS_CHEMISTRY + +/obj/effect/mapping_helpers/windoor/access/any/medical/cloning/get_access() + var/list/access_list = ..() + access_list += ACCESS_CLONING + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/medical/virology/get_access() + var/list/access_list = ..() + access_list += ACCESS_VIROLOGY + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/medical/psychology/get_access() + var/list/access_list = ..() + access_list += ACCESS_PSYCHOLOGY + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/medical/cmo/get_access() + var/list/access_list = ..() + access_list += ACCESS_CMO + return access_list + + +//--- SUPPLY ---// + +/obj/effect/mapping_helpers/windoor/access/any/supply + icon_state = "windoor_access_sup" + +/obj/effect/mapping_helpers/windoor/access/any/supply/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_CARGO + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/supply/cargo_bay/get_access() + var/list/access_list = ..() + access_list += ACCESS_CARGO_BAY + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/supply/mining/get_access() + var/list/access_list = ..() + access_list += ACCESS_MINING + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/supply/mining_station/get_access() + var/list/access_list = ..() + access_list += ACCESS_MINING_STATION + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/supply/qm/get_access() + var/list/access_list = ..() + access_list += ACCESS_QM + return access_list + + +//--- SCIENCE ---// + +/obj/effect/mapping_helpers/windoor/access/any/science + icon_state = "windoor_access_sci" + +/obj/effect/mapping_helpers/windoor/access/any/science/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_SCIENCE + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/science/research/get_access() + var/list/access_list = ..() + access_list += ACCESS_RESEARCH + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/science/toxins/get_access() + var/list/access_list = ..() + access_list += ACCESS_TOXINS + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/science/toxins_storage/get_access() + var/list/access_list = ..() + access_list += ACCESS_TOXINS_STORAGE + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/science/experimentation/get_access() + var/list/access_list = ..() + access_list += ACCESS_EXPERIMENTATION + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/science/genetics/get_access() + var/list/access_list = ..() + access_list += ACCESS_GENETICS + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/science/robotics/get_access() + var/list/access_list = ..() + access_list += ACCESS_ROBOTICS + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/science/xenobio/get_access() + var/list/access_list = ..() + access_list += ACCESS_XENOBIOLOGY + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/science/rnd_servers/get_access() + var/list/access_list = ..() + access_list += ACCESS_RND_SERVERS + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/science/rd/get_access() + var/list/access_list = ..() + access_list += ACCESS_RD + return access_list + + +//--- SERVICE ---// +/obj/effect/mapping_helpers/windoor/access/any/service + icon_state = "windoor_access_serv" + +/obj/effect/mapping_helpers/windoor/access/any/service/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_SERVICE + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/service/theatre/get_access() + var/list/access_list = ..() + access_list += ACCESS_THEATRE + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/service/chapel_office/get_access() + var/list/access_list = ..() + access_list += ACCESS_CHAPEL_OFFICE + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/service/crematorium/get_access() + var/list/access_list = ..() + access_list += ACCESS_CREMATORIUM + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/service/library/get_access() + var/list/access_list = ..() + access_list += ACCESS_LIBRARY + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/service/bar/get_access() + var/list/access_list = ..() + access_list += ACCESS_BAR + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/service/kitchen/get_access() + var/list/access_list = ..() + access_list += ACCESS_KITCHEN + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/service/hydroponics/get_access() + var/list/access_list = ..() + access_list += ACCESS_HYDROPONICS + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/service/janitor/get_access() + var/list/access_list = ..() + access_list += ACCESS_JANITOR + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/service/lawyer/get_access() + var/list/access_list = ..() + access_list += ACCESS_LAWYER + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/service/clerk/get_access() + var/list/access_list = ..() + access_list += ACCESS_CLERK + return access_list + +/obj/effect/mapping_helpers/windoor/access/any/service/hop/get_access() + var/list/access_list = ..() + access_list += ACCESS_HOP + return access_list + + +/// REQ ALL /// +// Applies onto req_access (requires ALL of the given accesses to open) +// Note: If a door only has one access req, - always - use this type + +//--- COMMAND ---// + +/obj/effect/mapping_helpers/windoor/access/all/command + icon_state = "windoor_access_com" + +/obj/effect/mapping_helpers/windoor/access/all/command/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_COMMAND + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/command/ai_master/get_access() + var/list/access_list = ..() + access_list += ACCESS_AI_MASTER + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/command/ai_sat/get_access() + var/list/access_list = ..() + access_list += ACCESS_AI_SAT + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/command/teleporter/get_access() + var/list/access_list = ..() + access_list += ACCESS_TELEPORTER + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/command/eva/get_access() + var/list/access_list = ..() + access_list += ACCESS_EVA + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/command/vault/get_access() + var/list/access_list = ..() + access_list += ACCESS_VAULT + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/command/captain/get_access() + var/list/access_list = ..() + access_list += ACCESS_CAPTAIN + return access_list + + +//--- SECURITY ---// + +/obj/effect/mapping_helpers/windoor/access/all/security + icon_state = "windoor_access_sec" + +/obj/effect/mapping_helpers/windoor/access/all/security/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_SECURITY + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/security/basic/get_access() + var/list/access_list = ..() + access_list += ACCESS_SEC_BASIC + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/security/brig/get_access() + var/list/access_list = ..() + access_list += ACCESS_BRIG + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/security/armory/get_access() + var/list/access_list = ..() + access_list += ACCESS_ARMORY + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/security/detective/get_access() + var/list/access_list = ..() + access_list += ACCESS_DETECTIVE + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/security/brig_phys/get_access() + var/list/access_list = ..() + access_list += ACCESS_BRIG_PHYS + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/security/hos/get_access() + var/list/access_list = ..() + access_list += ACCESS_HOS + return access_list + + +//--- ENGINEERING ---// + +/obj/effect/mapping_helpers/windoor/access/all/engineering + icon_state = "windoor_access_eng" + +/obj/effect/mapping_helpers/windoor/access/all/engineering/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_ENGINEERING + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/engineering/atmos/get_access() + var/list/access_list = ..() + access_list += ACCESS_ATMOSPHERICS + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/engineering/maintenance/get_access() + var/list/access_list = ..() + access_list += ACCESS_MAINT_TUNNELS + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/engineering/external/get_access() + var/list/access_list = ..() + access_list += ACCESS_EXTERNAL_AIRLOCKS + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/engineering/equipment/get_access() + var/list/access_list = ..() + access_list += ACCESS_ENGINE_EQUIP + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/engineering/construction/get_access() + var/list/access_list = ..() + access_list += ACCESS_CONSTRUCTION + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/engineering/tech_storage/get_access() + var/list/access_list = ..() + access_list += ACCESS_TECH_STORAGE + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/engineering/secure_tech/get_access() + var/list/access_list = ..() + access_list += ACCESS_SECURE_TECH + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/engineering/tcomms/get_access() + var/list/access_list = ..() + access_list += ACCESS_TCOMMS + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/engineering/aux_base/get_access() + var/list/access_list = ..() + access_list += ACCESS_AUX_BASE + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/engineering/ce/get_access() + var/list/access_list = ..() + access_list += ACCESS_CE + return access_list + + +//--- MEDICAL ---// + +/obj/effect/mapping_helpers/windoor/access/all/medical + icon_state = "windoor_access_med" + +/obj/effect/mapping_helpers/windoor/access/all/medical/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_MEDICAL + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/medical/surgery/get_access() + var/list/access_list = ..() + access_list += ACCESS_SURGERY + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/medical/paramedic/get_access() + var/list/access_list = ..() + access_list += ACCESS_PARAMEDIC + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/medical/morgue/get_access() + var/list/access_list = ..() + access_list += ACCESS_MORGUE + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/medical/chemistry/get_access() + var/list/access_list = ..() + access_list += ACCESS_CHEMISTRY + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/medical/cloning/get_access() + var/list/access_list = ..() + access_list += ACCESS_CLONING + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/medical/virology/get_access() + var/list/access_list = ..() + access_list += ACCESS_VIROLOGY + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/medical/psychology/get_access() + var/list/access_list = ..() + access_list += ACCESS_PSYCHOLOGY + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/medical/cmo/get_access() + var/list/access_list = ..() + access_list += ACCESS_CMO + return access_list + + +//--- SUPPLY ---// + +/obj/effect/mapping_helpers/windoor/access/all/supply + icon_state = "windoor_access_sup" + +/obj/effect/mapping_helpers/windoor/access/all/supply/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_CARGO + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/supply/cargo_bay/get_access() + var/list/access_list = ..() + access_list += ACCESS_CARGO_BAY + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/supply/mining/get_access() + var/list/access_list = ..() + access_list += ACCESS_MINING + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/supply/mining_station/get_access() + var/list/access_list = ..() + access_list += ACCESS_MINING_STATION + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/supply/qm/get_access() + var/list/access_list = ..() + access_list += ACCESS_QM + return access_list + + +//--- SCIENCE ---// + +/obj/effect/mapping_helpers/windoor/access/all/science + icon_state = "windoor_access_sci" + +/obj/effect/mapping_helpers/windoor/access/all/science/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_SCIENCE + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/science/research/get_access() + var/list/access_list = ..() + access_list += ACCESS_RESEARCH + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/science/toxins/get_access() + var/list/access_list = ..() + access_list += ACCESS_TOXINS + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/science/toxins_storage/get_access() + var/list/access_list = ..() + access_list += ACCESS_TOXINS_STORAGE + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/science/experimentation/get_access() + var/list/access_list = ..() + access_list += ACCESS_EXPERIMENTATION + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/science/genetics/get_access() + var/list/access_list = ..() + access_list += ACCESS_GENETICS + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/science/robotics/get_access() + var/list/access_list = ..() + access_list += ACCESS_ROBOTICS + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/science/xenobio/get_access() + var/list/access_list = ..() + access_list += ACCESS_XENOBIOLOGY + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/science/rnd_servers/get_access() + var/list/access_list = ..() + access_list += ACCESS_RND_SERVERS + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/science/rd/get_access() + var/list/access_list = ..() + access_list += ACCESS_RD + return access_list + + +//--- SERVICE ---// +/obj/effect/mapping_helpers/windoor/access/all/service + icon_state = "windoor_access_serv" + +/obj/effect/mapping_helpers/windoor/access/all/service/general/get_access() + var/list/access_list = ..() + access_list += ACCESS_SERVICE + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/service/theatre/get_access() + var/list/access_list = ..() + access_list += ACCESS_THEATRE + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/service/chapel_office/get_access() + var/list/access_list = ..() + access_list += ACCESS_CHAPEL_OFFICE + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/service/crematorium/get_access() + var/list/access_list = ..() + access_list += ACCESS_CREMATORIUM + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/service/library/get_access() + var/list/access_list = ..() + access_list += ACCESS_LIBRARY + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/service/bar/get_access() + var/list/access_list = ..() + access_list += ACCESS_BAR + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/service/kitchen/get_access() + var/list/access_list = ..() + access_list += ACCESS_KITCHEN + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/service/hydroponics/get_access() + var/list/access_list = ..() + access_list += ACCESS_HYDROPONICS + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/service/janitor/get_access() + var/list/access_list = ..() + access_list += ACCESS_JANITOR + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/service/lawyer/get_access() + var/list/access_list = ..() + access_list += ACCESS_LAWYER + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/service/clerk/get_access() + var/list/access_list = ..() + access_list += ACCESS_CLERK + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/service/hop/get_access() + var/list/access_list = ..() + access_list += ACCESS_HOP + return access_list + + +//--- RUINS ---// +// Only giving req all to non-station helpers to cut down on bloat, feel free to add req any in the future if needed + +/obj/effect/mapping_helpers/windoor/access/all/ruins + icon_state = "windoor_access_ruin" + +/obj/effect/mapping_helpers/windoor/access/all/ruins/general/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_GENERAL) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/ruins/command/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_COMMAND) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/ruins/security/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_SECURITY) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/ruins/engineering/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_ENGINEERING) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/ruins/medical/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_MEDICAL) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/ruins/supply/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_SUPPLY) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/ruins/science/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_SCIENCE) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/ruins/maintenance/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_MAINTENANCE) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/ruins/generic1/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_GENERIC1) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/ruins/generic2/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_GENERIC2) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/ruins/generic3/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_GENERIC3) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/ruins/generic4/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_RUINS_GENERIC4) + return access_list + + +//--- ADMIN ---// + +/obj/effect/mapping_helpers/windoor/access/all/admin + icon_state = "windoor_access_adm" + +/obj/effect/mapping_helpers/windoor/access/all/admin/general/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_GENERAL) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/admin/thunderdome/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_THUNDER) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/admin/medical/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_MEDICAL) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/admin/living/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_LIVING) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/admin/storage/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_STORAGE) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/admin/teleporter/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_TELEPORTER) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/admin/captain/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_CAPTAIN) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/admin/bar/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_CENT_BAR) + return access_list + + +//--- SYNDICATE ---// + +/obj/effect/mapping_helpers/windoor/access/all/syndicate + icon_state = "windoor_access_syn" + +/obj/effect/mapping_helpers/windoor/access/all/syndicate/general/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_SYNDICATE) + return access_list + +/obj/effect/mapping_helpers/windoor/access/all/syndicate/leader/get_access() + var/list/access_list = ..() + access_list += list(ACCESS_SYNDICATE_LEADER) + return access_list diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index d7c0a5eef927..e5ea45844ed0 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -95,9 +95,10 @@ return late ? INITIALIZE_HINT_LATELOAD : INITIALIZE_HINT_QDEL -//airlock helpers +// Airlock helpers /obj/effect/mapping_helpers/airlock layer = DOOR_HELPER_LAYER + late = TRUE /obj/effect/mapping_helpers/airlock/Initialize(mapload) . = ..() @@ -109,6 +110,43 @@ log_mapping("[src] failed to find an airlock at [AREACOORD(src)]") else payload(airlock) + qdel(src) + +/obj/effect/mapping_helpers/airlock/LateInitialize() + . = ..() + var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc + if(!airlock) + qdel(src) + return + if(airlock.cyclelinkeddir) + airlock.cyclelinkairlock() + if(airlock.closeOtherId) + airlock.update_other_id() + if(airlock.abandoned) + var/outcome = rand(1,100) + switch(outcome) + if(1 to 9) + var/turf/here = get_turf(src) + for(var/obj/machinery/door/firedoor/FD in here) + qdel(FD) + for(var/turf/closed/T in range(2, src)) + here.place_on_top(T.type) + qdel(src) + return + here.place_on_top(/turf/closed/wall) + qdel(src) + return + if(10 to 11) + airlock.lights = FALSE + airlock.locked = TRUE + if(12 to 15) + airlock.locked = TRUE + if(16 to 23) + airlock.welded = TRUE + if(24 to 30) + airlock.panel_open = TRUE + update_appearance() + qdel(src) /obj/effect/mapping_helpers/airlock/proc/payload(obj/machinery/door/airlock/payload) return @@ -150,7 +188,6 @@ else airlock.locked = TRUE - /obj/effect/mapping_helpers/airlock/unres name = "airlock unresctricted side helper" icon_state = "airlock_unres_helper" @@ -168,6 +205,54 @@ else airlock.abandoned = TRUE +/obj/effect/mapping_helpers/airlock/inaccessible + name = "airlock inaccessible helper" + icon_state = "airlock_inaccessible" + +/obj/effect/mapping_helpers/airlock/inaccessible/payload(obj/machinery/door/airlock/airlock) + if(airlock.req_one_access != null) + log_mapping("[src] at [AREACOORD(src)] tried to set req_access, but req__one_access was already set!") + else + airlock.req_access += list(ACCESS_INACCESSIBLE) + + +// Windoor helpers +/obj/effect/mapping_helpers/windoor + layer = WINDOW_HELPER_LAYER + late = TRUE + +/obj/effect/mapping_helpers/windoor/Initialize(mapload) + . = ..() + if(!mapload) + log_mapping("[src] spawned outside of mapload!") + return + var/success = FALSE + var/windoor_present = FALSE + for(var/obj/machinery/door/window/windoor in loc) + windoor_present = TRUE + if(windoor.dir != dir) + continue + payload(windoor) + success = TRUE + if(!success) + log_mapping("[src] failed to find a windoor at [AREACOORD(src)]") + if(windoor_present && !success) + log_mapping("[src] attempted to imprint access at [AREACOORD(src)] but found no valid windoors (windoor present but not matching dir)") + qdel(src) + +/obj/effect/mapping_helpers/windoor/proc/payload(obj/machinery/door/window/payload) + return + +/obj/effect/mapping_helpers/windoor/inaccessible + name = "windoor inaccessible helper" + icon_state = "windoor_inaccessible" + +/obj/effect/mapping_helpers/windoor/inaccessible/payload(obj/machinery/door/window/windoor) + if(windoor.req_one_access != null) + log_mapping("[src] at [AREACOORD(src)] tried to set req_access, but req_one_access was already set!") + else + windoor.req_access += list(ACCESS_INACCESSIBLE) + //needs to do its thing before spawn_rivers() is called INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava) diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index 7436c5a9e50a..01cf7f048cb4 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -19,7 +19,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also deployed." icon = 'icons/obj/terminals.dmi' icon_state = "dorm_available" - req_one_access = list(ACCESS_CARGO, ACCESS_CONSTRUCTION, ACCESS_HEADS, ACCESS_RESEARCH) + req_one_access = list(ACCESS_CARGO, ACCESS_CONSTRUCTION, ACCESS_COMMAND, ACCESS_SCIENCE, ACCESS_RESEARCH) /// Shuttle ID of the base var/shuttleId = "colony_drop" /// If we give warnings before base is launched diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index 0d1a714d2c28..69cffe338349 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -9,7 +9,6 @@ density = TRUE input_dir = NORTH output_dir = SOUTH - req_access = list(ACCESS_MINERAL_STOREROOM) speed_process = TRUE circuit = /obj/item/circuitboard/machine/ore_redemption layer = BELOW_OBJ_LAYER diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 065700dbdea7..50f0c7be380a 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -455,9 +455,8 @@ I.access |= ACCESS_MINING I.access |= ACCESS_MINING_STATION I.access |= ACCESS_MECH_MINING - I.access |= ACCESS_MINERAL_STOREROOM I.access |= ACCESS_CARGO - I.access |= ACCESS_MAILSORTING + I.access |= ACCESS_CARGO to_chat(user, "You upgrade [I] with mining access.") qdel(src) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 4c6976964d5d..6d4a46637004 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -297,7 +297,7 @@ else //Implant and standard glasses check access if(H.wear_id) var/list/access = H.wear_id.GetAccess() - if(ACCESS_SEC_DOORS in access) + if(ACCESS_SEC_BASIC in access) allowed_access = H.get_authentification_name() if(!allowed_access) @@ -462,7 +462,7 @@ //Check for weapons if( (judgement_criteria & JUDGE_WEAPONCHECK) && weaponcheck) - if(!idcard || !(ACCESS_WEAPONS in idcard.access)) + if(!idcard || !(ACCESS_WEAPONS_PERMIT in idcard.access)) for(var/obj/item/I in held_items) //if they're holding a gun if(weaponcheck.Invoke(I)) threatcount += 4 diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index de3bfe9f2acf..55bea3d7df7d 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -187,7 +187,7 @@ /obj/effect/mob_spawn/human/corpse/cat_butcher name = "The Cat Surgeon" id_job = "Cat Surgeon" - id_access_list = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_MAINT) + id_access_list = list(ACCESS_RUINS_GENERAL, ACCESS_RUINS_MAINTENANCE) hair_style = "Cut Hair" facial_hair_style = "Watson Mustache" skin_tone = "caucasian1" diff --git a/code/modules/modular_computers/documentation.md b/code/modules/modular_computers/documentation.md index 88d059da7a6e..dca53c6e40a3 100644 --- a/code/modules/modular_computers/documentation.md +++ b/code/modules/modular_computers/documentation.md @@ -33,7 +33,7 @@ This is how the base program is setup. the rest is mostly tgui stuff. I'll use t /// This is access required to run the program itself. ONLY SET THIS FOR /// SUPER SECURE SHIT. This also acts as transfer_access as well. - required_access = access_network + required_access = access_engine_equip /// This is the access needed to download from ntnet or host on the ptp /// program. This is what you want to use most of the time. diff --git a/code/modules/modular_computers/file_system/programs/ai_network/_ai_network_program.dm b/code/modules/modular_computers/file_system/programs/ai_network/_ai_network_program.dm index 3da2fb2f16e8..8d38f55ed637 100644 --- a/code/modules/modular_computers/file_system/programs/ai_network/_ai_network_program.dm +++ b/code/modules/modular_computers/file_system/programs/ai_network/_ai_network_program.dm @@ -5,7 +5,7 @@ program_icon_state = "power_monitor" extended_desc = "This program connects to a local AI network to allow for administrative access" ui_header = "power_norm.gif" - transfer_access = ACCESS_NETWORK + transfer_access = ACCESS_ROBO_CONTROL usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP | PROGRAM_TABLET requires_ntnet = FALSE size = 8 diff --git a/code/modules/modular_computers/file_system/programs/antagonist/bomberman.dm b/code/modules/modular_computers/file_system/programs/antagonist/bomberman.dm index 61289df19d5a..1c81832ee3a9 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/bomberman.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/bomberman.dm @@ -85,7 +85,7 @@ GLOBAL_LIST_EMPTY(PDABombCodes) targetid = card_slot.GetID() if(targetid) // Adjust difficulty based on target's access - difficulty += BitCount(text2num(targetid.access_txt) & (ACCESS_MEDICAL | ACCESS_SECURITY | ACCESS_ENGINE | ACCESS_THEATRE | ACCESS_JANITOR | ACCESS_HEADS)) + difficulty += BitCount(text2num(targetid.access_txt) & (ACCESS_MEDICAL | ACCESS_SECURITY | ACCESS_ENGINEERING | ACCESS_THEATRE | ACCESS_JANITOR | ACCESS_COMMAND)) if(SEND_SIGNAL(target_computer, COMSIG_TABLET_CHECK_DETONATE) & COMPONENT_TABLET_NO_DETONATE || prob(difficulty * 15)) computer.visible_message(span_notice("Detonation failed. [bomb.uses] charges remaining."), null, null, 1) diff --git a/code/modules/modular_computers/file_system/programs/command/budgetviewer.dm b/code/modules/modular_computers/file_system/programs/command/budgetviewer.dm index e9e6706cf69f..1b5dfe5bad87 100644 --- a/code/modules/modular_computers/file_system/programs/command/budgetviewer.dm +++ b/code/modules/modular_computers/file_system/programs/command/budgetviewer.dm @@ -4,7 +4,7 @@ category = PROGRAM_CATEGORY_SUPPLY program_icon_state = "id" extended_desc = "This program will allow you to view the financial status of your department(s)." - transfer_access = ACCESS_HEADS + transfer_access = ACCESS_COMMAND usage_flags = PROGRAM_ALL requires_ntnet = 1 size = 3 diff --git a/code/modules/modular_computers/file_system/programs/command/card.dm b/code/modules/modular_computers/file_system/programs/command/card.dm index d791fe59a495..cda18d6e817f 100644 --- a/code/modules/modular_computers/file_system/programs/command/card.dm +++ b/code/modules/modular_computers/file_system/programs/command/card.dm @@ -12,7 +12,7 @@ category = PROGRAM_CATEGORY_EQUIPMENT program_icon_state = "id" extended_desc = "Program for programming employee ID cards to access parts of the station." - transfer_access = ACCESS_HEADS + transfer_access = ACCESS_COMMAND usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP | PROGRAM_TABLET | PROGRAM_PHONE | PROGRAM_PDA size = 8 tgui_id = "NtosCard" @@ -77,7 +77,7 @@ var/list/head_types = list() for(var/access_text in sub_managers) var/list/info = sub_managers[access_text] - var/access = text2num(access_text) + var/access = access_text if((access in id_card.access) && ((info["region"] in target_dept) || !length(target_dept))) region_access += info["region"] //I don't even know what I'm doing anymore @@ -227,7 +227,7 @@ if("PRG_access") if(!computer || !authenticated) return - var/access_type = text2num(params["access_target"]) + var/access_type = (params["access_target"]) if(access_type in (is_centcom ? get_all_centcom_access() : get_all_accesses())) if(access_type in target_id_card.access) target_id_card.access -= access_type @@ -250,7 +250,7 @@ if("PRG_grantregion") if(!computer || !authenticated) return - var/region = text2num(params["region"]) + var/region = (params["region"]) if(isnull(region) || (!(region in region_access) && minor)) return target_id_card.access |= get_region_accesses(region) @@ -259,7 +259,7 @@ if("PRG_denyregion") if(!computer || !authenticated) return - var/region = text2num(params["region"]) + var/region = (params["region"]) if(isnull(region) || (!(region in region_access) && minor)) return target_id_card.access -= get_region_accesses(region) diff --git a/code/modules/modular_computers/file_system/programs/command/jobmanagement.dm b/code/modules/modular_computers/file_system/programs/command/jobmanagement.dm index 44d1bda46bc5..ae0985223039 100644 --- a/code/modules/modular_computers/file_system/programs/command/jobmanagement.dm +++ b/code/modules/modular_computers/file_system/programs/command/jobmanagement.dm @@ -4,7 +4,7 @@ category = PROGRAM_CATEGORY_EQUIPMENT program_icon_state = "id" extended_desc = "Program for viewing and changing job slot availability." - transfer_access = ACCESS_HEADS + transfer_access = ACCESS_COMMAND usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP | PROGRAM_TABLET | PROGRAM_PHONE | PROGRAM_PDA size = 4 tgui_id = "NtosJobManager" diff --git a/code/modules/modular_computers/file_system/programs/command/synth_requester.dm b/code/modules/modular_computers/file_system/programs/command/synth_requester.dm index 8fd5ac50b755..fc1ed304120e 100644 --- a/code/modules/modular_computers/file_system/programs/command/synth_requester.dm +++ b/code/modules/modular_computers/file_system/programs/command/synth_requester.dm @@ -12,7 +12,7 @@ GLOBAL_LIST_INIT(granted_synthetic_access, list()) category = PROGRAM_CATEGORY_EQUIPMENT program_icon_state = "id" extended_desc = "Program for requesting synthetic assistance and granting departmental access." - transfer_access = ACCESS_HEADS + transfer_access = ACCESS_COMMAND usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP | PROGRAM_TABLET | PROGRAM_PHONE | PROGRAM_PDA size = 4 tgui_id = "NtosSynthManager" @@ -26,14 +26,14 @@ GLOBAL_LIST_INIT(granted_synthetic_access, list()) var/obj/item/card/id/user_id = user.get_idcard() computer.play_interact_sound() if(user_id) - if(!(ACCESS_HEADS in user_id.access)) + if(!(ACCESS_COMMAND in user_id.access)) return switch(action) if("grant_science") if(ACCESS_RD in user_id.access) - var/relevant_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_ROBO_CONTROL, ACCESS_TELEPORTER, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_ROBOTICS) + var/relevant_access = list(ACCESS_SCIENCE, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_ROBO_CONTROL, ACCESS_TELEPORTER, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_ROBOTICS) if(GLOB.granted_synthetic_access[SCIENCE]) GLOB.granted_synthetic_access[SCIENCE] = FALSE binary_talk("Synthetic assistance no longer required in the Science department", "Synthetic Access Requester") @@ -49,7 +49,7 @@ GLOBAL_LIST_INIT(granted_synthetic_access, list()) return TRUE if("grant_supply") if(ACCESS_HOP in user_id.access) - var/relevant_access = list(ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) + var/relevant_access = list(ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_CARGO, ACCESS_MINING_STATION) if(GLOB.granted_synthetic_access[SUPPLY]) GLOB.granted_synthetic_access[SUPPLY] = FALSE binary_talk("Synthetic assistance no longer required in the Supply department", "Synthetic Access Requester") @@ -66,7 +66,7 @@ GLOBAL_LIST_INIT(granted_synthetic_access, list()) return TRUE if("grant_engi") if(ACCESS_CE in user_id.access) - var/relevant_access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_ATMOSPHERICS, ACCESS_CONSTRUCTION, ACCESS_SECURE_TECH_STORAGE) + var/relevant_access = list(ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_ATMOSPHERICS, ACCESS_CONSTRUCTION, ACCESS_SECURE_TECH) if(GLOB.granted_synthetic_access[ENGINEERING]) GLOB.granted_synthetic_access[ENGINEERING] = FALSE binary_talk("Synthetic assistance no longer required in the Engineering department", "Synthetic Access Requester") @@ -82,7 +82,7 @@ GLOBAL_LIST_INIT(granted_synthetic_access, list()) return TRUE if("grant_security") if(ACCESS_HOS in user_id.access) - var/relevant_access = list(ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS, ACCESS_BRIG_PHYS) + var/relevant_access = list(ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_DETECTIVE, ACCESS_LAWYER, ACCESS_SEC_BASIC, ACCESS_BRIG_PHYS) if(GLOB.granted_synthetic_access[SECURITY]) GLOB.granted_synthetic_access[SECURITY] = FALSE binary_talk("Synthetic assistance no longer required in the Security department", "Synthetic Access Requester") @@ -98,7 +98,7 @@ GLOBAL_LIST_INIT(granted_synthetic_access, list()) return TRUE if("grant_medical") if(ACCESS_CMO in user_id.access) - var/relevant_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_PARAMEDIC, ACCESS_PSYCH) + var/relevant_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_PARAMEDIC, ACCESS_PSYCHOLOGY) if(GLOB.granted_synthetic_access[MEDICAL]) GLOB.granted_synthetic_access[MEDICAL] = FALSE binary_talk("Synthetic assistance no longer required in the Medical department", "Synthetic Access Requester") diff --git a/code/modules/modular_computers/file_system/programs/engineering/ntmonitor.dm b/code/modules/modular_computers/file_system/programs/engineering/ntmonitor.dm index b1f386031dc3..8afaa8ac2f55 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/ntmonitor.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/ntmonitor.dm @@ -7,7 +7,7 @@ size = 12 requires_ntnet = TRUE usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP | PROGRAM_TABLET | PROGRAM_PHONE | PROGRAM_TELESCREEN | PROGRAM_PDA - required_access = ACCESS_NETWORK //NETWORK CONTROL IS A MORE SECURE PROGRAM. + required_access = ACCESS_TCOMMS_ADMIN //NETWORK CONTROL IS A MORE SECURE PROGRAM. available_on_ntnet = TRUE tgui_id = "NtosNetMonitor" program_icon = "network-wired" diff --git a/code/modules/modular_computers/file_system/programs/engineering/powermonitor.dm b/code/modules/modular_computers/file_system/programs/engineering/powermonitor.dm index 9cec4ec6067b..551cbc399e0a 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/powermonitor.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/powermonitor.dm @@ -7,7 +7,7 @@ program_icon_state = "power_monitor" extended_desc = "This program connects to sensors around the station to provide information about electrical systems." ui_header = "power_norm.gif" - transfer_access = ACCESS_ENGINE + transfer_access = ACCESS_ENGINEERING usage_flags = PROGRAM_ALL requires_ntnet = 0 network_destination = "power monitoring system" diff --git a/code/modules/modular_computers/file_system/programs/engineering/reactor_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/reactor_monitor.dm index e0cc8bc198d9..d3b9eeb67756 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/reactor_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/reactor_monitor.dm @@ -7,7 +7,7 @@ program_icon_state = "smmon_0" extended_desc = "This program connects to specially calibrated sensors to provide information on the status of nuclear reactors." requires_ntnet = TRUE - transfer_access = ACCESS_ENGINE + transfer_access = ACCESS_ENGINEERING program_icon = "radiation" // duh //network_destination = "reactor monitoring system" dont need anymore? size = 2 diff --git a/code/modules/modular_computers/file_system/programs/engineering/sm_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/sm_monitor.dm index ace9b19eff09..6d029f38803e 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/sm_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/sm_monitor.dm @@ -6,7 +6,7 @@ program_icon_state = "smmon_0" extended_desc = "This program connects to specially calibrated supermatter sensors to provide information on the status of supermatter-based engines." requires_ntnet = TRUE - transfer_access = ACCESS_ENGINE + transfer_access = ACCESS_ENGINEERING network_destination = "supermatter monitoring system" size = 5 tgui_id = "NtosSupermatterMonitor" diff --git a/code/modules/modular_computers/file_system/programs/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/ntnrc_client.dm index 703bd45168af..5a5531f95ade 100644 --- a/code/modules/modular_computers/file_system/programs/ntnrc_client.dm +++ b/code/modules/modular_computers/file_system/programs/ntnrc_client.dm @@ -106,7 +106,7 @@ channel.remove_client(src) // We shouldn't be in channel's user list, but just in case... return TRUE var/mob/living/user = usr - if(can_run(user, TRUE, ACCESS_NETWORK)) + if(can_run(user, TRUE, ACCESS_TCOMMS_ADMIN)) for(var/C in SSmodular_computers.chat_channels) var/datum/ntnet_conversation/chan = C chan.remove_client(src) @@ -228,7 +228,7 @@ /datum/computer_file/program/chatclient/ui_static_data(mob/user) var/list/data = list() - data["can_admin"] = can_run(user, FALSE, ACCESS_NETWORK) + data["can_admin"] = can_run(user, FALSE, ACCESS_TCOMMS_ADMIN) return data /datum/computer_file/program/chatclient/ui_data(mob/user) diff --git a/code/modules/modular_computers/file_system/programs/science/airestorer.dm b/code/modules/modular_computers/file_system/programs/science/airestorer.dm index 93e07b556016..c9f55f32f96d 100644 --- a/code/modules/modular_computers/file_system/programs/science/airestorer.dm +++ b/code/modules/modular_computers/file_system/programs/science/airestorer.dm @@ -7,7 +7,7 @@ size = 12 requires_ntnet = FALSE usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP - transfer_access = ACCESS_HEADS + transfer_access = ACCESS_COMMAND available_on_ntnet = TRUE tgui_id = "NtosAiRestorer" program_icon = "laptop-code" diff --git a/code/modules/modular_computers/file_system/programs/supply/budgetordering.dm b/code/modules/modular_computers/file_system/programs/supply/budgetordering.dm index 75f5201f26a1..145115f57d34 100644 --- a/code/modules/modular_computers/file_system/programs/supply/budgetordering.dm +++ b/code/modules/modular_computers/file_system/programs/supply/budgetordering.dm @@ -80,7 +80,7 @@ unlock_budget = FALSE //cargo tech is already using the same budget. if(id_card?.registered_account?.account_job?.paycheck_department && budget_order) buyer = SSeconomy.get_dep_account(id_card.registered_account.account_job.paycheck_department) - if((ACCESS_HEADS in id_card.access) || (ACCESS_QM in id_card.access) || (ACCESS_CARGO in id_card.access)) + if((ACCESS_COMMAND in id_card.access) || (ACCESS_QM in id_card.access) || (ACCESS_CARGO in id_card.access)) requestonly = FALSE can_approve_requests = TRUE can_send = TRUE diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 06ff4ace427d..f946b5c85909 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -8,7 +8,7 @@ GLOBAL_LIST_EMPTY(adminfaxes) icon = 'icons/obj/library.dmi' icon_state = "fax" insert_anim = "faxsend" - req_one_access = list(ACCESS_LAWYER, ACCESS_HEADS, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_QM) + req_one_access = list(ACCESS_LAWYER, ACCESS_COMMAND, ACCESS_ARMORY, ACCESS_DETECTIVE, ACCESS_QM) use_power = 1 idle_power_usage = 30 active_power_usage = 200 diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 47ad5aaac7d4..3553882f1523 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -122,7 +122,7 @@ req_access = list(ACCESS_SYNDICATE) /obj/machinery/power/apc/away //general away mission access - req_access = list(ACCESS_AWAY_GENERAL) + req_access = list(ACCESS_RUINS_GENERAL) /obj/machinery/power/apc/highcap/five_k cell_type = /obj/item/stock_parts/cell/upgraded/plus diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 04971b98a560..4be3b0f3d602 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -60,7 +60,7 @@ active_power_usage = FALSE idle_power_usage = FALSE locked = TRUE - req_access_txt = "100" + req_access = list(ACCESS_CENT_GENERAL) state = EMITTER_WELDED use_power = FALSE diff --git a/code/modules/research/nanites/nanite_remote.dm b/code/modules/research/nanites/nanite_remote.dm index aedea6529693..ce782cd673cc 100644 --- a/code/modules/research/nanites/nanite_remote.dm +++ b/code/modules/research/nanites/nanite_remote.dm @@ -8,7 +8,7 @@ name = "nanite remote control" desc = "A device that can remotely control active nanites through wireless signals." w_class = WEIGHT_CLASS_SMALL - req_access = list(ACCESS_RESEARCH) + req_access = list(ACCESS_SCIENCE) icon = 'icons/obj/device.dmi' icon_state = "nanite_remote" item_flags = NOBLUDGEON diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index b8a84264bd06..fd1d1df50a8a 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -28,7 +28,7 @@ Nothing else in the console has ID requirements. var/obj/machinery/rnd/production/protolathe/linked_lathe //Linked Protolathe var/obj/machinery/rnd/production/circuit_imprinter/linked_imprinter //Linked Circuit Imprinter - req_access = list(ACCESS_RND) //lA AND SETTING MANIPULATION REQUIRES SCIENTIST ACCESS. + req_access = list(ACCESS_RESEARCH) //lA AND SETTING MANIPULATION REQUIRES SCIENTIST ACCESS. //UI VARS var/screen = RDSCREEN_MENU @@ -1159,7 +1159,7 @@ Nothing else in the console has ID requirements. /obj/machinery/computer/rdconsole/robotics name = "Robotics R&D Console" req_access = null - req_access_txt = "29" + req_access = list(ACCESS_ROBOTICS) /obj/machinery/computer/rdconsole/robotics/Initialize(mapload) . = ..() diff --git a/code/modules/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/ruins/spaceruin_code/hilbertshotel.dm index 1840f5e0c24d..309fb968d31e 100644 --- a/code/modules/ruins/spaceruin_code/hilbertshotel.dm +++ b/code/modules/ruins/spaceruin_code/hilbertshotel.dm @@ -461,8 +461,8 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) oxy_damage = 500 mob_species = /datum/species/skeleton id_job = "Head Researcher" - id_access = ACCESS_RESEARCH - id_access_list = list(ACCESS_AWAY_GENERIC3, ACCESS_RESEARCH) + id_access = ACCESS_RUINS_SCIENCE + id_access_list = list(ACCESS_RUINS_GENERIC3, ACCESS_RUINS_SCIENCE) instant = TRUE id = /obj/item/card/id/silver uniform = /obj/item/clothing/under/rank/rnd/research_director diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index ea0583694272..2cc8cfb88596 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -70,7 +70,7 @@ to_chat(user, span_warning("You don't have an ID.")) return - if(!(ACCESS_HEADS in ID.access)) + if(!(ACCESS_COMMAND in ID.access)) to_chat(user, span_warning("The access level of your card is not high enough.")) return diff --git a/code/modules/shuttle/shuttle_creation/shuttle_creator.dm b/code/modules/shuttle/shuttle_creation/shuttle_creator.dm index 134628121236..91d300d32a46 100644 --- a/code/modules/shuttle/shuttle_creation/shuttle_creator.dm +++ b/code/modules/shuttle/shuttle_creation/shuttle_creator.dm @@ -23,7 +23,7 @@ GLOBAL_LIST_EMPTY(custom_shuttle_machines) //Machines that require updating (He throw_speed = 3 throw_range = 5 w_class = WEIGHT_CLASS_NORMAL - req_access_txt = "11" + req_access = list(ACCESS_CONSTRUCTION) armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50) resistance_flags = FIRE_PROOF var/ready = TRUE diff --git a/code/modules/vending/security_armaments.dm b/code/modules/vending/security_armaments.dm index c47f2bdea4ab..6889d8eb2c3d 100644 --- a/code/modules/vending/security_armaments.dm +++ b/code/modules/vending/security_armaments.dm @@ -32,7 +32,7 @@ var/can_claim = FALSE var/obj/item/card/id/C = usr?.get_idcard() // Security officers and wardens - if(istype(C) && (ACCESS_SECURITY in C.access) && (ACCESS_WEAPONS in C.access) && !(ACCESS_HOS in C.access)) + if(istype(C) && (ACCESS_SECURITY in C.access) && (ACCESS_WEAPONS_PERMIT in C.access) && !(ACCESS_HOS in C.access)) allowed = TRUE // Hasn't claimed a weapon yet if(C?.registered_account && !C.registered_account.sec_weapon_claimed) @@ -123,7 +123,7 @@ var/can_claim = FALSE var/obj/item/card/id/C = user?.get_idcard() // Security officers and wardens - if(istype(C) && (ACCESS_SECURITY in C.access) && (ACCESS_WEAPONS in C.access) && !(ACCESS_HOS in C.access)) + if(istype(C) && (ACCESS_SECURITY in C.access) && (ACCESS_WEAPONS_PERMIT in C.access) && !(ACCESS_HOS in C.access)) allowed = TRUE // Hasn't claimed a weapon yet if(C?.registered_account && !C.registered_account.sec_weapon_claimed) diff --git a/goon/icons/turfs/floors.dmi b/goon/icons/turfs/floors.dmi index b5b3a57b9852..1cb6f302fc01 100644 Binary files a/goon/icons/turfs/floors.dmi and b/goon/icons/turfs/floors.dmi differ diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi index 1bc499aaaf14..b65a48e6fd40 100644 Binary files a/icons/effects/mapping_helpers.dmi and b/icons/effects/mapping_helpers.dmi differ diff --git a/icons/obj/stairs.dmi b/icons/obj/stairs.dmi deleted file mode 100644 index 5c3f378ced99..000000000000 Binary files a/icons/obj/stairs.dmi and /dev/null differ diff --git a/yogstation.dme b/yogstation.dme index 1f60480c7a1e..ee7de45f37b6 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -2781,6 +2781,8 @@ #include "code\modules\mapping\reader.dm" #include "code\modules\mapping\ruins.dm" #include "code\modules\mapping\verify.dm" +#include "code\modules\mapping\access_helpers\airlock_helpers.dm" +#include "code\modules\mapping\access_helpers\windoor_helpers.dm" #include "code\modules\mapping\space_management\multiz_helpers.dm" #include "code\modules\mapping\space_management\space_level.dm" #include "code\modules\mapping\space_management\space_reservation.dm" diff --git a/yogstation/code/datums/ruins/free_miners.dm b/yogstation/code/datums/ruins/free_miners.dm index b5b6b4fce50b..13c6ebd837c2 100644 --- a/yogstation/code/datums/ruins/free_miners.dm +++ b/yogstation/code/datums/ruins/free_miners.dm @@ -21,7 +21,7 @@ circuit = /obj/item/circuitboard/computer/white_ship/miner shuttleId = "whiteship" possible_destinations = "whiteship_away;whiteship_home;whiteship_z4;whiteship_mining0;whiteship_mining1;whiteship_mining2;whiteship_custom" - req_access = list(ACCESS_FREEMINER_CAPTAIN) + req_access = list(ACCESS_RUINS_COMMAND) /obj/machinery/computer/camera_advanced/shuttle_docker/whiteship/miner name = "Free Miner Navigation Computer" @@ -118,15 +118,15 @@ /obj/item/card/id/freeminer name = "Free Miner Crewman ID" - access = list(ACCESS_MINERAL_STOREROOM, ACCESS_FREEMINER, ACCESS_MECH_FREEMINER) + access = list(ACCESS_RUINS_MATERIALS, ACCESS_MECH_RUINS) /obj/item/card/id/freeminer/engi name = "Free Miner Engineer ID" - access = list(ACCESS_MINERAL_STOREROOM, ACCESS_FREEMINER, ACCESS_MECH_FREEMINER, ACCESS_FREEMINER_ENGINEER) + access = list(ACCESS_RUINS_MATERIALS, ACCESS_MECH_RUINS, ACCESS_RUINS_ENGINEERING) /obj/item/card/id/freeminer/captain name = "Free Miner Ship Pilot ID" - access = list(ACCESS_MINERAL_STOREROOM, ACCESS_FREEMINER, ACCESS_MECH_FREEMINER, ACCESS_FREEMINER_ENGINEER, ACCESS_FREEMINER_CAPTAIN) + access = list(ACCESS_RUINS_MATERIALS, ACCESS_MECH_RUINS, ACCESS_RUINS_COMMAND) /obj/item/storage/box/ids/free_miners name = "box of spare IDs" diff --git a/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm b/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm index c1ad4605fe15..f810befec31d 100644 --- a/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm +++ b/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm @@ -20,7 +20,7 @@ var/process = 0 circuit = /obj/item/circuitboard/computer/telecomms/comm_traffic - req_access = list(ACCESS_TCOM_ADMIN) + req_access = list(ACCESS_TCOMMS_ADMIN) var/unlimited_range = FALSE /obj/machinery/computer/telecomms/traffic/Initialize(mapload) diff --git a/yogstation/code/game/objects/items/cards_ids.dm b/yogstation/code/game/objects/items/cards_ids.dm index 7885e1d7ed13..9815d948c57d 100644 --- a/yogstation/code/game/objects/items/cards_ids.dm +++ b/yogstation/code/game/objects/items/cards_ids.dm @@ -92,7 +92,7 @@ /obj/item/card/id/gasclerk name = "Clerk" desc = "An employee ID used to access areas around the gas station." - access = list(ACCESS_MANUFACTURING) + access = list(ACCESS_CLERK) /obj/item/card/id/gasclerk/New() ..() diff --git a/yogstation/code/game/objects/structures/fireaxe.dm b/yogstation/code/game/objects/structures/fireaxe.dm index 63e8b4e13df3..23bb30a2684c 100644 --- a/yogstation/code/game/objects/structures/fireaxe.dm +++ b/yogstation/code/game/objects/structures/fireaxe.dm @@ -4,7 +4,7 @@ /obj/structure/fireaxecabinet/bridge //bridge fireaxe has different access - req_one_access = list(ACCESS_CAPTAIN, ACCESS_CE) + req_access = list(ACCESS_COMMAND) /obj/structure/fireaxecabinet/Initialize(mapload)//<-- mirrored/overwritten proc . = ..() diff --git a/yogstation/code/game/objects/structures/ghost_role_spawners.dm b/yogstation/code/game/objects/structures/ghost_role_spawners.dm index 81c29821c7be..175369ec12c6 100644 --- a/yogstation/code/game/objects/structures/ghost_role_spawners.dm +++ b/yogstation/code/game/objects/structures/ghost_role_spawners.dm @@ -208,7 +208,7 @@ /obj/item/card/id/bus/crewmember/captain name = "Captain" desc = "An employee ID used to access areas around the ship." - access = list(ACCESS_CAPTAIN, ACCESS_SECURITY, ACCESS_RESEARCH) + access = list(ACCESS_CAPTAIN, ACCESS_SECURITY, ACCESS_SCIENCE) /obj/item/card/id/bus/crewmember/captain/New() ..() @@ -217,7 +217,7 @@ /obj/item/card/id/bus/crewmember/sec name = "Security Officer" desc = "An employee ID used to access areas around the ship." - access = list(ACCESS_SECURITY, ACCESS_RESEARCH) + access = list(ACCESS_SECURITY, ACCESS_SCIENCE) /obj/item/card/id/bus/crewmember/sec/New() ..() @@ -226,7 +226,7 @@ /obj/item/card/id/bus/crewmember name = "Crew member" desc = "An employee ID used to access areas around the ship." - access = list(ACCESS_RESEARCH) + access = list(ACCESS_SCIENCE) /obj/item/card/id/bus/crewmember/New() ..() diff --git a/yogstation/code/modules/atmospherics/airalarm.dm b/yogstation/code/modules/atmospherics/airalarm.dm index 4eb975e54ef0..7e0c1b2b7a7f 100644 --- a/yogstation/code/modules/atmospherics/airalarm.dm +++ b/yogstation/code/modules/atmospherics/airalarm.dm @@ -1,7 +1,7 @@ /obj/machinery/airalarm/tcomms name = "telecomms air alarm" req_access = null - req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_TCOM_ADMIN) + req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_TCOMMS_ADMIN) TLV = list( // This is the list provided by obj machinery airalarm server. No checks, apparently. "pressure" = new/datum/tlv/no_checks, "temperature" = new/datum/tlv/no_checks, diff --git a/yogstation/code/modules/jobs/job_types/brig_physician.dm b/yogstation/code/modules/jobs/job_types/brig_physician.dm index 21b06511b92c..34183852ca10 100644 --- a/yogstation/code/modules/jobs/job_types/brig_physician.dm +++ b/yogstation/code/modules/jobs/job_types/brig_physician.dm @@ -22,8 +22,10 @@ /datum/job_department/security, ) - added_access = list(ACCESS_SURGERY, ACCESS_CLONING, ACCESS_EXTERNAL_AIRLOCKS) - base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_BRIG, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MECH_MEDICAL, ACCESS_BRIG_PHYS) + added_access = list(ACCESS_SURGERY, ACCESS_CLONING) + base_access = list(ACCESS_MEDICAL, ACCESS_SEC_BASIC, ACCESS_BRIG_PHYS, ACCESS_MORGUE, + ACCESS_BRIG, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MECH_MEDICAL) + paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED display_order = JOB_DISPLAY_ORDER_BRIG_PHYSICIAN diff --git a/yogstation/code/modules/jobs/job_types/clerk.dm b/yogstation/code/modules/jobs/job_types/clerk.dm index 08b85661c24d..0f1288ea8ea6 100644 --- a/yogstation/code/modules/jobs/job_types/clerk.dm +++ b/yogstation/code/modules/jobs/job_types/clerk.dm @@ -7,12 +7,16 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" - added_access = list() - base_access = list(ACCESS_MANUFACTURING, ACCESS_SERVHALL) alt_titles = list("Salesman", "Gift Shop Attendent", "Retail Worker") + outfit = /datum/outfit/job/clerk + + added_access = list(ACCESS_MAINT_TUNNELS) + base_access = list(ACCESS_SERVICE, ACCESS_CLERK) + paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV + display_order = JOB_DISPLAY_ORDER_CLERK minimal_character_age = 18 //Capitalism doesn't care about age diff --git a/yogstation/code/modules/jobs/job_types/mining_medic.dm b/yogstation/code/modules/jobs/job_types/mining_medic.dm index 292a5babb944..a23c87a62988 100644 --- a/yogstation/code/modules/jobs/job_types/mining_medic.dm +++ b/yogstation/code/modules/jobs/job_types/mining_medic.dm @@ -28,8 +28,10 @@ ) //if it's skeleton there's probably no paramedic to save spaced miners that jaunted away from danger - added_access = list(ACCESS_SURGERY, ACCESS_CARGO, ACCESS_CLONING, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS) - base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM, ACCESS_MECH_MINING, ACCESS_MECH_MEDICAL) + added_access = list(ACCESS_SURGERY, ACCESS_CARGO_BAY, ACCESS_CLONING, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS) + base_access = list(ACCESS_CARGO, ACCESS_MEDICAL, ACCESS_MINING, ACCESS_MINING_STATION, + ACCESS_MORGUE, ACCESS_MECH_MINING, ACCESS_MECH_MEDICAL) + paycheck = PAYCHECK_HARD paycheck_department = ACCOUNT_MED display_order = JOB_DISPLAY_ORDER_MINING_MEDIC diff --git a/yogstation/code/modules/jobs/job_types/network_admin.dm b/yogstation/code/modules/jobs/job_types/network_admin.dm index d6bc0919d314..d9bc3412367d 100644 --- a/yogstation/code/modules/jobs/job_types/network_admin.dm +++ b/yogstation/code/modules/jobs/job_types/network_admin.dm @@ -13,8 +13,10 @@ outfit = /datum/outfit/job/network_admin - added_access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS) - base_access = list(ACCESS_TCOMSAT, ACCESS_TCOM_ADMIN, ACCESS_TECH_STORAGE, ACCESS_RC_ANNOUNCE, ACCESS_CONSTRUCTION, ACCESS_MECH_ENGINE, ACCESS_NETWORK, ACCESS_RESEARCH, ACCESS_MINISAT, ACCESS_RND, ACCESS_TOX) + added_access = list(ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS) + base_access = list(ACCESS_SCIENCE, ACCESS_TCOMMS, ACCESS_TCOMMS_ADMIN, ACCESS_TECH_STORAGE, ACCESS_RC_ANNOUNCE, + ACCESS_CONSTRUCTION, ACCESS_MECH_ENGINE, ACCESS_RESEARCH, ACCESS_AI_SAT) + paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_SCI display_order = JOB_DISPLAY_ORDER_NETWORK_ADMIN diff --git a/yogstation/code/modules/jobs/job_types/paramedic.dm b/yogstation/code/modules/jobs/job_types/paramedic.dm index 5ce2ea6200a8..d23b0ea90827 100644 --- a/yogstation/code/modules/jobs/job_types/paramedic.dm +++ b/yogstation/code/modules/jobs/job_types/paramedic.dm @@ -12,7 +12,9 @@ outfit = /datum/outfit/job/paramedic added_access = list(ACCESS_SURGERY, ACCESS_CLONING) - base_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PARAMEDIC, ACCESS_MECH_MEDICAL) + base_access = list(ACCESS_MEDICAL, ACCESS_PARAMEDIC, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, + ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MECH_MEDICAL) + paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED display_order = JOB_DISPLAY_ORDER_PARAMEDIC diff --git a/yogstation/code/modules/jobs/job_types/psychiatrist.dm b/yogstation/code/modules/jobs/job_types/psychiatrist.dm index a1090059d42b..666a799495d1 100644 --- a/yogstation/code/modules/jobs/job_types/psychiatrist.dm +++ b/yogstation/code/modules/jobs/job_types/psychiatrist.dm @@ -13,7 +13,8 @@ outfit = /datum/outfit/job/psych added_access = list(ACCESS_CHEMISTRY) - base_access = list(ACCESS_MEDICAL, ACCESS_PSYCH) + base_access = list(ACCESS_MEDICAL, ACCESS_PSYCHOLOGY) + paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED mind_traits = list(TRAIT_PSYCH) diff --git a/yogstation/code/modules/power/apc.dm b/yogstation/code/modules/power/apc.dm index 7f4a6c2735d5..c8d001750e17 100644 --- a/yogstation/code/modules/power/apc.dm +++ b/yogstation/code/modules/power/apc.dm @@ -1,4 +1,4 @@ /obj/machinery/power/apc/tcomms req_access = null - req_one_access = list(ACCESS_TCOM_ADMIN, ACCESS_ENGINE_EQUIP) - cell_type = /obj/item/stock_parts/cell/upgraded/plus // Apparently it's always been this? *shrug \ No newline at end of file + req_one_access = list(ACCESS_TCOMMS, ACCESS_ENGINE_EQUIP) + cell_type = /obj/item/stock_parts/cell/upgraded/plus // Apparently it's always been this? *shrug diff --git a/yogstation/code/modules/vending/gift.dm b/yogstation/code/modules/vending/gift.dm index b7edf63050ef..4f68877106ff 100644 --- a/yogstation/code/modules/vending/gift.dm +++ b/yogstation/code/modules/vending/gift.dm @@ -5,7 +5,7 @@ icon_state = "gifts" icon_deny = "gifts-deny" panel_type = "panel-gift" - req_access = list(ACCESS_MANUFACTURING) + req_access = list(ACCESS_CLERK) product_slogans = "Toys For All!;Oh its a Gift!;A Gift for Your Loved ones!;Purchase more Gifts, Now!" vend_reply = "Thank you for using Gift Vendor!" products = list(/obj/item/toy/heartballoon = 3,