From 1c994ad3d9f085390544ea6f738e5180e4ef73e0 Mon Sep 17 00:00:00 2001 From: warriorstar-orion Date: Tue, 22 Oct 2024 05:18:10 -0400 Subject: [PATCH] refactor: Eliminate text access fields. (#26907) * refactor: Eliminate text access fields. * set script PR number * make diffstat delta exactly 0 --- .../SpaceRuins/abandoned_sec_shuttle.dmm | 8 +- .../RandomRuins/SpaceRuins/deepstorage.dmm | 91 ++-- .../RandomRuins/SpaceRuins/listeningpost.dmm | 16 +- .../RandomRuins/SpaceRuins/moonoutpost19.dmm | 153 +++--- .../RandomRuins/SpaceRuins/oldstation.dmm | 21 +- .../SpaceRuins/syndicatedruglab.dmm | 3 +- .../SpaceRuins/syndie_space_base.dmm | 37 +- .../RandomRuins/SpaceRuins/syndiedepot.dmm | 15 +- .../SpaceRuins/telecomns_returns.dmm | 86 ++-- .../map_files/RandomRuins/SpaceRuins/ussp.dmm | 20 +- _maps/map_files/generic/Lavaland.dmm | 32 +- _maps/map_files/generic/centcomm.dmm | 333 +++++++------ _maps/map_files/shuttles/admin_admin.dmm | 38 +- _maps/map_files/shuttles/admin_armory.dmm | 8 +- _maps/map_files/shuttles/admin_skipjack.dmm | 37 +- _maps/map_files/shuttles/emergency_raven.dmm | 8 +- _maps/map_files/stations/boxstation.dmm | 274 +++++----- _maps/map_files/stations/cerestation.dmm | 467 +++++++++--------- _maps/map_files/stations/deltastation.dmm | 173 ++++--- _maps/map_files/stations/emeraldstation.dmm | 287 ++++++----- _maps/map_files/stations/metastation.dmm | 287 ++++++----- _maps/map_files/templates/shelter_2.dmm | 4 +- code/__DEFINES/access_defines.dm | 1 + code/datums/status_effects/magic_disguise.dm | 2 +- code/game/area/areas/depot-areas.dm | 2 +- code/game/jobs/access.dm | 22 - code/game/machinery/doors/airlock_types.dm | 6 +- .../machinery/vendors/contraband_vendors.dm | 4 +- .../machinery/vendors/departmental_vendors.dm | 10 +- .../effects/spawners/airlock_spawner.dm | 4 - code/game/objects/objs.dm | 5 +- .../components/binary_devices/valve.dm | 2 +- .../kitchen_machinery/smartfridge.dm | 21 +- code/modules/mapping/access_helpers.dm | 57 ++- .../modules/mapping/windoor_access_helpers.dm | 19 +- .../Scripts/26907_req_access_refactor.txt | 96 ++++ tools/UpdatePaths/__main__.py | 8 +- .../lints/airlock_spawner_varedits.yml | 8 +- 38 files changed, 1329 insertions(+), 1336 deletions(-) create mode 100644 tools/UpdatePaths/Scripts/26907_req_access_refactor.txt diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandoned_sec_shuttle.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandoned_sec_shuttle.dmm index fbdf10f74a1..6eddc1288d9 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/abandoned_sec_shuttle.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/abandoned_sec_shuttle.dmm @@ -9,10 +9,10 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/sec_shuttle) "c" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/specops, /obj/machinery/door/airlock/external{ id_tag = "s_docking_airlock"; - name = "Shuttle Hatch"; - req_access_txt = "109" + name = "Shuttle Hatch" }, /turf/simulated/floor/plasteel/airless{ icon_state = "dark" @@ -176,10 +176,10 @@ }, /area/ruin/space/sec_shuttle) "T" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/specops, /obj/machinery/door/airlock/external{ id_tag = "s_docking_airlock"; - name = "Shuttle Hatch"; - req_access_txt = "109" + name = "Shuttle Hatch" }, /turf/simulated/floor/plating/airless, /area/ruin/space/sec_shuttle) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm index b8f979a2f43..848637b6e12 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm @@ -275,9 +275,8 @@ /turf/simulated/floor/catwalk, /area/ruin/space/deepstorage) "aR" = ( -/obj/machinery/door/airlock/highsecurity{ - req_access_txt = "512" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, +/obj/machinery/door/airlock/highsecurity, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -771,9 +770,8 @@ }, /area/ruin/space/deepstorage) "co" = ( -/obj/machinery/door/airlock/hatch{ - req_access_txt = "512" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, +/obj/machinery/door/airlock/hatch, /obj/structure/barricade/wooden/crude{ layer = 4 }, @@ -1029,9 +1027,8 @@ }, /area/ruin/space/deepstorage) "eq" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "512" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, +/obj/machinery/door/airlock/maintenance_hatch, /turf/simulated/floor/plating, /area/ruin/space/deepstorage) "es" = ( @@ -1440,8 +1437,8 @@ /turf/simulated/floor/plating, /area/ruin/space/deepstorage) "hp" = ( +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, /obj/machinery/door/airlock/hatch{ - req_access_txt = "512"; name = "Guard Wing" }, /obj/structure/barricade/wooden/crude{ @@ -1692,8 +1689,8 @@ /turf/simulated/floor/plasteel, /area/ruin/space/deepstorage) "jj" = ( +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, /obj/machinery/door/airlock/highsecurity{ - req_access_txt = "512"; name = "Guard Store Room" }, /obj/effect/decal/cleanable/dirt, @@ -1856,9 +1853,9 @@ /area/ruin/space/deepstorage) "jT" = ( /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, /obj/machinery/door/airlock/vault{ - locked = 1; - req_access_txt = "512" + locked = 1 }, /turf/simulated/floor/catwalk, /area/ruin/space/deepstorage) @@ -2170,9 +2167,8 @@ /obj/structure/barricade/wooden/crude{ layer = 4 }, -/obj/machinery/door/airlock/centcom{ - req_access_txt = "512" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, +/obj/machinery/door/airlock/centcom, /turf/simulated/floor/catwalk, /area/ruin/space/deepstorage) "mf" = ( @@ -2690,8 +2686,8 @@ /turf/simulated/floor/plating/asteroid/basalt/airless, /area/ruin/space/unpowered) "pz" = ( +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, /obj/machinery/door/airlock/command/glass{ - req_access_txt = "512"; name = "Floor Administrator's Office" }, /obj/effect/mapping_helpers/airlock/polarized{ @@ -2743,9 +2739,8 @@ /obj/structure/barricade/wooden/crude{ layer = 4 }, -/obj/machinery/door/airlock/hatch{ - req_access_txt = "512" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, +/obj/machinery/door/airlock/hatch, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "podfloor" @@ -2975,9 +2970,8 @@ /area/ruin/space/deepstorage) "rK" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/hatch{ - req_access_txt = "512" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, +/obj/machinery/door/airlock/hatch, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "podfloor" @@ -3777,9 +3771,8 @@ /turf/simulated/wall/indestructible/riveted, /area/ruin/space/deepstorage) "wH" = ( -/obj/machinery/door/airlock/hatch{ - req_access_txt = "512" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, +/obj/machinery/door/airlock/hatch, /obj/machinery/door/poddoor/shutters/preopen{ dir = 2; id_tag = "DS_Quartermaster" @@ -3859,8 +3852,8 @@ }, /area/ruin/space/deepstorage) "xC" = ( +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, /obj/machinery/door/airlock/highsecurity{ - req_access_txt = "512"; name = "Interrogation Room" }, /turf/simulated/floor/plasteel{ @@ -4111,9 +4104,9 @@ /turf/simulated/floor/mineral/titanium, /area/ruin/space/deepstorage) "zh" = ( +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, /obj/machinery/door/airlock/highsecurity{ - name = "Incinerator"; - req_access_txt = "512" + name = "Incinerator" }, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -4172,9 +4165,9 @@ /turf/simulated/floor/plating, /area/ruin/space/deepstorage) "zy" = ( +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, /obj/machinery/door/airlock/vault{ - locked = 1; - req_access_txt = "512" + locked = 1 }, /obj/structure/fans/tiny, /turf/simulated/floor/catwalk, @@ -4195,9 +4188,8 @@ /obj/structure/barricade/wooden/crude{ layer = 4 }, -/obj/machinery/door/airlock/hatch{ - req_access_txt = "512" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, +/obj/machinery/door/airlock/hatch, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -4324,9 +4316,9 @@ /area/ruin/space/deepstorage) "As" = ( /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, /obj/machinery/door/airlock/vault{ - name = "Auxiliary Power Room"; - req_access_txt = "512" + name = "Auxiliary Power Room" }, /obj/machinery/door/poddoor/multi_tile/impassable{ id_tag = "DS_Engineering" @@ -4359,8 +4351,8 @@ }, /area/ruin/space/deepstorage) "AA" = ( +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, /obj/machinery/door/airlock/highsecurity{ - req_access_txt = "512"; name = "Evidence Storage" }, /turf/simulated/floor/plasteel{ @@ -5373,9 +5365,8 @@ }, /area/ruin/space/deepstorage) "Hx" = ( -/obj/machinery/door/airlock/hatch{ - req_access_txt = "512" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, +/obj/machinery/door/airlock/hatch, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -6902,9 +6893,8 @@ }, /area/ruin/space/deepstorage) "To" = ( -/obj/machinery/door/airlock/centcom{ - req_access_txt = "512" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, +/obj/machinery/door/airlock/centcom, /turf/simulated/floor/catwalk, /area/ruin/space/deepstorage) "Tq" = ( @@ -6930,9 +6920,8 @@ }, /area/ruin/space/deepstorage) "TK" = ( -/obj/machinery/door/airlock/highsecurity{ - req_access_txt = "512" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, +/obj/machinery/door/airlock/highsecurity, /obj/machinery/door/poddoor/multi_tile/impassable{ id_tag = "DS_Storage" }, @@ -7008,9 +6997,8 @@ /obj/structure/barricade/wooden/crude{ layer = 4 }, -/obj/machinery/door/airlock/highsecurity{ - req_access_txt = "512" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, +/obj/machinery/door/airlock/highsecurity, /obj/machinery/door/poddoor/multi_tile/impassable{ id_tag = "DS_Storage" }, @@ -7925,9 +7913,8 @@ /turf/simulated/floor/engine/airless, /area/ruin/space/unpowered) "ZW" = ( -/obj/machinery/door/airlock/hatch{ - req_access_txt = "512" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, +/obj/machinery/door/airlock/hatch, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "podfloor" diff --git a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm index 091de72050e..87472fd1364 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm @@ -63,9 +63,9 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/syndicate_listening_station/asteroid) "kE" = ( +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /obj/machinery/door/airlock/external{ - id_tag = "sst_away"; - req_access_txt = "150" + id_tag = "sst_away" }, /obj/structure/cable{ d1 = 4; @@ -242,9 +242,9 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) "zb" = ( +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /obj/machinery/door/airlock/external{ - id_tag = "sst_away"; - req_access_txt = "150" + id_tag = "sst_away" }, /obj/structure/fans/tiny, /obj/effect/decal/cleanable/dirt, @@ -472,9 +472,9 @@ /turf/simulated/floor/mineral/silver, /area/ruin/space/syndicate_listening_station) "Ow" = ( +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /obj/machinery/door/airlock/external{ - id_tag = "sst_away"; - req_access_txt = "150" + id_tag = "sst_away" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -513,9 +513,9 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) "TS" = ( +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /obj/machinery/door/airlock/external{ - id_tag = "sst_away"; - req_access_txt = "150" + id_tag = "sst_away" }, /obj/structure/cable{ d1 = 4; diff --git a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm index 13a10e31003..4c3d28f03fb 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm @@ -290,8 +290,8 @@ /turf/simulated/wall, /area/ruin/space/moonbase19) "aN" = ( +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/medical/glass{ - req_access_txt = "271"; name = "Storage Room" }, /turf/simulated/floor/plasteel, @@ -390,16 +390,15 @@ /obj/machinery/door/poddoor/impassable{ id_tag = "awaymlock" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/medical/glass{ - req_access_txt = "271"; name = "Medical Ward" }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) "ba" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - req_access_txt = "271" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, +/obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -846,9 +845,8 @@ }, /area/ruin/space/moonbase19) "cx" = ( -/obj/machinery/door/airlock/security/glass{ - req_access_txt = "271" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, +/obj/machinery/door/airlock/security/glass, /obj/structure/barricade/wooden/crude{ layer = 4 }, @@ -909,9 +907,8 @@ layer = 4 }, /obj/machinery/atmospherics/pipe/simple/visible/universal, -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "271" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, +/obj/machinery/door/airlock/maintenance_hatch, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) "cI" = ( @@ -1198,8 +1195,8 @@ /obj/machinery/door/poddoor/impassable{ id_tag = "awaycontlockdown" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/highsecurity{ - req_access_txt = "271"; name = "Specimen Containtment Zone" }, /turf/simulated/floor/catwalk, @@ -1394,8 +1391,8 @@ /obj/machinery/door/poddoor/impassable{ id_tag = "awaymlock" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/centcom{ - req_access_txt = "271"; name = "Medical Ward" }, /turf/simulated/floor/catwalk, @@ -1574,9 +1571,8 @@ /obj/structure/barricade/wooden/crude{ layer = 4 }, -/obj/machinery/door/airlock/external{ - req_access_txt = "271" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, +/obj/machinery/door/airlock/external, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) "eZ" = ( @@ -1672,9 +1668,8 @@ }, /area/ruin/space/moonbase19) "fn" = ( -/obj/machinery/door/airlock/centcom{ - req_access_txt = "271" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, +/obj/machinery/door/airlock/centcom, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) "fp" = ( @@ -1819,8 +1814,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/centcom{ - req_access_txt = "271"; name = "Cafeteria" }, /turf/simulated/floor/catwalk, @@ -2934,8 +2929,8 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/engineering/glass{ - req_access_txt = "271"; name = "Workshop" }, /turf/simulated/floor/catwalk, @@ -3335,8 +3330,8 @@ /obj/machinery/door/poddoor/impassable{ id_tag = "awayscilock" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/centcom{ - req_access_txt = "271"; name = "Research Division" }, /turf/simulated/floor/catwalk, @@ -3548,9 +3543,8 @@ /turf/simulated/floor/engine, /area/ruin/space/moonbase19) "kW" = ( -/obj/machinery/door/airlock/centcom{ - req_access_txt = "271" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, +/obj/machinery/door/airlock/centcom, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" @@ -3628,9 +3622,8 @@ }, /area/ruin/space/moonbase19) "lq" = ( -/obj/machinery/door/airlock{ - req_access_txt = "271" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, +/obj/machinery/door/airlock, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -4181,8 +4174,8 @@ /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) "nx" = ( +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/centcom{ - req_access_txt = "271"; name = "Engineering Division" }, /turf/simulated/floor/plasteel, @@ -4813,8 +4806,8 @@ /obj/machinery/door/poddoor/impassable{ id_tag = "awayscilock" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/centcom{ - req_access_txt = "271"; name = "Research Division" }, /turf/simulated/floor/catwalk, @@ -4968,8 +4961,8 @@ }, /area/ruin/space/moonbase19) "qx" = ( +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/centcom{ - req_access_txt = "271"; name = "Cafeteria" }, /turf/simulated/floor/catwalk, @@ -5354,8 +5347,8 @@ }, /area/ruin/space/moonbase19) "rV" = ( +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock{ - req_access_txt = "271"; name = "Dorms" }, /turf/simulated/floor/plasteel{ @@ -5379,9 +5372,8 @@ }, /area/ruin/space/moonbase19) "rZ" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "271" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, +/obj/machinery/door/airlock/maintenance_hatch, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) "sa" = ( @@ -7070,7 +7062,7 @@ /area/ruin/space/moonbase19) "zV" = ( /obj/machinery/economy/vending/medical{ - req_access_txt = "271" + req_access = list(271) }, /turf/simulated/floor/plasteel{ icon_state = "whitecorner"; @@ -7095,8 +7087,8 @@ }, /area/ruin/space/moonbase19) "Af" = ( +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/command/glass{ - req_access_txt = "271"; name = "Senior Researcher's Office" }, /obj/effect/mapping_helpers/airlock/polarized{ @@ -7487,7 +7479,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/reinforced/normal{ dir = 4; - req_access_txt = "271" + req_access = list(271) }, /obj/machinery/door/poddoor/shutters/preopen{ id_tag = "awayscilock2" @@ -7512,9 +7504,8 @@ /obj/machinery/door/poddoor/impassable{ id_tag = "awayscilock" }, -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "271" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, +/obj/machinery/door/airlock/maintenance_hatch, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) "BK" = ( @@ -7523,8 +7514,8 @@ /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) "BO" = ( +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/engineering/glass{ - req_access_txt = "271"; name = "Engineering Division" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -7602,8 +7593,8 @@ /obj/machinery/door/poddoor/impassable{ id_tag = "awaycontlockdown" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/highsecurity{ - req_access_txt = "271"; name = "Specimen Containtment Zone" }, /turf/simulated/floor/catwalk, @@ -7617,9 +7608,8 @@ }, /area/ruin/space/moonbase19) "Ct" = ( -/obj/machinery/door/airlock/highsecurity{ - req_access_txt = "271" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, +/obj/machinery/door/airlock/highsecurity, /obj/machinery/door/poddoor/preopen{ id_tag = "awayscilock1" }, @@ -7641,8 +7631,8 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/centcom{ - req_access_txt = "271"; name = "Engineering Division" }, /turf/simulated/floor/plasteel, @@ -7878,9 +7868,8 @@ }, /area/ruin/space/moonbase19) "Dt" = ( -/obj/machinery/door/airlock/medical/glass{ - req_access_txt = "271" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, +/obj/machinery/door/airlock/medical/glass, /obj/effect/decal/cleanable/blood/tracks/mapped, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; @@ -8492,8 +8481,8 @@ }, /area/ruin/space/moonbase19) "Gk" = ( +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/medical/glass{ - req_access_txt = "271"; name = "Operation Room" }, /turf/simulated/floor/plasteel{ @@ -8841,8 +8830,8 @@ /turf/simulated/floor/engine, /area/ruin/space/moonbase19) "HO" = ( +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/highsecurity{ - req_access_txt = "271"; name = "Chamber #1" }, /obj/effect/turf_decal/delivery, @@ -9066,8 +9055,8 @@ /area/ruin/space/moonbase19) "IU" = ( /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/highsecurity{ - req_access_txt = "271"; name = "Chamber #2" }, /turf/simulated/floor/plasteel{ @@ -9193,9 +9182,8 @@ }, /area/ruin/space/moonbase19) "JE" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "271" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, +/obj/machinery/door/airlock/external, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) "JG" = ( @@ -9835,9 +9823,8 @@ }, /area/ruin/space/moonbase19) "Mx" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "271" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, +/obj/machinery/door/airlock/maintenance_hatch, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) @@ -10574,8 +10561,8 @@ }, /area/ruin/space/moonbase19) "PF" = ( +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/security{ - req_access_txt = "271"; name = "Security Checkpoint" }, /turf/simulated/floor/plasteel{ @@ -10884,8 +10871,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/centcom{ - req_access_txt = "271"; name = "Cafeteria" }, /turf/simulated/floor/catwalk, @@ -10975,9 +10962,8 @@ }, /area/ruin/space/moonbase19) "Rg" = ( -/obj/machinery/door/airlock/freezer{ - req_access_txt = "271" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, +/obj/machinery/door/airlock/freezer, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor"; temperature = 273.15 @@ -11056,9 +11042,8 @@ /turf/simulated/floor/engine, /area/ruin/space/moonbase19) "RD" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - req_access_txt = "271" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, +/obj/machinery/door/airlock/multi_tile/glass, /obj/structure/barricade/wooden/crude{ layer = 4 }, @@ -11295,9 +11280,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/airlock/centcom{ - req_access_txt = "271" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, +/obj/machinery/door/airlock/centcom, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "caution" @@ -11361,8 +11345,8 @@ }, /area/ruin/space/moonbase19) "Ti" = ( +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/command/glass{ - req_access_txt = "271"; name = "Senior Researcher's Office" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -11587,8 +11571,8 @@ "Ue" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock{ - req_access_txt = "271"; name = "Dorms" }, /turf/simulated/floor/plasteel{ @@ -11691,9 +11675,8 @@ /obj/effect/decal/cleanable/blood/tracks/mapped{ dir = 8 }, -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "271" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, +/obj/machinery/door/airlock/maintenance_hatch, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) "UA" = ( @@ -12039,9 +12022,8 @@ /turf/simulated/floor/plating, /area/ruin/space/moonbase19) "We" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access_txt = "271" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, +/obj/machinery/door/airlock/maintenance_hatch, /obj/machinery/door/poddoor/impassable{ id_tag = "awayscilock" }, @@ -12149,9 +12131,9 @@ }, /area/ruin/space/moonbase19) "WG" = ( +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/vault{ - locked = 1; - req_access_txt = "271" + locked = 1 }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) @@ -12553,8 +12535,8 @@ /area/ruin/space/moonbase19) "Yj" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/engineering/glass{ - req_access_txt = "271"; name = "Engineering Division" }, /turf/simulated/floor/plasteel, @@ -12639,8 +12621,8 @@ id_tag = "awaymlock" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/centcom{ - req_access_txt = "271"; name = "Medical Ward" }, /turf/simulated/floor/catwalk, @@ -12684,8 +12666,8 @@ }, /area/ruin/space/moonbase19) "YM" = ( +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/engineering/glass{ - req_access_txt = "271"; name = "Workshop" }, /turf/simulated/floor/catwalk, @@ -12944,9 +12926,8 @@ /turf/simulated/floor/engine, /area/ruin/space/moonbase19) "ZP" = ( -/obj/machinery/door/airlock/medical/glass{ - req_access_txt = "271" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, +/obj/machinery/door/airlock/medical/glass, /obj/structure/barricade/wooden{ layer = 4 }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm index 9dbdd2061f2..98f13edcf85 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm @@ -1960,9 +1960,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/theta, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_one_access_txt = "301" + name = "Engineering External Access" }, /turf/simulated/floor/plating, /area/ruin/ancientstation/engi) @@ -3013,9 +3013,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance_hatch{ - req_one_access_txt = "301" - }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/theta, +/obj/machinery/door/airlock/maintenance_hatch, /turf/simulated/floor/plating, /area/ruin/ancientstation/thetacorridor) "hF" = ( @@ -3090,9 +3089,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/ruins/theta, /obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_one_access_txt = "301" + name = "Engineering External Access" }, /turf/simulated/floor/plating/airless, /area/ruin/ancientstation/engi) @@ -3792,9 +3791,9 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/ruins/theta, /obj/machinery/door/airlock/highsecurity{ - name = "Prototype Laboratory"; - req_access_txt = "301" + name = "Prototype Laboratory" }, /turf/simulated/floor/plasteel{ icon_state = "whitehall" @@ -3803,9 +3802,9 @@ "jv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/ruins/theta, /obj/machinery/door/airlock/highsecurity{ - name = "Prototype Laboratory"; - req_access_txt = "301" + name = "Prototype Laboratory" }, /turf/simulated/floor/plasteel{ icon_state = "whitehall" diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm index 8e0bd98ae0e..ee7e03df506 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm @@ -241,8 +241,7 @@ id = "syndicatedruglab"; name = "Syndicate Drug Lab Hangar"; pixel_x = 24; - pixel_y = 4; - req_access_txt = null + pixel_y = 4 }, /turf/simulated/floor/plating, /area/ruin/space/syndicate_druglab) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm index 29702b1da15..54445ed5d04 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm @@ -78,8 +78,8 @@ name = "Vault Bolt Control"; normaldoorcontrol = 1; pixel_x = 24; - req_access_txt = "150"; - specialfunctions = 4 + specialfunctions = 4; + req_access = list(150) }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -1082,7 +1082,7 @@ id = "SSBrestricted"; name = "Shutters Control"; pixel_x = -24; - req_access_txt = "151" + req_access = list(151) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -1274,8 +1274,7 @@ "gW" = ( /obj/machinery/door/window/classic/reversed{ name = "Animal Storage"; - req_access_txt = "150"; - req_one_access_txt = "150" + req_access = list(150) }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -1553,7 +1552,7 @@ id = "SSBrestricted"; name = "Shutters Control"; pixel_x = 24; - req_access_txt = "151" + req_access = list(151) }, /turf/simulated/floor/plasteel{ dir = 4; @@ -1581,7 +1580,7 @@ /area/ruin/unpowered/syndicate_space_base/toxtest) "iB" = ( /obj/structure/closet/crate/secure/gear{ - req_access_txt = "150" + req_access = list(150) }, /obj/item/clothing/suit/space/syndicate, /obj/item/clothing/suit/space/syndicate, @@ -1728,7 +1727,7 @@ /area/ruin/unpowered/syndicate_space_base/arrivals) "je" = ( /obj/structure/closet/crate/secure/gear{ - req_access_txt = "150" + req_access = list(150) }, /obj/item/clothing/suit/space/syndicate, /obj/item/clothing/suit/space/syndicate, @@ -4979,7 +4978,7 @@ dir = 4; network = list("SyndicateTestLab","SyndicateToxinsTest","SyndicateCaves","SyndicateInterior"); name = "syndicate security camera console"; - req_access_txt = "150" + req_access = list(150) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -5290,7 +5289,7 @@ /area/ruin/unpowered/syndicate_space_base/atmos) "Ed" = ( /obj/structure/closet/crate/secure/gear{ - req_access_txt = "150" + req_access = list(150) }, /obj/machinery/light{ dir = 1 @@ -5332,8 +5331,7 @@ "Ei" = ( /obj/machinery/door/window/classic/reversed{ name = "Animal Storage"; - req_access_txt = "150"; - req_one_access_txt = "150" + req_access = list(150) }, /mob/living/simple_animal/chicken{ faction = list("neutral","syndicate") @@ -5456,10 +5454,10 @@ }, /area/ruin/unpowered/syndicate_space_base/genetics) "ES" = ( +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /obj/machinery/door/airlock/vault{ id_tag = "syndie_lavaland_vault"; - locked = 1; - req_access_txt = "150" + locked = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -6140,7 +6138,7 @@ /area/ruin/unpowered/syndicate_space_base/main) "Iz" = ( /obj/structure/closet/crate/secure/gear{ - req_access_txt = "150" + req_access = list(150) }, /obj/machinery/light, /obj/item/clothing/gloves/combat, @@ -6396,7 +6394,7 @@ pixel_y = -24; name = "Caves Turret Control Panel"; control_area = "Syndicate Space Base Cave"; - req_access_txt = "150" + req_access = list(150) }, /obj/structure/chair{ dir = 8 @@ -7028,8 +7026,7 @@ /area/ruin/unpowered/syndicate_space_base/toxlaunch) "NT" = ( /obj/structure/closet/secure_closet/medical1{ - req_access = null; - req_access_txt = "150" + req_access = list(150) }, /obj/structure/window/reinforced{ dir = 1 @@ -7692,7 +7689,7 @@ /area/ruin/unpowered/syndicate_space_base/engineering) "Sv" = ( /obj/structure/closet/crate/secure/weapon{ - req_access_txt = "150" + req_access = list(150) }, /obj/item/ammo_box/magazine/m10mm/hp, /obj/item/ammo_box/magazine/m10mm/hp, @@ -7793,7 +7790,7 @@ /area/ruin/unpowered/syndicate_space_base/storage) "SN" = ( /obj/structure/closet/crate/secure/weapon{ - req_access_txt = "150" + req_access = list(150) }, /obj/item/ammo_box/magazine/m10mm/hp, /obj/item/ammo_box/magazine/m10mm/hp, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm index 5ff98a04973..ce4becef7b4 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm @@ -442,17 +442,17 @@ }, /area/syndicate_depot/core) "bq" = ( +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /obj/machinery/door/airlock/external{ - id_tag = "sst_away"; - req_access_txt = "150" + id_tag = "sst_away" }, /obj/structure/fans/tiny, /turf/simulated/floor/plating, /area/syndicate_depot/core) "br" = ( +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /obj/machinery/door/airlock/external{ - id_tag = "sst_away"; - req_access_txt = "150" + id_tag = "sst_away" }, /obj/structure/fans/tiny, /turf/simulated/floor/plating, @@ -561,9 +561,9 @@ name = "Sealed Doors"; protected = 0 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /obj/machinery/door/airlock/external{ - id_tag = "sst_away"; - req_access_txt = "150" + id_tag = "sst_away" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -647,8 +647,7 @@ /obj/machinery/turretid/syndicate{ name = "external turret controls"; pixel_x = -32; - req_access = null; - req_access_txt = "150" + req_access = list(150) }, /turf/simulated/floor/plasteel{ icon_state = "dark" diff --git a/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm b/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm index 9b02d8da89f..dd84c082cba 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm @@ -157,9 +157,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = "0" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/ruin/space/telecomms/tele) "cJ" = ( @@ -417,13 +415,11 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, /obj/machinery/door/airlock/hatch{ - name = "Telecoms Satellite"; - req_access_txt = "61" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = "0" + name = "Telecoms Satellite" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel, /area/ruin/space/telecomms/tele) @@ -512,9 +508,9 @@ /turf/simulated/floor/catwalk/airless, /area/ruin/space/telecomms/powercontrol) "ky" = ( +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, /obj/machinery/door/airlock/hatch{ - name = "Telecoms Power Control"; - req_access_txt = "61" + name = "Telecoms Power Control" }, /obj/structure/cable{ d1 = 4; @@ -1498,9 +1494,9 @@ /turf/simulated/floor/plasteel, /area/ruin/space/telecomms/computer) "xL" = ( +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, /obj/machinery/door/airlock/hatch{ - name = "Telecoms Lounge"; - req_access_txt = "61" + name = "Telecoms Lounge" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, @@ -1518,9 +1514,9 @@ /turf/simulated/floor/plating, /area/ruin/space/telecomms) "yl" = ( +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, /obj/machinery/door/airlock/maintenance_hatch{ - name = "Telecoms Storage"; - req_access_txt = "61" + name = "Telecoms Storage" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -1576,9 +1572,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, /obj/machinery/door/airlock/hatch{ - name = "Telecoms East Wing"; - req_access_txt = "61" + name = "Telecoms East Wing" }, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -1670,9 +1666,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = "0" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/telecomms_trap_tank, /obj/effect/abstract/cheese_trap, /turf/simulated/floor/catwalk, @@ -1762,9 +1756,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = "0" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/abstract/bot_trap, /turf/simulated/floor/catwalk, /area/ruin/space/telecomms) @@ -2295,18 +2287,16 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = "0" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/ruin/space/telecomms/tele) "IL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, /obj/machinery/door/airlock/hatch{ - name = "Telecoms West Wing"; - req_access_txt = "61" + name = "Telecoms West Wing" }, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -2383,9 +2373,7 @@ /area/ruin/space/telecomms/computer) "JQ" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = "0" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/window/reinforced{ dir = 8 }, @@ -2474,9 +2462,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = "0" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/window/reinforced{ dir = 8 }, @@ -2733,9 +2719,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, /obj/machinery/door/airlock/hatch{ - name = "Telecoms Satellite"; - req_access_txt = "61" + name = "Telecoms Satellite" }, /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/preopen{ @@ -2839,18 +2825,6 @@ temperature = 80 }, /area/ruin/space/telecomms/chamber) -"QY" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = "0" - }, -/turf/simulated/floor/catwalk, -/area/ruin/space/telecomms) "QZ" = ( /obj/machinery/power/solar, /obj/structure/cable, @@ -3086,9 +3060,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = "0" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/ruin/space/telecomms/foyer) "UF" = ( @@ -6849,7 +6821,7 @@ UD oB BQ Zb -QY +nL ML ML AX @@ -8507,12 +8479,12 @@ nL vd Od xj -QY -QY -QY -QY -QY -QY +nL +nL +nL +nL +nL +nL vU Xf Ed diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm index b098bcc88a8..959509f5508 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm @@ -1065,6 +1065,10 @@ /obj/structure/sign/mech, /turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, /area/ruin/space/derelict/arrival) +"cM" = ( +/obj/structure/sign/securearea, +/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/area/ruin/space/derelict/arrival) "cN" = ( /obj/machinery/door/airlock/hatch{ desc = "A sturdy armoury door. If you listen closely, you can barely make out a soviet marching tune coming from the other side of the door."; @@ -3644,11 +3648,11 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/derelict/arrival) "jl" = ( +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /obj/machinery/door/airlock/external{ id_tag = "s_docking_airlock"; locked = 1; - name = "Shuttle Airlock"; - req_access_txt = "150" + name = "Shuttle Airlock" }, /turf/simulated/floor/plating, /area/ruin/space/derelict/arrival) @@ -7429,10 +7433,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/ruin/space/derelict/crew_quarters) -"El" = ( -/obj/structure/sign/securearea, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, -/area/ruin/space/derelict/arrival) "Mi" = ( /obj/effect/spawner/random/fungus/frequent, /turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, @@ -8624,7 +8624,7 @@ aW bn ed en -El +cM fg fB fX @@ -8900,7 +8900,7 @@ dQ do do cm -El +cM de fE fZ @@ -9443,7 +9443,7 @@ aW bn cm cA -El +cM cA do dD @@ -9627,7 +9627,7 @@ bF bT co cA -El +cM dg ds bn diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index 4302706bd33..a3047e86d7a 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -565,8 +565,8 @@ /obj/machinery/access_button{ autolink_id = "labor_btn_ext"; name = "Prison Wing Access Button"; - req_access_txt = "2"; - pixel_y = -21 + pixel_y = -21; + req_access = list(2) }, /obj/structure/cable{ d1 = 4; @@ -1163,10 +1163,10 @@ /obj/effect/turf_decal/delivery/hollow/right, /obj/machinery/door_control{ id = "mining_mechbay"; - req_access_txt = "54"; name = "Mech Bay Shutters"; pixel_x = 24; - pixel_y = 5 + pixel_y = 5; + req_access = list(54) }, /obj/machinery/light_switch{ pixel_x = 24; @@ -2452,9 +2452,9 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors/unexplored/danger) "fU" = ( +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /obj/machinery/door/airlock/titanium{ - id_tag = "s_docking_airlock"; - req_access_txt = "48" + id_tag = "s_docking_airlock" }, /obj/docking_port/mobile/mining, /obj/structure/fans/tiny, @@ -2916,7 +2916,7 @@ id = "gulagshuttleflasher"; name = "Flash Control"; pixel_y = -26; - req_access_txt = "1" + req_access = list(1) }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/siberia) @@ -3093,8 +3093,8 @@ id = "Labor"; name = "Labor Camp Lockdown"; pixel_y = -22; - req_access_txt = "2"; - pixel_x = -7 + pixel_x = -7; + req_access = list(2) }, /obj/machinery/flasher_button{ id = "laborairlock"; @@ -3870,7 +3870,7 @@ /obj/machinery/flasher_button{ id = "gulagshuttleflasher"; name = "Flash Control"; - req_access_txt = "1" + req_access = list(1) }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/siberia) @@ -4466,8 +4466,8 @@ /obj/machinery/access_button{ autolink_id = "labor_btn_int"; name = "Prison Wing Access Button"; - req_access_txt = "2"; - pixel_y = -21 + pixel_y = -21; + req_access = list(2) }, /obj/structure/cable{ d1 = 4; @@ -5999,8 +5999,8 @@ /obj/machinery/access_button{ autolink_id = "labor_btn_ext"; name = "Prison Wing Access Button"; - req_access_txt = "2"; - pixel_y = 21 + pixel_y = 21; + req_access = list(2) }, /obj/machinery/door/poddoor/preopen{ id_tag = "Labor"; @@ -6077,8 +6077,8 @@ /obj/machinery/access_button{ autolink_id = "labor_btn_int"; name = "Prison Wing Access Button"; - req_access_txt = "2"; - pixel_y = 21 + pixel_y = 21; + req_access = list(2) }, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/all/security/brig, diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index e463797b0a3..6a5d477a587 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -19,9 +19,9 @@ /turf/simulated/wall/indestructible/fakedoor, /area/ninja/holding) "ah" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/general, /obj/machinery/door/airlock/centcom{ - name = "CentCom Security"; - req_access_txt = "101" + name = "CentCom Security" }, /turf/simulated/floor/plasteel/dark, /area/centcom/evac) @@ -434,7 +434,7 @@ /area/ninja/holding) "bO" = ( /obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" + req_access = list(25) }, /turf/simulated/floor/plasteel/freezer, /area/ninja/holding) @@ -906,12 +906,12 @@ "dD" = ( /obj/machinery/airlock_controller/air_cycler{ pixel_x = 25; - req_access_txt = "150"; vent_link_id = "syndishuttle_vent"; ext_door_link_id = "syndishuttle_door_ext"; int_door_link_id = "syndishuttle_door_int"; ext_button_link_id = "syndishuttle_btn_ext"; - int_button_link_id = "syndishuttle_btn_int" + int_button_link_id = "syndishuttle_btn_int"; + req_access = list(150) }, /obj/machinery/light{ dir = 4 @@ -1069,10 +1069,10 @@ }, /area/ninja/holding) "ei" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/general, /obj/machinery/door/airlock/centcom{ id_tag = "adminshuttle"; - name = "Workshop"; - req_access_txt = "101" + name = "Workshop" }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) @@ -1934,10 +1934,10 @@ /turf/simulated/floor/plasteel, /area/tdome/arena) "hl" = ( +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /obj/machinery/door/airlock/external{ id_tag = "s_docking_airlock"; - name = "Shuttle Airlock"; - req_access_txt = "150" + name = "Shuttle Airlock" }, /obj/machinery/door/poddoor{ density = 0; @@ -1945,7 +1945,7 @@ id_tag = "syndicate_sit_1"; name = "Side Hull Door"; opacity = 0; - req_access_txt = "150" + req_access = list(150) }, /obj/docking_port/mobile{ dir = 8; @@ -1960,7 +1960,7 @@ id = "syndicate_sit_1"; name = "Blast Doors"; pixel_y = -23; - req_access_txt = "150" + req_access = list(150) }, /obj/docking_port/stationary{ dir = 8; @@ -1976,9 +1976,9 @@ "hm" = ( /obj/machinery/door_control/no_emag/no_cyborg{ pixel_y = 24; - req_access_txt = "114"; name = "Engineering Storage Shutters"; - id = "SpecopsEngineering" + id = "SpecopsEngineering"; + req_access = list(114) }, /turf/simulated/floor/plasteel{ dir = 5; @@ -1999,7 +1999,7 @@ /obj/machinery/door_control/no_emag{ id = "tdome1"; pixel_x = 24; - req_access_txt = "102" + req_access = list(102) }, /turf/simulated/floor/plasteel{ dir = 9; @@ -2016,9 +2016,9 @@ /turf/simulated/floor/wood, /area/ghost_bar) "hq" = ( +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /obj/machinery/door/airlock/external{ - id_tag = "sit_away"; - req_access_txt = "150" + id_tag = "sit_away" }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) @@ -2080,17 +2080,17 @@ /turf/simulated/floor/wood, /area/wizard_station) "hA" = ( +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /obj/machinery/door/airlock/external{ - id_tag = "sst_away"; - req_access_txt = "150" + id_tag = "sst_away" }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "hB" = ( +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /obj/machinery/door/airlock/external{ id_tag = "s_docking_airlock"; - name = "Shuttle Airlock"; - req_access_txt = "150" + name = "Shuttle Airlock" }, /obj/machinery/door/poddoor{ density = 0; @@ -2098,7 +2098,7 @@ id_tag = "syndicate_elite"; name = "Side Hull Door"; opacity = 0; - req_access_txt = "150" + req_access = list(150) }, /obj/docking_port/mobile{ dir = 4; @@ -2129,10 +2129,10 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate_sit) "hE" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/security, /obj/machinery/door/airlock/centcom{ id_tag = "adminshuttle"; - name = "Holding Cell"; - req_access_txt = "104" + name = "Holding Cell" }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) @@ -2142,7 +2142,7 @@ name = "Shuttle Blast Doors"; pixel_x = -26; pixel_y = -2; - req_access_txt = "150" + req_access = list(150) }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) @@ -2179,7 +2179,7 @@ name = "Shuttle Blast Doors"; pixel_x = 26; pixel_y = -2; - req_access_txt = "150" + req_access = list(150) }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) @@ -2221,7 +2221,7 @@ /obj/machinery/door_control/no_emag{ id = "tdome2"; pixel_x = -24; - req_access_txt = "102" + req_access = list(102) }, /turf/simulated/floor/plasteel{ dir = 9; @@ -2246,16 +2246,16 @@ /turf/simulated/floor/plating/abductor, /area/abductor_ship) "hX" = ( +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /obj/machinery/door/airlock/external{ id_tag = "s_docking_airlock"; - name = "Shuttle Airlock"; - req_access_txt = "150" + name = "Shuttle Airlock" }, /obj/machinery/door_control/no_emag{ id = "syndicate_elite"; name = "Blast Doors"; pixel_x = -25; - req_access_txt = "150" + req_access = list(150) }, /obj/machinery/door/poddoor{ density = 0; @@ -2263,22 +2263,22 @@ id_tag = "syndicate_elite"; name = "Front Hull Door"; opacity = 0; - req_access_txt = "150" + req_access = list(150) }, /obj/structure/fans/tiny, /turf/simulated/floor/plating, /area/shuttle/syndicate_elite) "hY" = ( +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /obj/machinery/door/airlock/external{ id_tag = "s_docking_airlock"; - name = "Shuttle Airlock"; - req_access_txt = "150" + name = "Shuttle Airlock" }, /obj/machinery/door_control/no_emag{ id = "syndicate_sit_1"; name = "Blast Doors"; pixel_x = -25; - req_access_txt = "150" + req_access = list(150) }, /obj/structure/fans/tiny, /obj/machinery/door/poddoor{ @@ -2287,7 +2287,7 @@ id_tag = "syndicate_sit_1"; name = "Front Hull Door"; opacity = 0; - req_access_txt = "150" + req_access = list(150) }, /turf/simulated/floor/plating, /area/shuttle/syndicate_sit) @@ -2307,9 +2307,9 @@ }, /area/tdome/tdomeobserve) "ic" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/specops, /obj/machinery/door/airlock/centcom{ - name = "Administrative Office"; - req_access_txt = "109" + name = "Administrative Office" }, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) @@ -2448,14 +2448,14 @@ name = "SIT Base Access"; pixel_x = -6; pixel_y = 6; - req_access_txt = "153" + req_access = list(153) }, /obj/machinery/door_control/no_emag{ id = "sit_tele"; name = "SIT Teleporter Access"; pixel_x = 6; pixel_y = 6; - req_access_txt = "153" + req_access = list(153) }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) @@ -2482,28 +2482,28 @@ name = "SST Extra Weapons"; pixel_x = -6; pixel_y = -4; - req_access_txt = "153" + req_access = list(153) }, /obj/machinery/door_control/no_emag{ id = "sst_ready"; name = "SST Base Access"; pixel_x = -6; pixel_y = 6; - req_access_txt = "153" + req_access = list(153) }, /obj/machinery/door_control/no_emag{ id = "sst_tele"; name = "SST Teleporter Access"; pixel_x = 6; pixel_y = 6; - req_access_txt = "153" + req_access = list(153) }, /obj/machinery/door_control/no_emag{ id = "sst_mechbay"; name = "SST Mech Bay"; pixel_x = 6; pixel_y = -4; - req_access_txt = "153" + req_access = list(153) }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) @@ -2667,11 +2667,11 @@ /obj/machinery/airlock_controller/access_controller{ name = "Syndicate Jail Access Controller"; pixel_y = 24; - req_access_txt = "150"; ext_door_link_id = "syndijail_door_ext"; int_door_link_id = "syndijail_door_int"; ext_button_link_id = "syndijail_btn_ext"; - int_button_link_id = "syndijail_btn_int" + int_button_link_id = "syndijail_btn_int"; + req_access = list(150) }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) @@ -2714,7 +2714,7 @@ /obj/machinery/door_control/no_emag{ id = "commandcenter"; name = "Privacy Shutters"; - req_access_txt = "153" + req_access = list(153) }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) @@ -2803,14 +2803,14 @@ name = "Nuclear Base Access"; pixel_x = -6; pixel_y = 6; - req_access_txt = "153" + req_access = list(153) }, /obj/machinery/door_control/no_emag{ id = "nukeop_ready"; name = "Nuclear Shuttle Access"; pixel_x = 6; pixel_y = 6; - req_access_txt = "153" + req_access = list(153) }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) @@ -2926,7 +2926,7 @@ /area/syndicate_mothership) "kk" = ( /obj/structure/closet/secure_closet{ - req_access_txt = "150" + req_access = list(150) }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) @@ -3263,16 +3263,16 @@ name = "Bolt Cell Doors"; normaldoorcontrol = 1; pixel_x = 6; - req_access_txt = "150"; - specialfunctions = 4 + specialfunctions = 4; + req_access = list(150) }, /obj/machinery/door_control/no_emag{ id = "syndicate_jail"; name = "Bolt Jail Door"; normaldoorcontrol = 1; pixel_x = -5; - req_access_txt = "150"; - specialfunctions = 4 + specialfunctions = 4; + req_access = list(150) }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) @@ -3459,7 +3459,7 @@ /obj/machinery/door_control/no_emag{ id = "syndieshutters"; name = "remote shutter control"; - req_access_txt = "150" + req_access = list(150) }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) @@ -3830,9 +3830,9 @@ /turf/simulated/floor/carpet/arcade, /area/ghost_bar) "mT" = ( +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /obj/machinery/door/airlock/centcom{ - name = "Restroom"; - req_access_txt = "150" + name = "Restroom" }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -3869,7 +3869,7 @@ "mX" = ( /obj/machinery/door/window{ name = "Cockpit"; - req_access_txt = "150" + req_access = list(150) }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) @@ -4153,7 +4153,7 @@ dir = 8; name = "Tactical Toilet"; opacity = 1; - req_access_txt = "150" + req_access = list(150) }, /turf/simulated/floor/plasteel/freezer, /area/syndicate_mothership) @@ -4342,7 +4342,7 @@ /obj/machinery/door/airlock/centcom{ aiControlDisabled = 1; name = "Assault Pod"; - req_one_access_txt = "150" + req_access = list(150) }, /turf/simulated/floor/plating, /area/shuttle/assault_pod) @@ -4535,9 +4535,9 @@ /turf/space/transit, /area/space/centcomm) "pg" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/traders, /obj/machinery/door/airlock/titanium/glass{ name = "trader shuttle airlock"; - req_access_txt = "160"; security_level = 6 }, /turf/simulated/floor/mineral/titanium/blue, @@ -4662,9 +4662,9 @@ /turf/simulated/floor/grass/jungle, /area/centcom/evac) "pK" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/commander, /obj/machinery/door/airlock/centcom{ - name = "Shuttle Control Office"; - req_access_txt = "114" + name = "Shuttle Control Office" }, /turf/simulated/floor/plasteel/dark, /area/centcom/gamma) @@ -4692,14 +4692,14 @@ normaldoorcontrol = 1; pixel_x = 24; pixel_y = -8; - req_access_txt = "160" + req_access = list(160) }, /obj/machinery/door_control/no_emag{ id = "trader_privacy"; name = "Privacy Shutters Control"; pixel_x = 24; pixel_y = 8; - req_access_txt = "160" + req_access = list(160) }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/trade/sol) @@ -4729,7 +4729,7 @@ id = "adminshuttleblast"; name = "blast door control"; pixel_x = -30; - req_access_txt = "101" + req_access = list(101) }, /obj/machinery/light{ dir = 8 @@ -4846,10 +4846,10 @@ name = "Security Doors"; opacity = 0 }, +/obj/effect/mapping_helpers/airlock/access/all/centcomm/traders, /obj/machinery/door/airlock/titanium/glass{ id_tag = "soltrader_north"; name = "trader shuttle airlock"; - req_access_txt = "160"; security_level = 6 }, /turf/simulated/floor/mineral/titanium/blue, @@ -4941,7 +4941,7 @@ name = "Mission Launch Control"; pixel_x = -26; pixel_y = -2; - req_access_txt = "151" + req_access = list(151) }, /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ @@ -5059,9 +5059,8 @@ /turf/simulated/floor/wood, /area/syndicate_mothership) "rc" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate, +/obj/machinery/door/airlock/external, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -5192,14 +5191,14 @@ name = "CentCom Security Shutters"; pixel_x = 8; pixel_y = 36; - req_access_txt = "101" + req_access = list(101) }, /obj/machinery/door_control/no_emag{ id = "CC"; name = "Thunderdome Shutters"; pixel_x = 8; pixel_y = 24; - req_access_txt = "114" + req_access = list(114) }, /obj/machinery/door_control/no_emag{ desc = "A remote control switch to connect the ready room to the rest of Centcom."; @@ -5207,7 +5206,7 @@ name = "Nanotrasen Asset Protection Shutters"; pixel_x = -8; pixel_y = 30; - req_access_txt = "109" + req_access = list(109) }, /turf/simulated/floor/wood, /area/centcom/control) @@ -5484,10 +5483,10 @@ /turf/simulated/floor/plasteel/dark, /area/tdome/tdomeobserve) "su" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/general, /obj/machinery/door/airlock/centcom{ id_tag = "adminshuttle"; - name = "Bridge"; - req_access_txt = "101" + name = "Bridge" }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) @@ -5545,9 +5544,9 @@ /turf/simulated/floor/wood, /area/syndicate_mothership) "sE" = ( +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /obj/machinery/door/airlock/multi_tile/glass{ - name = "Equipment Room"; - req_access_txt = "150" + name = "Equipment Room" }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -5641,7 +5640,7 @@ /obj/machinery/door/airlock/centcom{ aiControlDisabled = 1; name = "Assault Pod"; - req_one_access_txt = "150" + req_access = list(150) }, /obj/docking_port/mobile/assault_pod, /turf/simulated/floor/plating, @@ -5668,8 +5667,8 @@ "th" = ( /obj/machinery/door/window/reinforced/normal{ color = "#d70000"; - req_access_txt = "104"; - dir = 8 + dir = 8; + req_access = list(104) }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) @@ -5809,7 +5808,7 @@ id = "ASSAULT"; name = "Mech Storage"; pixel_y = -24; - req_access_txt = "114" + req_access = list(114) }, /turf/simulated/floor/plasteel{ icon_state = "darkred" @@ -5905,7 +5904,7 @@ /obj/machinery/door/window{ dir = 8; name = "Tool Storage"; - req_access_txt = "150" + req_access = list(150) }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) @@ -6015,7 +6014,7 @@ /obj/machinery/door/window{ dir = 1; name = "Secure Storage"; - req_access_txt = "150" + req_access = list(150) }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) @@ -6265,7 +6264,7 @@ normaldoorcontrol = 1; pixel_x = 24; pixel_y = 8; - req_access_txt = "160" + req_access = list(160) }, /obj/machinery/flasher_button{ id = "soltraderflash"; @@ -6285,10 +6284,10 @@ name = "Security Doors"; opacity = 0 }, +/obj/effect/mapping_helpers/airlock/access/all/centcomm/traders, /obj/machinery/door/airlock/titanium/glass{ id_tag = "soltrader_south"; name = "trader shuttle airlock"; - req_access_txt = "160"; security_level = 6 }, /turf/simulated/floor/mineral/titanium/blue, @@ -7148,10 +7147,10 @@ /turf/simulated/floor/grass, /area/centcom/control) "yZ" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/shuttles, /obj/machinery/door/airlock/external{ name = "Supply Shuttle"; - opacity = 0; - req_access_txt = "106" + opacity = 0 }, /obj/structure/fans/tiny, /turf/simulated/floor/plating, @@ -7302,9 +7301,9 @@ "zK" = ( /obj/machinery/door_control/no_emag/no_cyborg{ pixel_x = 24; - req_access_txt = "114"; name = "Specops Teleporter Shutters"; - id = "CCTELE" + id = "CCTELE"; + req_access = list(114) }, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) @@ -7347,8 +7346,8 @@ "zW" = ( /obj/machinery/door/window{ name = "Uplink Management Control"; - req_access_txt = "151"; - dir = 4 + dir = 4; + req_access = list(151) }, /turf/simulated/floor/wood, /area/syndicate_mothership) @@ -7423,8 +7422,8 @@ "Am" = ( /obj/machinery/door/window/classic/normal{ name = "cell door"; - req_access_txt = "150"; - dir = 1 + dir = 1; + req_access = list(150) }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) @@ -7603,9 +7602,9 @@ /turf/simulated/wall/mineral/plastitanium/nodiagonal, /area/shuttle/supply) "AU" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/commander, /obj/machinery/door/airlock/centcom{ - name = "CentCom BSA Control"; - req_access_txt = "114" + name = "CentCom BSA Control" }, /turf/simulated/floor/plasteel/dark, /area/centcom/gamma) @@ -7648,9 +7647,9 @@ /turf/simulated/floor/catwalk, /area/shuttle/supply) "Be" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/shuttles, /obj/machinery/door/airlock/centcom{ - name = "CentCom Supply"; - req_access_txt = "106" + name = "CentCom Supply" }, /turf/simulated/floor/plasteel/dark, /area/centcom/suppy) @@ -7692,8 +7691,8 @@ base_state = "right"; icon_state = "right"; name = "Infirmary"; - req_access_txt = "150"; - dir = 4 + dir = 4; + req_access = list(150) }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) @@ -7854,9 +7853,9 @@ /turf/simulated/floor/plasteel/dark, /area/tdome/tdomeobserve) "BV" = ( +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /obj/machinery/door/airlock/external{ - id_tag = "syndicate_away"; - req_access_txt = "150" + id_tag = "syndicate_away" }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -8044,7 +8043,7 @@ /obj/machinery/door_control/no_emag{ id = "thunderdome"; name = "Main Blast Doors Control"; - req_access_txt = "102" + req_access = list(102) }, /obj/structure/table/reinforced, /turf/simulated/floor/plasteel{ @@ -8119,7 +8118,7 @@ id = "CCcustoms2"; name = "CentCom Inner Customs Shutters"; pixel_x = 24; - req_access_txt = "101" + req_access = list(101) }, /turf/simulated/floor/plasteel{ dir = 4; @@ -8132,10 +8131,10 @@ /turf/simulated/floor/plasteel/dark, /area/centcom/control) "CM" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/shuttles, /obj/machinery/door/airlock/external{ name = "Supply Shuttle"; - opacity = 0; - req_access_txt = "106" + opacity = 0 }, /turf/simulated/floor/plating, /area/centcom/suppy) @@ -8230,14 +8229,14 @@ name = "Privacy Shutters"; pixel_x = 6; pixel_y = 10; - req_access_txt = "114" + req_access = list(114) }, /obj/machinery/door_control/no_emag{ pixel_x = -6; pixel_y = -17; name = "Engineering Storage"; id = "SpecopsEngineering"; - req_access_txt = "114" + req_access = list(114) }, /turf/simulated/floor/carpet, /area/centcom/specops) @@ -8426,9 +8425,9 @@ /turf/simulated/floor/plasteel/freezer, /area/ghost_bar) "DV" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/commander, /obj/machinery/door/airlock/centcom{ - name = "Administrative Office"; - req_access_txt = "114" + name = "Administrative Office" }, /obj/machinery/door/poddoor/impassable{ id_tag = "specopsoffice"; @@ -8459,9 +8458,9 @@ }, /area/centcom/specops) "Ea" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/specops, /obj/machinery/door/airlock/centcom{ - name = "Shuttle Control Office"; - req_access_txt = "109" + name = "Shuttle Control Office" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -8507,7 +8506,7 @@ "Ej" = ( /obj/machinery/door/window/reinforced/normal{ name = "Cell Door"; - req_access_txt = "150" + req_access = list(150) }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate_sit) @@ -8517,13 +8516,13 @@ /area/shuttle/administration) "El" = ( /obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/centcomm/general, /obj/machinery/door/airlock/centcom{ aiControlDisabled = 1; auto_close_time = 25; hackProof = 1; max_integrity = 3000; - name = "Escape Pod Dock"; - req_access_txt = "101" + name = "Escape Pod Dock" }, /turf/simulated/floor/wood, /area/centcom/evac) @@ -8774,8 +8773,8 @@ "Fp" = ( /obj/machinery/door/window/classic/reversed{ name = "Tool Storage"; - req_access_txt = "150"; - dir = 8 + dir = 8; + req_access = list(150) }, /obj/machinery/light/spot{ dir = 1 @@ -8803,8 +8802,8 @@ "Ft" = ( /obj/machinery/door/window{ name = "Infirmary"; - req_access_txt = "150"; - dir = 4 + dir = 4; + req_access = list(150) }, /obj/machinery/light/spot{ dir = 1 @@ -9202,7 +9201,7 @@ /obj/machinery/door/window{ dir = 1; name = "Cell A"; - req_access_txt = "101" + req_access = list(101) }, /turf/simulated/floor/plasteel/dark, /area/admin) @@ -9212,9 +9211,9 @@ "GO" = ( /obj/machinery/door_control/no_emag{ pixel_y = -24; - req_access_txt = "114"; name = "Engineering Storage Shutters"; - id = "SpecopsEngineering" + id = "SpecopsEngineering"; + req_access = list(114) }, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) @@ -9614,7 +9613,7 @@ id = "adminshuttleblast"; name = "blast door control"; pixel_x = -30; - req_access_txt = "101" + req_access = list(101) }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) @@ -9859,10 +9858,10 @@ }, /area/centcom/specops) "Jb" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/specops, /obj/machinery/door/airlock/external{ id_tag = "s_docking_airlock"; - name = "Shuttle Hatch"; - req_access_txt = "109" + name = "Shuttle Hatch" }, /obj/structure/fans/tiny, /turf/simulated/floor/plating, @@ -10095,7 +10094,7 @@ id = "CCGAMMA"; name = "Gamma Lockdown"; pixel_x = 32; - req_access_txt = "114" + req_access = list(114) }, /obj/structure/filingcabinet/filingcabinet, /turf/simulated/floor/plasteel{ @@ -10535,7 +10534,7 @@ /obj/machinery/door_control/no_emag{ id = "thunderdomehea"; name = "Heavy Supply Control"; - req_access_txt = "102" + req_access = list(102) }, /obj/structure/table/reinforced, /turf/simulated/floor/plasteel{ @@ -10573,7 +10572,7 @@ id = "ASSAULT"; name = "Mech Storage"; pixel_y = -24; - req_access_txt = "114" + req_access = list(114) }, /obj/effect/turf_decal/caution/stand_clear{ dir = 4 @@ -10816,7 +10815,7 @@ /obj/machinery/door_control/no_emag{ id = "thunderdomegen"; name = "General Supply Control"; - req_access_txt = "102" + req_access = list(102) }, /obj/structure/table/reinforced, /turf/simulated/floor/plasteel{ @@ -10839,9 +10838,9 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Mn" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/commander, /obj/machinery/door/airlock/centcom{ - name = "Gamma Armory"; - req_access_txt = "114" + name = "Gamma Armory" }, /obj/machinery/door/poddoor/impassable{ id_tag = "CCGAMMA"; @@ -10945,9 +10944,9 @@ /area/centcom/specops) "Mz" = ( /obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/centcomm/shuttles, /obj/machinery/door/airlock/centcom{ - name = "CentCom Supply"; - req_access_txt = "106" + name = "CentCom Supply" }, /turf/simulated/floor/plasteel/dark, /area/centcom/suppy) @@ -11039,28 +11038,28 @@ name = "Station Access"; pixel_x = -6; pixel_y = 6; - req_access_txt = "114" + req_access = list(114) }, /obj/machinery/door_control/no_emag{ id = "CCGAMMA"; name = "Gamma Lockdown"; pixel_x = -6; pixel_y = -3; - req_access_txt = "114" + req_access = list(114) }, /obj/machinery/door_control/no_emag{ id = "ASSAULT"; name = "Mech Storage"; pixel_x = 6; pixel_y = 6; - req_access_txt = "114" + req_access = list(114) }, /obj/machinery/door_control/no_emag{ id = "CCDOCK2"; name = "Special Operations Secondary Dock"; pixel_x = 6; pixel_y = -3; - req_access_txt = "114" + req_access = list(114) }, /turf/simulated/floor/carpet, /area/centcom/specops) @@ -11072,10 +11071,10 @@ }, /area/holodeck/source_desert) "MS" = ( +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /obj/machinery/door/airlock/external{ id_tag = "syndishuttle_door_ext"; - name = "Ship External Access"; - req_access_txt = "150" + name = "Ship External Access" }, /obj/machinery/door/poddoor{ density = 0; @@ -11089,7 +11088,7 @@ name = "External Door Control"; pixel_x = -26; pixel_y = 2; - req_access_txt = "150" + req_access = list(150) }, /obj/docking_port/mobile{ dheight = 9; @@ -11656,8 +11655,8 @@ "OM" = ( /obj/machinery/door/window/classic/reversed{ name = "In"; - req_access_txt = "150"; - dir = 1 + dir = 1; + req_access = list(150) }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) @@ -11692,12 +11691,12 @@ /obj/machinery/door/poddoor/preopen{ id_tag = "adminshuttleblast"; name = "Blast Doors"; - req_access_txt = "101" + req_access = list(101) }, +/obj/effect/mapping_helpers/airlock/access/all/centcomm/general, /obj/machinery/door/airlock/centcom{ id_tag = "adminshuttle"; - name = "General Access"; - req_access_txt = "101" + name = "General Access" }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) @@ -11719,7 +11718,7 @@ id = "CCDOCK2"; name = "Special Operations Secondary Dock"; pixel_y = 24; - req_access_txt = "114" + req_access = list(114) }, /turf/simulated/floor/plasteel{ dir = 6; @@ -12365,8 +12364,8 @@ "Rl" = ( /obj/machinery/door/window/classic/normal{ name = "Out"; - req_access_txt = "150"; - dir = 1 + dir = 1; + req_access = list(150) }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) @@ -12467,7 +12466,7 @@ name = "Hanger Bay Shutters"; pixel_x = 24; pixel_y = null; - req_access_txt = "101" + req_access = list(101) }, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) @@ -12552,7 +12551,7 @@ id = "CCcustoms2"; name = "CentCom Inner Customs Shutters"; pixel_x = -24; - req_access_txt = "101" + req_access = list(101) }, /turf/simulated/floor/plasteel{ dir = 1; @@ -12587,7 +12586,7 @@ id = "CCcustoms1"; name = "CentCom Outer Customs Shutters"; pixel_x = 24; - req_access_txt = "101" + req_access = list(101) }, /turf/simulated/floor/plasteel{ dir = 1; @@ -12693,7 +12692,7 @@ name = "Specops Teleporter Shutters"; pixel_x = -24; pixel_y = null; - req_access_txt = "114" + req_access = list(114) }, /turf/simulated/floor/plasteel{ dir = 8; @@ -12995,7 +12994,7 @@ id = "SpecopsFerry"; name = "Hanger Bay Shutters"; pixel_y = 24; - req_access_txt = "101" + req_access = list(101) }, /turf/simulated/floor/plasteel{ dir = 5; @@ -13090,9 +13089,9 @@ }, /area/centcom/control) "Uj" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/specops, /obj/machinery/door/airlock/centcom{ - name = "CentCom Bridge"; - req_access_txt = "109" + name = "CentCom Bridge" }, /turf/simulated/floor/wood, /area/centcom/control) @@ -13151,10 +13150,10 @@ }, /area/shuttle/escape) "Us" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/general, /obj/machinery/door/airlock/centcom{ id_tag = "adminshuttle"; - name = "Medbay"; - req_access_txt = "101" + name = "Medbay" }, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) @@ -13361,8 +13360,8 @@ base_state = "right"; icon_state = "right"; name = "Equipment Room"; - req_access_txt = "150"; - dir = 4 + dir = 4; + req_access = list(150) }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) @@ -13592,7 +13591,7 @@ id = "CCcustoms1"; name = "CentCom Outer Customs Shutters"; pixel_x = -24; - req_access_txt = "101" + req_access = list(101) }, /turf/simulated/floor/plasteel{ dir = 8; @@ -13696,10 +13695,10 @@ /turf/simulated/floor/plasteel, /area/admin) "WD" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/specops, /obj/machinery/door/airlock/external{ id_tag = "s_docking_airlock"; - name = "Shuttle Hatch"; - req_access_txt = "109" + name = "Shuttle Hatch" }, /obj/docking_port/mobile{ dir = 8; @@ -13991,7 +13990,7 @@ id = "SPECOPS"; name = "Nanotrasen Asset Protection Shutters"; pixel_y = -24; - req_access_txt = "109" + req_access = list(109) }, /turf/simulated/floor/plasteel{ dir = 10; @@ -14232,7 +14231,7 @@ id = "CCDOCK2"; name = "Special Operations Secondary Dock"; pixel_y = -24; - req_access_txt = "114" + req_access = list(114) }, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) @@ -14294,8 +14293,8 @@ "Ys" = ( /obj/machinery/door/window{ name = "Equipment Room"; - req_access_txt = "150"; - dir = 4 + dir = 4; + req_access = list(150) }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) @@ -14383,7 +14382,7 @@ "YJ" = ( /obj/machinery/door/window/classic/normal{ name = "Cell B"; - req_access_txt = "101" + req_access = list(101) }, /turf/simulated/floor/plasteel/dark, /area/admin) @@ -14423,11 +14422,11 @@ /turf/simulated/floor/plasteel, /area/centcom/evac) "YS" = ( +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /obj/machinery/door/airlock/external{ id_tag = "syndishuttle_door_int"; locked = 1; - name = "Ship External Access"; - req_access_txt = "150" + name = "Ship External Access" }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 diff --git a/_maps/map_files/shuttles/admin_admin.dmm b/_maps/map_files/shuttles/admin_admin.dmm index c7f30616b8f..8dbc488e613 100644 --- a/_maps/map_files/shuttles/admin_admin.dmm +++ b/_maps/map_files/shuttles/admin_admin.dmm @@ -6,19 +6,19 @@ /turf/simulated/wall/mineral/plastitanium/nodiagonal, /area/shuttle/administration) "ad" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/general, /obj/machinery/door/airlock/external{ id_tag = "s_docking_airlock"; - name = "Shuttle Hatch"; - req_access_txt = "101" + name = "Shuttle Hatch" }, /obj/structure/fans/tiny, /turf/simulated/floor/plating, /area/shuttle/administration) "ae" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/general, /obj/machinery/door/airlock/external{ id_tag = "s_docking_airlock"; - name = "Shuttle Hatch"; - req_access_txt = "101" + name = "Shuttle Hatch" }, /obj/docking_port/mobile{ dir = 2; @@ -60,7 +60,7 @@ id = "adminshuttleblast"; name = "blast door control"; pixel_x = -30; - req_access_txt = "101" + req_access = list(101) }, /obj/machinery/light{ dir = 8 @@ -98,12 +98,12 @@ /obj/machinery/door/poddoor/preopen{ id_tag = "adminshuttleblast"; name = "Blast Doors"; - req_access_txt = "101" + req_access = list(101) }, +/obj/effect/mapping_helpers/airlock/access/all/centcomm/general, /obj/machinery/door/airlock/centcom{ id_tag = "adminshuttle"; - name = "General Access"; - req_access_txt = "101" + name = "General Access" }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) @@ -169,15 +169,15 @@ id = "adminshuttleblast"; name = "blast door control"; pixel_x = -30; - req_access_txt = "101" + req_access = list(101) }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aB" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/general, /obj/machinery/door/airlock/centcom{ id_tag = "adminshuttle"; - name = "Workshop"; - req_access_txt = "101" + name = "Workshop" }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) @@ -339,10 +339,10 @@ /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bd" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/general, /obj/machinery/door/airlock/centcom{ id_tag = "adminshuttle"; - name = "Bridge"; - req_access_txt = "101" + name = "Bridge" }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) @@ -357,10 +357,10 @@ /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bh" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/general, /obj/machinery/door/airlock/centcom{ id_tag = "adminshuttle"; - name = "Medbay"; - req_access_txt = "101" + name = "Medbay" }, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) @@ -399,18 +399,18 @@ /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bp" = ( +/obj/effect/mapping_helpers/airlock/access/all/centcomm/security, /obj/machinery/door/airlock/centcom{ id_tag = "adminshuttle"; - name = "Holding Cell"; - req_access_txt = "104" + name = "Holding Cell" }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "bq" = ( /obj/machinery/door/window/reinforced/normal{ color = "#d70000"; - req_access_txt = "104"; - dir = 8 + dir = 8; + req_access = list(104) }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) diff --git a/_maps/map_files/shuttles/admin_armory.dmm b/_maps/map_files/shuttles/admin_armory.dmm index c9304f924b2..7a77e1b5f71 100644 --- a/_maps/map_files/shuttles/admin_armory.dmm +++ b/_maps/map_files/shuttles/admin_armory.dmm @@ -221,7 +221,7 @@ id = "adminshuttlebridge"; name = "Bridge Privacy Shutters"; pixel_x = 25; - req_access_txt = "19" + req_access = list(19) }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) @@ -267,7 +267,7 @@ name = "External Window Shutter Control"; pixel_x = -5; pixel_y = 35; - req_access_txt = "19" + req_access = list(19) }, /obj/machinery/keycard_auth{ pixel_y = 24 @@ -277,7 +277,7 @@ name = "Airlock Blast Door Control"; pixel_x = 5; pixel_y = 35; - req_access_txt = "19" + req_access = list(19) }, /obj/structure/chair/comfy/shuttle{ dir = 8 @@ -789,7 +789,7 @@ id = "adminarmoryshutters"; name = "Armory Internal Shutters"; pixel_x = -26; - req_access_txt = "3" + req_access = list(3) }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) diff --git a/_maps/map_files/shuttles/admin_skipjack.dmm b/_maps/map_files/shuttles/admin_skipjack.dmm index 6a8e908d034..aed953b9016 100644 --- a/_maps/map_files/shuttles/admin_skipjack.dmm +++ b/_maps/map_files/shuttles/admin_skipjack.dmm @@ -13,10 +13,10 @@ /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/shuttle/administration) "ad" = ( +/obj/effect/mapping_helpers/airlock/access/all/shuttles/vox, /obj/machinery/door/airlock/hatch{ id_tag = "voxwest_door_ext"; - locked = 1; - req_access_txt = "152" + locked = 1 }, /obj/structure/fans/tiny, /turf/simulated/floor/mineral/plastitanium/red/nitrogen, @@ -77,7 +77,7 @@ "av" = ( /obj/machinery/access_button{ autolink_id = "voxwest_btn_ext"; - req_one_access_txt = "152" + req_access = list(152) }, /turf/simulated/wall/mineral/plastitanium, /area/shuttle/administration) @@ -97,7 +97,7 @@ int_button_link_id = "voxwest_btn_int"; int_door_link_id = "voxwest_door_int"; pixel_x = 24; - req_access_txt = "152" + req_access = list(152) }, /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/shuttle/administration) @@ -127,19 +127,19 @@ /turf/simulated/floor/plating/airless, /area/shuttle/administration) "aM" = ( +/obj/effect/mapping_helpers/airlock/access/all/shuttles/vox, /obj/machinery/door/airlock/hatch{ id_tag = "voxeast_door_ext"; - locked = 1; - req_access_txt = "152" + locked = 1 }, /obj/structure/fans/tiny, /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/shuttle/administration) "aN" = ( +/obj/effect/mapping_helpers/airlock/access/all/shuttles/vox, /obj/machinery/door/airlock/hatch{ id_tag = "voxwest_door_int"; - locked = 1; - req_access_txt = "152" + locked = 1 }, /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/shuttle/administration) @@ -162,9 +162,8 @@ /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/shuttle/administration) "bb" = ( -/obj/machinery/door/airlock/hatch{ - req_access_txt = "152" - }, +/obj/effect/mapping_helpers/airlock/access/all/shuttles/vox, +/obj/machinery/door/airlock/hatch, /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/shuttle/administration) "bd" = ( @@ -232,7 +231,7 @@ "bO" = ( /obj/machinery/access_button{ autolink_id = "voxeast_btn_ext"; - req_access_txt = "152" + req_access = list(152) }, /turf/simulated/wall/mineral/plastitanium, /area/shuttle/administration) @@ -277,16 +276,16 @@ ext_door_link_id = "voxeast_door_ext"; int_door_link_id = "voxeast_door_int"; pixel_x = -24; - req_access_txt = "152"; ext_button_link_id = "voxeast_btn_ext"; - int_button_link_id = "voxeast_btn_int" + int_button_link_id = "voxeast_btn_int"; + req_access = list(152) }, /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/shuttle/administration) "cg" = ( /obj/machinery/access_button{ autolink_id = "voxwest_btn_int"; - req_one_access_txt = "152" + req_access = list(152) }, /turf/simulated/wall/mineral/plastitanium/nodiagonal, /area/shuttle/administration) @@ -325,15 +324,15 @@ "cn" = ( /obj/machinery/access_button{ autolink_id = "voxeast_btn_int"; - req_one_access_txt = "152" + req_access = list(152) }, /turf/simulated/wall/mineral/plastitanium/nodiagonal, /area/shuttle/administration) "co" = ( +/obj/effect/mapping_helpers/airlock/access/all/shuttles/vox, /obj/machinery/door/airlock/hatch{ id_tag = "voxeast_door_int"; - locked = 1; - req_access_txt = "152" + locked = 1 }, /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/shuttle/administration) @@ -486,7 +485,7 @@ /obj/machinery/door_control{ id = "voxshutters"; name = "remote shutter control"; - req_access_txt = "152" + req_access = list(152) }, /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/shuttle/administration) diff --git a/_maps/map_files/shuttles/emergency_raven.dmm b/_maps/map_files/shuttles/emergency_raven.dmm index d71aa52b0e0..c92d211f102 100644 --- a/_maps/map_files/shuttles/emergency_raven.dmm +++ b/_maps/map_files/shuttles/emergency_raven.dmm @@ -693,7 +693,7 @@ name = "Warehouse Door Control"; pixel_x = -1; pixel_y = 24; - req_access_txt = "31" + req_access = list(31) }, /turf/simulated/floor/plasteel/dark, /area/shuttle/escape) @@ -721,7 +721,7 @@ name = "Warehouse Door Control"; pixel_x = -1; pixel_y = 24; - req_access_txt = "31" + req_access = list(31) }, /turf/simulated/floor/plasteel/dark, /area/shuttle/escape) @@ -1303,7 +1303,7 @@ name = "Warehouse Door Control"; pixel_x = -1; pixel_y = -24; - req_access_txt = "31" + req_access = list(31) }, /turf/simulated/floor/plasteel/dark, /area/shuttle/escape) @@ -1458,7 +1458,7 @@ name = "Warehouse Door Control"; pixel_x = -1; pixel_y = -24; - req_access_txt = "31" + req_access = list(31) }, /turf/simulated/floor/plasteel/dark, /area/shuttle/escape) diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index efc65bc62cd..688f8420c2f 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -813,7 +813,7 @@ id = "HoS"; pixel_x = 24; pixel_y = -8; - req_access_txt = "58" + req_access = list(58) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -947,14 +947,14 @@ name = "Prison Wing Lockdown"; pixel_x = -28; pixel_y = 7; - req_access_txt = "2" + req_access = list(2) }, /obj/machinery/door_control{ id = "Secure Gate"; name = "Brig Lockdown"; pixel_x = -28; pixel_y = -3; - req_access_txt = "2" + req_access = list(2) }, /obj/machinery/door_control{ id = "hosofficedoor"; @@ -962,7 +962,7 @@ normaldoorcontrol = 1; pixel_x = -28; pixel_y = 17; - req_access_txt = "58" + req_access = list(58) }, /turf/simulated/floor/carpet, /area/station/command/office/hos) @@ -1008,7 +1008,7 @@ name = "Brig Lockdown"; pixel_x = 3; pixel_y = -28; - req_access_txt = "2" + req_access = list(2) }, /obj/machinery/door_control{ desc = "A remote control-switch to lock down the prison wing's blast doors"; @@ -1016,7 +1016,7 @@ name = "Prison Wing Lockdown"; pixel_x = -7; pixel_y = -28; - req_access_txt = "2" + req_access = list(2) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -1484,7 +1484,7 @@ autolink_id = "viro_btn_int"; name = "Virology Lab Access Button"; pixel_x = -24; - req_access_txt = "39" + req_access = list(39) }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -2808,7 +2808,7 @@ name = "Secure Armory Shutter Control"; pixel_x = 7; pixel_y = -28; - req_access_txt = "3" + req_access = list(3) }, /obj/structure/cable{ d1 = 4; @@ -5355,8 +5355,7 @@ "asO" = ( /obj/machinery/computer/prisoner{ dir = 4; - req_access = null; - req_access_txt = "2" + req_access = list(2) }, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -5412,7 +5411,7 @@ normaldoorcontrol = 1; pixel_x = 5; pixel_y = -35; - req_access_txt = "63" + req_access = list(63) }, /obj/machinery/door_control{ desc = "A remote control switch for the brig foyer."; @@ -5421,7 +5420,7 @@ normaldoorcontrol = 1; pixel_x = 5; pixel_y = -25; - req_access_txt = "63" + req_access = list(63) }, /obj/structure/cable{ d1 = 1; @@ -5435,7 +5434,7 @@ normaldoorcontrol = 1; pixel_x = -5; pixel_y = -25; - req_access_txt = "63" + req_access = list(63) }, /turf/simulated/floor/plasteel{ dir = 6; @@ -5724,8 +5723,7 @@ "atN" = ( /obj/machinery/computer/prisoner{ dir = 4; - req_access = null; - req_access_txt = "2" + req_access = list(2) }, /turf/simulated/floor/plasteel{ dir = 8; @@ -6059,7 +6057,7 @@ name = "processing tint control"; pixel_x = -24; pixel_y = -8; - req_access_txt = "63" + req_access = list(63) }, /turf/simulated/floor/plasteel, /area/station/security/processing) @@ -7259,7 +7257,7 @@ id = "IAA"; pixel_x = -24; pixel_y = 6; - req_access_txt = "38" + req_access = list(38) }, /obj/machinery/economy/vending/lawdrobe, /turf/simulated/floor/plasteel{ @@ -7627,7 +7625,7 @@ id = "brig_courtroom"; name = "Brig Courtroom Shutter Control"; pixel_x = 25; - req_access_txt = "2" + req_access = list(2) }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -7798,7 +7796,7 @@ id = "Interrogation"; name = "interrogation tint control"; pixel_x = -24; - req_access_txt = "63" + req_access = list(63) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -8008,15 +8006,15 @@ id = "Magistrate"; pixel_x = 24; pixel_y = 6; - req_access_txt = "74" + req_access = list(74) }, /obj/machinery/door_control{ id = "magistrateofficedoor"; name = "Office Door"; normaldoorcontrol = 1; pixel_x = 25; - req_access_txt = "74"; - pixel_y = -4 + pixel_y = -4; + req_access = list(74) }, /turf/simulated/floor/carpet, /area/station/legal/magistrate) @@ -8417,8 +8415,7 @@ }, /obj/machinery/alarm/directional/west, /obj/machinery/computer/prisoner{ - req_access = null; - req_access_txt = "2" + req_access = list(2) }, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -8755,7 +8752,7 @@ id = "brig_courtroom"; name = "Brig Courtroom Shutter Control"; pixel_y = 25; - req_access_txt = "2" + req_access = list(2) }, /obj/machinery/light{ dir = 1 @@ -9159,7 +9156,7 @@ id = "Detective"; pixel_x = -8; pixel_y = 24; - req_access_txt = "4" + req_access = list(4) }, /turf/simulated/floor/carpet, /area/station/security/detective) @@ -11458,7 +11455,7 @@ /obj/machinery/button/windowtint{ id = "Courtroom"; pixel_x = -8; - req_one_access_txt = "74;3" + req_one_access = list(74,3) }, /turf/simulated/floor/carpet, /area/station/legal/courtroom) @@ -14019,8 +14016,8 @@ /obj/machinery/door_control{ id = "paramedic"; name = "Garage Door Control"; - req_access_txt = "66"; - pixel_x = -24 + pixel_x = -24; + req_access = list(66) }, /obj/machinery/door/poddoor/preopen{ id_tag = "Biohazard_medi"; @@ -19461,7 +19458,7 @@ /area/station/service/bar) "bjc" = ( /obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" + req_access = list(25) }, /turf/simulated/floor/wood, /area/station/service/bar) @@ -19520,7 +19517,7 @@ "bjp" = ( /obj/machinery/door/morgue{ name = "Confession Booth (Chaplain)"; - req_access_txt = "22" + req_access = list(22) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -21450,7 +21447,7 @@ "boy" = ( /obj/machinery/door/morgue{ name = "Private Study"; - req_access_txt = "37" + req_access = list(37) }, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -23980,14 +23977,14 @@ name = "Kitchen Bar Shutters Control"; pixel_x = -6; pixel_y = -24; - req_access_txt = "28" + req_access = list(28) }, /obj/machinery/door_control{ id = "kitchenhall"; name = "Kitchen Hallway Shutters Control"; pixel_x = 6; pixel_y = -24; - req_access_txt = "28" + req_access = list(28) }, /obj/structure/cable{ d1 = 1; @@ -26071,16 +26068,6 @@ }, /turf/simulated/floor/plasteel, /area/station/supply/warehouse) -"bFp" = ( -/obj/machinery/door_control{ - id = "qm_warehouse"; - name = "Warehouse Door Control"; - pixel_x = -1; - pixel_y = -24; - req_access_txt = "31" - }, -/turf/simulated/floor/plasteel, -/area/station/supply/warehouse) "bFq" = ( /obj/structure/sign/poster/contraband/random{ pixel_y = -32 @@ -26938,7 +26925,7 @@ name = "Robotics Lab Shutters Control"; pixel_x = 24; pixel_y = 32; - req_access_txt = "29" + req_access = list(29) }, /turf/simulated/floor/plasteel{ dir = 4; @@ -27732,7 +27719,7 @@ name = "Research and Development Lab Shutters Control"; pixel_x = -24; pixel_y = 32; - req_access_txt = "47" + req_access = list(47) }, /obj/effect/landmark/start/scientist, /turf/simulated/floor/plasteel{ @@ -27997,7 +27984,7 @@ name = "Warehouse Door Control"; pixel_x = -1; pixel_y = 24; - req_access_txt = "31" + req_access = list(31) }, /obj/machinery/power/apc/directional/east, /obj/structure/cable{ @@ -32703,14 +32690,14 @@ name = "Office Door"; normaldoorcontrol = 1; pixel_x = 25; - req_access_txt = "40" + req_access = list(40) }, /obj/machinery/button/windowtint{ id = "CMO"; pixel_x = 24; pixel_y = 8; - req_access_txt = "40"; - dir = 8 + dir = 8; + req_access = list(40) }, /obj/machinery/light_switch{ pixel_x = 24; @@ -32722,7 +32709,7 @@ id = "Biohazard_medi"; name = "Medical Quarantine"; pixel_x = 35; - req_access_txt = "40" + req_access = list(40) }, /turf/simulated/floor/plasteel{ dir = 6; @@ -33205,7 +33192,7 @@ id = "xenobio4"; name = "Chamber 4 Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access = list(55) }, /turf/simulated/floor/plasteel, /area/station/science/xenobiology) @@ -34553,7 +34540,7 @@ name = "Biohazard Shutter Control"; pixel_x = -4; pixel_y = 6; - req_access_txt = "30" + req_access = list(30) }, /obj/item/folder/white{ pixel_x = 4 @@ -34569,7 +34556,7 @@ normaldoorcontrol = 1; pixel_x = -4; pixel_y = -4; - req_access_txt = "30" + req_access = list(30) }, /turf/simulated/floor/plasteel{ dir = 4; @@ -35714,7 +35701,7 @@ normaldoorcontrol = 1; pixel_x = 6; pixel_y = 3; - req_one_access_txt = "57" + req_access = list(57) }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -35906,9 +35893,9 @@ /obj/machinery/button/windowtint{ id = "Surgery 1"; pixel_y = -24; - req_access_txt = "45"; dir = 1; - pixel_x = 8 + pixel_x = 8; + req_access = list(45) }, /obj/machinery/iv_drip, /turf/simulated/floor/plasteel{ @@ -39830,7 +39817,7 @@ id = "disvent"; name = "Incinerator Vent Control"; pixel_y = -24; - req_access_txt = "12" + req_access = list(12) }, /obj/machinery/atmospherics/meter, /obj/machinery/atmospherics/pipe/simple/visible{ @@ -41346,7 +41333,7 @@ id = "xenobio6"; name = "Chamber 6 Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access = list(55) }, /turf/simulated/floor/plasteel, /area/station/science/xenobiology) @@ -42063,7 +42050,7 @@ name = "Atmospherics Lockdown"; pixel_x = 24; pixel_y = 8; - req_access_txt = "24" + req_access = list(24) }, /obj/structure/cable{ d1 = 1; @@ -43226,7 +43213,7 @@ name = "Office Door"; normaldoorcontrol = 1; pixel_x = -5; - req_access_txt = "56" + req_access = list(56) }, /obj/item/clipboard{ pixel_x = 5 @@ -44836,7 +44823,7 @@ name = "Atmospherics Lockdown"; pixel_x = 24; pixel_y = 4; - req_access_txt = "24" + req_access = list(24) }, /obj/machinery/atmospherics/pipe/simple/visible/purple, /turf/simulated/floor/plasteel, @@ -45378,7 +45365,7 @@ id = "Secure Storage"; name = "Engineering Secure Storage"; pixel_x = -24; - req_access_txt = "56" + req_access = list(56) }, /obj/structure/cable{ d1 = 1; @@ -45768,7 +45755,7 @@ id = "xenobio7"; name = "Chamber 7 Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access = list(55) }, /turf/simulated/floor/plasteel, /area/station/science/xenobiology) @@ -46800,14 +46787,14 @@ name = "Auxiliary Vent"; pixel_x = 6; pixel_y = -24; - req_access_txt = "32" + req_access = list(32) }, /obj/machinery/door_control{ id = "turbinevent"; name = "Turbine Vent"; pixel_x = -6; pixel_y = -24; - req_access_txt = "32" + req_access = list(32) }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -48158,7 +48145,7 @@ id = "teledoor"; name = "AI Satellite Teleport Shutters Control"; pixel_y = 25; - req_access_txt = "17;75" + req_access = list(17,75) }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/turf_decal/stripes/line{ @@ -48567,7 +48554,7 @@ control_area = "\improper AI Satellite Antechamber"; name = "AI Antechamber Turret Control"; pixel_y = -24; - req_access_txt = "75" + req_access = list(75) }, /obj/structure/cable{ d1 = 4; @@ -48679,7 +48666,7 @@ control_area = "\improper AI Satellite Atmospherics"; name = "AI Satellite Atmospherics Turret Control"; pixel_x = -28; - req_access_txt = "75" + req_access = list(75) }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -48800,7 +48787,7 @@ control_area = "\improper AI Satellite Service"; name = "AI Satellite Service Bay Turret Control"; pixel_x = 24; - req_access_txt = "75" + req_access = list(75) }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -49117,7 +49104,7 @@ name = "AI Chamber Hallway Turret Control"; pixel_x = 24; pixel_y = -24; - req_access_txt = "75" + req_access = list(75) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -50516,7 +50503,7 @@ name = "AI Chamber Turret Control"; pixel_x = 5; pixel_y = -24; - req_access_txt = "75" + req_access = list(75) }, /obj/machinery/flasher{ id = "AI"; @@ -51582,7 +51569,7 @@ id = "justice_blast"; name = "Space Vent"; pixel_x = -32; - req_access_txt = "2" + req_access = list(2) }, /obj/machinery/flasher_button{ id = "Execution"; @@ -52430,7 +52417,7 @@ autolink_id = "atmossm_btn_ext"; name = "Atmospherics Access Button"; pixel_y = -24; - req_access_txt = "24" + req_access = list(24) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -52672,12 +52659,12 @@ "ehs" = ( /obj/machinery/airlock_controller/air_cycler{ pixel_x = -25; - req_access_txt = "10;13"; vent_link_id = "eng_vent"; ext_door_link_id = "eng_door_ext"; int_door_link_id = "eng_door_int"; ext_button_link_id = "eng_btn_ext"; - int_button_link_id = "eng_btn_int" + int_button_link_id = "eng_btn_int"; + req_access = list(10,13) }, /turf/simulated/floor/plating, /area/station/engineering/hardsuitstorage) @@ -54401,7 +54388,7 @@ id = "xenobio2"; name = "Chamber 2 Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access = list(55) }, /obj/structure/cable{ d1 = 1; @@ -54421,8 +54408,8 @@ /obj/machinery/door_control{ id = "mechbay_outer"; name = "Outer Mech Bay Shutters Control"; - req_access_txt = "29"; - pixel_x = 24 + pixel_x = 24; + req_access = list(29) }, /turf/simulated/floor/plasteel, /area/station/science/robotics/chargebay) @@ -54481,8 +54468,8 @@ /obj/machinery/door_control{ id = "mechbay_inner"; name = "Inner Mech Bay Shutter Control"; - req_access_txt = "29"; - pixel_y = -24 + pixel_y = -24; + req_access = list(29) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -55073,11 +55060,11 @@ name = "Turbine Access Console"; pixel_x = 6; pixel_y = -26; - req_access_txt = "12"; ext_door_link_id = "turbine_door_ext"; int_door_link_id = "turbine_door_int"; ext_button_link_id = "turbine_btn_ext"; - int_button_link_id = "turbine_btn_int" + int_button_link_id = "turbine_btn_int"; + req_access = list(12) }, /obj/machinery/ignition_switch{ id = "gasturbine"; @@ -55882,7 +55869,7 @@ autolink_id = "engsm_btn_int"; name = "Supermatter Access Button"; pixel_y = -24; - req_access_txt = "10" + req_access = list(10) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -57633,7 +57620,7 @@ name = "Dispossal Vent Control"; pixel_x = -24; pixel_y = 8; - req_access_txt = "12" + req_access = list(12) }, /obj/machinery/driver_button{ id_tag = "trash"; @@ -58455,7 +58442,7 @@ autolink_id = "eng_btn_int"; pixel_x = -22; pixel_y = -20; - req_access_txt = "10;13" + req_access = list(10,13) }, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) @@ -58702,8 +58689,8 @@ /obj/machinery/access_button{ autolink_id = "perma_btn_ext"; name = "Prison Wing Access Button"; - req_access_txt = "2"; - pixel_y = 21 + pixel_y = 21; + req_access = list(2) }, /obj/machinery/door/poddoor/preopen{ id_tag = "Prison Gate"; @@ -60304,7 +60291,7 @@ id = "xenobio1"; name = "Chamber 1 Containment Blast Door"; pixel_y = 4; - req_access_txt = "55" + req_access = list(55) }, /turf/simulated/floor/plasteel, /area/station/science/xenobiology) @@ -61738,12 +61725,12 @@ "iDk" = ( /obj/machinery/airlock_controller/air_cycler{ pixel_y = -25; - req_access_txt = "13"; vent_link_id = "secmaint_vent"; ext_door_link_id = "secmaint_door_ext"; int_door_link_id = "secmaint_door_int"; ext_button_link_id = "secmaint_btn_ext"; - int_button_link_id = "secmaint_btn_int" + int_button_link_id = "secmaint_btn_int"; + req_access = list(13) }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; @@ -61776,26 +61763,26 @@ name = "East Bridge Blast Door Control"; pixel_x = 6; pixel_y = 2; - req_one_access_txt = "19" + req_access = list(19) }, /obj/machinery/door_control{ id = "bridge blast west"; name = "West Bridge Blast Door Control"; pixel_x = -6; - req_one_access_txt = "19"; - pixel_y = 2 + pixel_y = 2; + req_access = list(19) }, /obj/machinery/door_control{ id = "bridge blast south"; name = "South Bridge Blast Door Control"; pixel_y = -6; - req_one_access_txt = "19" + req_access = list(19) }, /obj/machinery/door_control{ id = "bridge blast north"; name = "North Bridge Blast Door Control"; pixel_y = 10; - req_one_access_txt = "19" + req_access = list(19) }, /turf/simulated/floor/plasteel{ dir = 4; @@ -63831,8 +63818,7 @@ /area/station/public/dorms) "jFf" = ( /obj/structure/closet/crate/secure{ - req_one_access = list(33,41); - req_one_access_txt = "33;41" + req_one_access = list(33,41) }, /obj/item/circuitboard/chem_dispenser, /obj/item/storage/pill_bottle/random_drug_bottle, @@ -64100,7 +64086,7 @@ id = "teleshutter"; name = "Teleporter Shutters Access Control"; pixel_x = 24; - req_one_access_txt = "62" + req_access = list(62) }, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, @@ -65287,7 +65273,7 @@ autolink_id = "engsm_btn_ext"; name = "Supermatter Access Button"; pixel_y = -24; - req_access_txt = "10" + req_access = list(10) }, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) @@ -66236,8 +66222,7 @@ /area/station/engineering/control) "kNx" = ( /obj/machinery/computer/prisoner{ - req_access = null; - req_one_access_txt = "2" + req_access = list(2) }, /turf/simulated/floor/plasteel{ dir = 10; @@ -66766,7 +66751,7 @@ id = "CE"; pixel_x = -8; pixel_y = 24; - req_access_txt = "56" + req_access = list(56) }, /turf/simulated/floor/plasteel{ dir = 5; @@ -67588,7 +67573,7 @@ name = "Atmospherics Lockdown"; pixel_x = 10; pixel_y = 24; - req_access_txt = "24" + req_access = list(24) }, /obj/machinery/door_control{ desc = "A remote control-switch for the engineering security doors."; @@ -67596,14 +67581,14 @@ name = "Engineering Lockdown"; pixel_x = -10; pixel_y = 24; - req_access_txt = "10" + req_access = list(10) }, /obj/machinery/door_control{ desc = "A remote control-switch for secure storage."; id = "Secure Storage"; name = "Engineering Secure Storage"; pixel_y = 24; - req_access_txt = "11" + req_access = list(11) }, /obj/structure/table/reinforced, /obj/machinery/photocopier/faxmachine{ @@ -67776,7 +67761,7 @@ autolink_id = "xeno_btn_ext"; name = "Xenobiology Access Button"; pixel_x = -24; - req_access_txt = "55" + req_access = list(55) }, /obj/effect/turf_decal/stripes, /obj/structure/disposalpipe/segment, @@ -68601,9 +68586,9 @@ /obj/machinery/button/windowtint{ pixel_x = 24; id = "qm"; - req_access_txt = "41"; dir = 8; - pixel_y = 5 + pixel_y = 5; + req_access = list(41) }, /obj/machinery/light_switch{ dir = 8; @@ -70981,7 +70966,7 @@ autolink_id = "eng_btn_ext"; pixel_x = -22; pixel_y = 20; - req_access_txt = "10;13" + req_access = list(10,13) }, /turf/space, /area/space/nearstation) @@ -71387,7 +71372,7 @@ autolink_id = "engsm_btn_ext"; name = "Supermatter Access Button"; pixel_y = 24; - req_access_txt = "10" + req_access = list(10) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -71800,7 +71785,7 @@ id = "xenobio3"; name = "Chamber 3 Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access = list(55) }, /turf/simulated/floor/plasteel, /area/station/science/xenobiology) @@ -71854,7 +71839,7 @@ id = "xenobio5"; name = "Chamber 5 Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access = list(55) }, /turf/simulated/floor/plasteel, /area/station/science/xenobiology) @@ -71908,6 +71893,16 @@ icon_state = "purple" }, /area/station/science/rnd) +"nGo" = ( +/obj/machinery/door_control{ + id = "qm_warehouse"; + name = "Warehouse Door Control"; + pixel_x = -1; + pixel_y = -24; + req_access = list(31) + }, +/turf/simulated/floor/plasteel, +/area/station/supply/warehouse) "nGC" = ( /obj/structure/disposalpipe/segment/corner, /obj/structure/cable{ @@ -72861,11 +72856,11 @@ name = "Incinerator Access Console"; pixel_x = -26; pixel_y = 6; - req_access_txt = "12"; ext_door_link_id = "incinerator_door_ext"; int_door_link_id = "incinerator_door_int"; ext_button_link_id = "incinerator_btn_ext"; - int_button_link_id = "incinerator_btn_int" + int_button_link_id = "incinerator_btn_int"; + req_access = list(12) }, /obj/machinery/ignition_switch{ id = "Incinerator"; @@ -73177,7 +73172,7 @@ autolink_id = "secmaint_btn_ext"; pixel_x = -25; pixel_y = -25; - req_access_txt = "13" + req_access = list(13) }, /obj/structure/lattice/catwalk, /turf/space, @@ -75972,8 +75967,8 @@ /obj/machinery/access_button{ autolink_id = "perma_btn_int"; name = "Prison Wing Access Button"; - req_access_txt = "2"; - pixel_y = -21 + pixel_y = -21; + req_access = list(2) }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -76209,7 +76204,7 @@ autolink_id = "atmossm_btn_int"; name = "Atmospherics Access Button"; pixel_y = -24; - req_access_txt = "24" + req_access = list(24) }, /obj/machinery/door/airlock/atmos/glass{ autoclose = 0; @@ -76674,7 +76669,7 @@ control_area = "\improper AI Upload Chamber"; name = "AI Upload Turret Control"; pixel_x = -28; - req_access_txt = "75" + req_access = list(75) }, /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -77316,8 +77311,8 @@ layer = 3.6; autolink_id = "viro_btn_ext"; name = "Virology Lab Access Button"; - req_access_txt = "39"; - pixel_y = -24 + pixel_y = -24; + req_access = list(39) }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -77931,7 +77926,7 @@ name = "interior access button"; pixel_x = 9; pixel_y = -25; - req_access_txt = "13" + req_access = list(13) }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 @@ -78401,7 +78396,7 @@ name = "Prison Wing Lockdown"; pixel_x = -32; pixel_y = 22; - req_access_txt = "2" + req_access = list(2) }, /obj/structure/cable{ d1 = 4; @@ -78830,8 +78825,8 @@ /obj/machinery/access_button{ autolink_id = "perma_btn_int"; name = "Prison Wing Access Button"; - req_access_txt = "2"; - pixel_y = 21 + pixel_y = 21; + req_access = list(2) }, /turf/simulated/floor/plasteel{ dir = 1; @@ -80657,7 +80652,7 @@ name = "Office Door"; normaldoorcontrol = 1; pixel_y = -3; - req_one_access_txt = "20" + req_access = list(20) }, /turf/simulated/floor/carpet/royalblue, /area/station/command/office/captain) @@ -80940,7 +80935,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = -24; - req_access_txt = "32" + req_access = list(32) }, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/engine, @@ -81791,8 +81786,7 @@ /area/station/supply/storage) "snE" = ( /obj/structure/closet/crate/secure{ - req_one_access = list(33,41); - req_one_access_txt = "33;41" + req_one_access = list(33,41) }, /obj/effect/spawner/random/maintenance, /mob/living/simple_animal/hostile/scarybat, @@ -84625,7 +84619,7 @@ name = "Xenobiology Access Button"; pixel_x = 8; pixel_y = 28; - req_access_txt = "55" + req_access = list(55) }, /obj/effect/turf_decal/stripes, /obj/structure/disposalpipe/segment{ @@ -86328,8 +86322,8 @@ /obj/machinery/access_button{ autolink_id = "perma_btn_ext"; name = "Prison Wing Access Button"; - req_access_txt = "2"; - pixel_y = -21 + pixel_y = -21; + req_access = list(2) }, /obj/machinery/door/poddoor/preopen{ id_tag = "Prison Gate"; @@ -86646,14 +86640,14 @@ name = "Queue Privacy Shutters Control"; pixel_x = 6; pixel_y = 25; - req_one_access_txt = "57" + req_access = list(57) }, /obj/machinery/door_control{ id = "hop"; name = "Privacy Shutters Control"; pixel_x = -6; pixel_y = 25; - req_one_access_txt = "57" + req_access = list(57) }, /obj/machinery/flasher_button{ id = "hopflash"; @@ -86929,8 +86923,8 @@ /obj/machinery/door_control{ id = "janitor"; name = "Janitor Shutters Door Control"; - req_access_txt = "26"; - pixel_x = 24 + pixel_x = 24; + req_access = list(26) }, /turf/simulated/floor/plasteel, /area/station/service/janitor) @@ -90834,11 +90828,11 @@ /obj/machinery/airlock_controller/access_controller{ name = "Virology Lab Access Console"; pixel_y = 24; - req_one_access_txt = "39"; ext_door_link_id = "viro_door_ext"; int_door_link_id = "viro_door_int"; ext_button_link_id = "viro_btn_ext"; - int_button_link_id = "viro_btn_int" + int_button_link_id = "viro_btn_int"; + req_access = list(39) }, /turf/simulated/floor/plasteel{ dir = 1; @@ -115021,7 +115015,7 @@ bEB bGY bIz cCh -bFp +nGo qsc bMi bKz diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index d060c61f12f..7839b3054f8 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -1309,15 +1309,15 @@ id = "ailockdown"; name = "AI Asteroid Lockdown"; pixel_y = 32; - req_access_txt = "56"; - pixel_x = -5 + pixel_x = -5; + req_access = list(56) }, /obj/machinery/door_control{ id = "aisat"; name = "AI Core Lockdown"; pixel_y = 32; - req_access_txt = "56"; - pixel_x = 5 + pixel_x = 5; + req_access = list(56) }, /turf/simulated/floor/plasteel{ icon_state = "bcircuit" @@ -1378,7 +1378,7 @@ check_synth = 1; name = "AI Chamber Turret Control"; pixel_y = 28; - req_access_txt = "75" + req_access = list(75) }, /obj/machinery/requests_console/directional/south, /turf/simulated/floor/plasteel{ @@ -3849,7 +3849,7 @@ name = "AI Asteroid Teleport Shutters Control"; pixel_x = 25; pixel_y = 25; - req_one_access_txt = "17;75" + req_one_access = list(17,75) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -4940,7 +4940,7 @@ id = "bridge_lower"; name = "Lower Bridge Lockdown"; pixel_y = 24; - req_one_access_txt = "19;14" + req_one_access = list(19,14) }, /obj/structure/cable/orange{ d1 = 4; @@ -4951,7 +4951,7 @@ id = "bridge_upper"; name = "Upper Bridge Lockdown"; pixel_y = 32; - req_one_access_txt = "19;14" + req_one_access = list(19,14) }, /turf/simulated/floor/carpet/black, /area/station/command/bridge) @@ -5404,9 +5404,7 @@ /area/station/maintenance/fore2) "aLe" = ( /obj/machinery/computer/prisoner{ - dir = 4; - req_access = null; - req_access_txt = "2" + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -6712,9 +6710,7 @@ /area/station/maintenance/fore) "aTR" = ( /obj/machinery/computer/prisoner{ - dir = 4; - req_access = null; - req_access_txt = "2" + dir = 4 }, /turf/simulated/floor/carpet, /area/station/legal/magistrate) @@ -6850,6 +6846,12 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/disposal/east) +"aUB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "darkgreenfull" + }, +/area/station/service/hydroponics) "aUE" = ( /obj/machinery/light{ dir = 8 @@ -7093,10 +7095,7 @@ }, /area/station/hallway/primary/fore/west) "aWm" = ( -/obj/machinery/computer/prisoner{ - req_access = null; - req_access_txt = "2" - }, +/obj/machinery/computer/prisoner, /turf/simulated/floor/plasteel, /area/station/security/prisonershuttle) "aWo" = ( @@ -9711,7 +9710,7 @@ name = "Medical Asteroid Lockdown"; pixel_x = 10; pixel_y = 39; - req_access_txt = "40" + req_access = list(40) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -12621,8 +12620,8 @@ /obj/machinery/access_button{ autolink_id = "viro_btn_int"; name = "Virology Lab Access Button"; - req_access_txt = "39"; - pixel_y = -24 + pixel_y = -24; + req_access = list(39) }, /turf/simulated/floor/plasteel{ icon_state = "whitegreenfull" @@ -13459,8 +13458,7 @@ name = "Command EVA shutter control"; pixel_x = 25; pixel_y = 24; - req_access_txt = null; - req_one_access_txt = "19;41" + req_one_access = list(19,41) }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -13815,7 +13813,7 @@ autolink_id = "engsm_btn_int"; name = "Supermatter Access Button"; pixel_y = 24; - req_access_txt = "10" + req_access = list(10) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -14245,7 +14243,7 @@ autolink_id = "engsm_btn_ext"; name = "Supermatter Access Button"; pixel_y = -24; - req_access_txt = "10" + req_access = list(10) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -14864,7 +14862,7 @@ autolink_id = "engsm_btn_ext"; name = "Supermatter Access Button"; pixel_y = 24; - req_access_txt = "10" + req_access = list(10) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -15104,7 +15102,7 @@ name = "Secure Armory Shutter Control"; pixel_x = 12; pixel_y = 28; - req_access_txt = "3" + req_access = list(3) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -15606,21 +15604,21 @@ id = "engiestoragesmes"; name = "Secure Storage Blast Door Control"; pixel_x = -24; - req_access_txt = "10;11" + req_access = list(10,11) }, /obj/machinery/door_control{ id = "engineeringlockdown"; name = "Engineering Emergency Lockdown Control"; pixel_x = -24; pixel_y = 8; - req_access_txt = "10;11" + req_access = list(10,11) }, /obj/machinery/door_control{ id = "ceoffice"; name = "Office Emergency Lockdown"; pixel_x = -24; pixel_y = -8; - req_access_txt = "10;11" + req_access = list(10,11) }, /obj/structure/cable{ d2 = 4; @@ -20406,14 +20404,14 @@ name = "Prison Wing Lockdown"; pixel_x = -7; pixel_y = -28; - req_access_txt = "2" + req_access = list(2) }, /obj/machinery/door_control{ id = "Secure Gate"; name = "Brig Lockdown"; pixel_x = 3; pixel_y = -28; - req_access_txt = "2" + req_access = list(2) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -21301,7 +21299,7 @@ name = "Arrivals EVA shutter control"; pixel_x = 25; pixel_y = 6; - req_one_access_txt = "19;41" + req_one_access = list(19,41) }, /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -24056,7 +24054,7 @@ id = "servlockdown"; name = "Service Asteroid Lockdown"; pixel_y = 32; - req_access_txt = "57" + req_access = list(57) }, /obj/machinery/computer/guestpass/hop{ pixel_x = 28 @@ -25021,13 +25019,13 @@ name = "Desk Shutters"; pixel_x = 24; pixel_y = 8; - req_access_txt = "57" + req_access = list(57) }, /obj/machinery/door_control{ id = "hopexternal"; name = "External Lockdown"; pixel_x = 24; - req_access_txt = "57" + req_access = list(57) }, /obj/machinery/door_control/ticket_machine_button{ pixel_x = 24; @@ -25938,14 +25936,14 @@ name = "Auxiliary Vent Control"; pixel_x = 6; pixel_y = -24; - req_access_txt = "32" + req_access = list(32) }, /obj/machinery/door_control{ id = "turbinevent"; name = "Turbine Vent Control"; pixel_x = -6; pixel_y = -24; - req_access_txt = "32" + req_access = list(32) }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/meter, @@ -25980,11 +25978,11 @@ name = "Turbine Access Console"; pixel_x = 6; pixel_y = -26; - req_access_txt = "12"; ext_door_link_id = "turbine_door_ext"; int_door_link_id = "turbine_door_int"; ext_button_link_id = "turbine_btn_ext"; - int_button_link_id = "turbine_btn_int" + int_button_link_id = "turbine_btn_int"; + req_access = list(12) }, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) @@ -26291,7 +26289,7 @@ name = "Civilian EVA shutter control"; pixel_x = 25; pixel_y = 24; - req_one_access_txt = "19;41" + req_one_access = list(19,41) }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -26889,6 +26887,11 @@ icon_state = "redcorner" }, /area/station/security/prison/cell_block/A) +"dcR" = ( +/obj/structure/table, +/obj/effect/spawner/random/maintenance, +/turf/simulated/floor/plating/asteroid/ancient, +/area/station/maintenance/port) "dda" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -27555,7 +27558,7 @@ control_area = "\improper AI Satellite Secondary Antechamber"; name = "AI Satellite Secondary Antechamber Turret Control"; pixel_y = 32; - req_access_txt = "75" + req_access = list(75) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -28022,17 +28025,6 @@ /obj/machinery/ai_status_display, /turf/simulated/wall/r_wall, /area/station/security/prisonlockers) -"dkb" = ( -/obj/machinery/requests_console/directional/south, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/station/security/detective) "dkc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -30893,8 +30885,8 @@ layer = 3.6; autolink_id = "viro_btn_ext"; name = "Virology Lab Access Button"; - req_access_txt = "39"; - pixel_y = -24 + pixel_y = -24; + req_access = list(39) }, /turf/simulated/floor/plasteel{ icon_state = "whitegreenfull" @@ -32488,7 +32480,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/morgue{ name = "Private Study"; - req_access_txt = "37" + req_access = list(37) }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -33220,7 +33212,7 @@ name = "Garage Door Control"; pixel_x = 24; pixel_y = 1; - req_access_txt = "66" + req_access = list(66) }, /obj/structure/sink{ dir = 4; @@ -33752,23 +33744,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/simulated/floor/plating, /area/station/maintenance/starboard) -"enw" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/window/classic/normal{ - name = "Kitchen"; - dir = 1 - }, -/obj/machinery/door/window/classic/normal, -/obj/effect/mapping_helpers/airlock/windoor/autoname, -/obj/effect/mapping_helpers/airlock/windoor/access/any/service/hydroponics, -/obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen{ - dir = 1 - }, -/obj/machinery/smartfridge/food/chef, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/service/kitchen) "enx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -35900,6 +35875,12 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/port) +"eTe" = ( +/obj/machinery/hologram/holopad, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/service/hydroponics) "eTg" = ( /obj/machinery/recharge_station, /turf/simulated/floor/plasteel{ @@ -35946,8 +35927,7 @@ /turf/simulated/floor/grass, /area/station/hallway/spacebridge/scidock) "eTI" = ( -/obj/structure/table, -/obj/effect/spawner/random/maintenance, +/obj/effect/decal/cleanable/blood/splatter, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/port) "eTJ" = ( @@ -37620,13 +37600,6 @@ }, /turf/simulated/floor/plating, /area/station/hallway/primary/central/west) -"fvV" = ( -/obj/structure/chair/office/dark{ - dir = 4 - }, -/obj/effect/landmark/start/detective, -/turf/simulated/floor/carpet, -/area/station/security/detective) "fwd" = ( /obj/effect/decal/cleanable/crayon, /turf/simulated/floor/wood, @@ -38652,6 +38625,23 @@ icon_state = "bluecorner" }, /area/station/hallway/primary/starboard/south) +"fOh" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/window/classic/normal{ + name = "Kitchen"; + dir = 1 + }, +/obj/machinery/door/window/classic/normal, +/obj/effect/mapping_helpers/airlock/windoor/autoname, +/obj/effect/mapping_helpers/airlock/windoor/access/any/service/hydroponics, +/obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen{ + dir = 1 + }, +/obj/machinery/smartfridge/food/chef, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/service/kitchen) "fOi" = ( /obj/machinery/light/small{ dir = 4 @@ -38747,12 +38737,6 @@ icon_state = "dark" }, /area/station/engineering/control) -"fPD" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/plating{ - icon_state = "asteroidplating" - }, -/area/station/maintenance/port) "fPE" = ( /obj/structure/disposalpipe/segment/corner{ dir = 4 @@ -41261,6 +41245,25 @@ icon_state = "whitepurple" }, /area/station/science/genetics) +"gEI" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Walkway" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id_tag = "servlockdown"; + layer = 2.6; + name = "Service Lockdown" + }, +/obj/structure/disposalpipe/segment{ + color = "#954535" + }, +/obj/effect/turf_decal/caution/red, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" + }, +/area/station/hallway/spacebridge/sercom) "gEJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -41939,8 +41942,8 @@ /obj/machinery/door_control{ id = "qm_warehouse"; name = "Warehouse Door Control"; - req_access_txt = "31"; - pixel_x = 24 + pixel_x = 24; + req_access = list(31) }, /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -43786,6 +43789,7 @@ /area/station/service/bar) "htz" = ( /obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ icon_state = "darkgreenfull" }, @@ -45672,7 +45676,7 @@ autolink_id = "atmossm_btn_ext"; name = "Atmospherics Access Button"; pixel_y = -24; - req_access_txt = "24" + req_access = list(24) }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -47237,13 +47241,6 @@ icon_state = "browncorner" }, /area/station/hallway/primary/fore/east) -"inP" = ( -/obj/structure/rack, -/obj/effect/spawner/random/maintenance, -/turf/simulated/floor/plating{ - icon_state = "asteroidplating" - }, -/area/station/maintenance/port) "inQ" = ( /obj/machinery/door/airlock/maintenance{ name = "Port Asteroid Maintenance" @@ -49450,7 +49447,7 @@ id = "mixvent"; name = "Mixing Room Vent Control"; pixel_x = -24; - req_access_txt = "7" + req_access = list(7) }, /obj/machinery/atmospherics/unary/portables_connector{ dir = 8 @@ -50462,21 +50459,6 @@ icon_state = "dark" }, /area/station/hallway/primary/starboard/south) -"jeu" = ( -/obj/machinery/hologram/holopad, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/station/service/hydroponics) "jeB" = ( /obj/structure/transit_tube/station/reverse/flipped{ dir = 4 @@ -51141,22 +51123,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/security/lobby) -"joS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/station/service/hydroponics) "joZ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -52226,7 +52192,7 @@ name = "Science Asteroid Lockdown"; pixel_x = -24; pixel_y = -5; - req_access_txt = "30" + req_access = list(30) }, /obj/structure/table, /obj/item/book/manual/wiki/sop_science{ @@ -52297,7 +52263,7 @@ name = "AI Sat EVA shutter control"; pixel_x = 24; pixel_y = 25; - req_one_access_txt = "19;41" + req_one_access = list(19,41) }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -52679,7 +52645,7 @@ normaldoorcontrol = 1; pixel_x = 6; pixel_y = -24; - req_access_txt = "67" + req_access = list(67) }, /obj/machinery/button/windowtint{ dir = 1; @@ -55799,6 +55765,15 @@ /area/station/medical/medbay) "kAT" = ( /obj/machinery/hologram/holopad, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -56701,7 +56676,7 @@ normaldoorcontrol = 1; pixel_x = 6; pixel_y = -24; - req_access_txt = "73" + req_access = list(73) }, /obj/machinery/button/windowtint{ dir = 1; @@ -57640,7 +57615,7 @@ name = "Garage Door Control"; pixel_x = -24; pixel_y = 1; - req_access_txt = "66" + req_access = list(66) }, /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -57760,6 +57735,12 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/port) +"lhc" = ( +/obj/effect/spawner/random_spawners/dirt_often, +/turf/simulated/floor/plasteel{ + icon_state = "darkgreenfull" + }, +/area/station/service/hydroponics) "lhf" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable/orange{ @@ -57993,10 +57974,6 @@ }, /turf/simulated/floor/plasteel/freezer, /area/station/service/kitchen) -"ljz" = ( -/obj/effect/decal/cleanable/blood/splatter, -/turf/simulated/floor/plating/asteroid/ancient, -/area/station/maintenance/port) "ljL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -61297,12 +61274,11 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "mgq" = ( -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel{ - icon_state = "darkgreenfull" +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating" }, -/area/station/service/hydroponics) +/area/station/maintenance/port) "mgu" = ( /obj/docking_port/stationary{ dir = 4; @@ -61788,7 +61764,7 @@ name = "Dispossal Vent Control"; pixel_x = 24; pixel_y = 8; - req_access_txt = "12" + req_access = list(12) }, /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plating, @@ -64317,9 +64293,7 @@ /turf/simulated/floor/plating, /area/station/security/prison/cell_block/A) "mYT" = ( -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, +/obj/structure/closet/secure_closet/bar, /obj/item/radio/intercom{ name = "north bump"; pixel_y = 28 @@ -65159,9 +65133,9 @@ /obj/machinery/button/windowtint{ id = "Courtroom"; pixel_x = -24; - req_one_access_txt = "74;3"; dir = 4; - pixel_y = -8 + pixel_y = -8; + req_one_access = list(74,3) }, /turf/simulated/floor/carpet, /area/station/legal/courtroom) @@ -65385,8 +65359,16 @@ /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "nsy" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -66348,8 +66330,8 @@ /obj/machinery/button/windowtint{ id = "Detective"; pixel_x = -24; - req_access_txt = "4"; - dir = 4 + dir = 4; + req_access = list(4) }, /turf/simulated/floor/carpet, /area/station/security/detective) @@ -68114,8 +68096,8 @@ /obj/machinery/door_control{ id = "engiestoragesmes"; name = "Secure Storage Blast Door Control"; - req_access_txt = "56"; - pixel_x = -24 + pixel_x = -24; + req_access = list(56) }, /turf/simulated/floor/plating, /area/station/engineering/smes) @@ -68399,7 +68381,7 @@ name = "Science EVA shutter control"; pixel_x = -25; pixel_y = 24; - req_one_access_txt = "19;41" + req_one_access = list(19,41) }, /obj/structure/sign/directions/security{ dir = 1; @@ -69040,11 +69022,11 @@ name = "Mixing Room Access Console"; pixel_x = -26; pixel_y = 6; - req_access_txt = "12"; ext_door_link_id = "incinerator_door_ext"; int_door_link_id = "incinerator_door_int"; ext_button_link_id = "incinerator_btn_ext"; - int_button_link_id = "incinerator_btn_int" + int_button_link_id = "incinerator_btn_int"; + req_access = list(12) }, /obj/machinery/ignition_switch{ id = "Incinerator"; @@ -72450,8 +72432,8 @@ /obj/machinery/door_control{ id = "RoboticsShutters"; name = "Robotics Privacy Shutters"; - req_access_txt = "29"; - pixel_y = -24 + pixel_y = -24; + req_access = list(29) }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -73796,7 +73778,7 @@ name = "Prison Wing Lockdown"; pixel_x = 1; pixel_y = -28; - req_access_txt = "2" + req_access = list(2) }, /obj/machinery/door_control{ id = "hosofficedoor"; @@ -73804,14 +73786,14 @@ normaldoorcontrol = 1; pixel_x = 11; pixel_y = -28; - req_access_txt = "58" + req_access = list(58) }, /obj/machinery/door_control{ id = "Secure Gate"; name = "Brig Lockdown"; pixel_x = -9; pixel_y = -28; - req_access_txt = "2" + req_access = list(2) }, /obj/structure/disposalpipe/trunk{ dir = 1 @@ -76343,7 +76325,7 @@ id = "teleshutter"; name = "Teleporter Shutters Access Control"; pixel_y = -24; - req_access_txt = "62" + req_access = list(62) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -80182,8 +80164,8 @@ /obj/machinery/door_control{ id = "qm_warehouse"; name = "Warehouse Door Control"; - req_access_txt = "31"; - pixel_x = -24 + pixel_x = -24; + req_access = list(31) }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ @@ -81345,7 +81327,7 @@ id = "MechbayShutters2"; name = "Mechbay Shutters"; pixel_y = 24; - req_access_txt = "29" + req_access = list(29) }, /obj/machinery/door/poddoor/shutters{ dir = 8; @@ -81423,7 +81405,7 @@ name = "Chemistry Shutter Control"; pixel_x = 24; pixel_y = 22; - req_access_txt = "33" + req_access = list(33) }, /turf/simulated/floor/plasteel{ dir = 1; @@ -84169,7 +84151,7 @@ name = "AI Asteroid Teleport Shutters Control"; pixel_x = -25; pixel_y = 25; - req_one_access_txt = "17;75" + req_one_access = list(17,75) }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ @@ -84469,6 +84451,14 @@ icon_state = "asteroidplating" }, /area/station/maintenance/port) +"sNb" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/service/hydroponics) "sNm" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line{ @@ -84484,7 +84474,7 @@ id = "RnDShutters"; name = "Research Privacy Shutters"; pixel_y = 24; - req_access_txt = "47" + req_access = list(47) }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -85380,9 +85370,7 @@ /area/station/maintenance/fpmaint) "sZS" = ( /obj/machinery/computer/prisoner{ - dir = 1; - req_access = null; - req_access_txt = "2" + dir = 1 }, /obj/machinery/light_switch{ dir = 1; @@ -85395,7 +85383,7 @@ name = "Prison Wing Lockdown"; pixel_x = -9; pixel_y = -24; - req_access_txt = "2" + req_access = list(2) }, /turf/simulated/floor/plasteel{ dir = 4; @@ -87993,12 +87981,6 @@ /obj/effect/spawner/airlock/s_to_n, /turf/simulated/wall, /area/station/hallway/primary/central/north) -"tMD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "darkgreenfull" - }, -/area/station/service/hydroponics) "tMN" = ( /obj/machinery/door/airlock/external{ id_tag = "laborcamp_home"; @@ -88548,41 +88530,41 @@ id = "ailockdown"; name = "AI Asteroid Lockdown"; pixel_y = 40; - req_access_txt = "56" + req_access = list(56) }, /obj/machinery/door_control{ id = "servlockdown"; name = "Service Lockdown"; pixel_x = -10; pixel_y = 32; - req_access_txt = "57" + req_access = list(57) }, /obj/machinery/door_control{ id = "medlockdown"; name = "Medical Lockdown"; pixel_x = 10; pixel_y = 32; - req_access_txt = "40" + req_access = list(40) }, /obj/machinery/door_control{ id = "cargolockdown"; name = "Cargo Lockdown"; pixel_x = 10; pixel_y = 40; - req_access_txt = "41" + req_access = list(41) }, /obj/machinery/door_control{ id = "scilockdown"; name = "Science Lockdown"; pixel_x = -10; pixel_y = 24; - req_access_txt = "30" + req_access = list(30) }, /obj/machinery/door_control{ id = "engilockdown"; name = "Engineering Lockdown"; pixel_y = 32; - req_access_txt = "56" + req_access = list(56) }, /turf/simulated/floor/carpet/black, /area/station/command/bridge) @@ -89337,7 +89319,7 @@ name = "Cargo EVA shutter control"; pixel_x = -25; pixel_y = 24; - req_one_access_txt = "19;41" + req_one_access = list(19,41) }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -89421,7 +89403,7 @@ id = "engilockdown"; name = "Engineering Lockdown"; pixel_y = 24; - req_access_txt = "56" + req_access = list(56) }, /obj/machinery/photocopier/faxmachine{ department = "Chief Engineer's Office" @@ -89595,12 +89577,12 @@ }, /obj/machinery/airlock_controller/access_controller{ name = "Virology Lab Access Console"; - req_one_access_txt = "39"; ext_door_link_id = "viro_door_ext"; int_door_link_id = "viro_door_int"; ext_button_link_id = "viro_btn_ext"; int_button_link_id = "viro_btn_int"; - pixel_x = -24 + pixel_x = -24; + req_access = list(39) }, /turf/simulated/floor/plasteel{ dir = 8; @@ -92010,7 +91992,7 @@ /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "uQB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "darkgreenfull" }, @@ -99096,7 +99078,7 @@ id = "bridge"; dir = 1; pixel_y = 7; - req_one_access_txt = "19;41" + req_one_access = list(19,41) }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -100412,7 +100394,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = 24; - req_access_txt = "10" + req_access = list(10) }, /obj/machinery/camera{ c_tag = "SM South"; @@ -101439,8 +101421,7 @@ /area/station/hallway/spacebridge/dockmed) "xwQ" = ( /obj/structure/closet/crate/secure{ - req_one_access = list(33,41); - req_one_access_txt = "33;41" + req_one_access = list(33,41) }, /obj/item/circuitboard/chem_dispenser, /obj/item/storage/pill_bottle/random_drug_bottle, @@ -101968,25 +101949,13 @@ icon_state = "dark" }, /area/station/engineering/control) -"xCu" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Walkway" +"xCH" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating" }, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id_tag = "servlockdown"; - layer = 2.6; - name = "Service Lockdown" - }, -/obj/structure/disposalpipe/segment{ - color = "#954535" - }, -/obj/effect/turf_decal/caution/red, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/station/hallway/spacebridge/sercom) +/area/station/maintenance/port) "xCR" = ( /obj/machinery/computer/security/telescreen/entertainment, /turf/simulated/mineral/ancient, @@ -102292,7 +102261,7 @@ autolink_id = "atmossm_btn_int"; name = "Atmospherics Access Button"; pixel_y = -24; - req_access_txt = "24" + req_access = list(24) }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -102363,6 +102332,13 @@ /obj/machinery/light/small, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/port) +"xHt" = ( +/obj/structure/chair/office/dark{ + dir = 4 + }, +/obj/effect/landmark/start/detective, +/turf/simulated/floor/carpet, +/area/station/security/detective) "xHF" = ( /obj/structure/cable/orange{ d1 = 4; @@ -103188,6 +103164,17 @@ icon_state = "whitepurple" }, /area/station/maintenance/apmaint) +"xTG" = ( +/obj/machinery/requests_console/directional/south, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/station/security/detective) "xTL" = ( /turf/simulated/floor/plasteel{ icon_state = "white" @@ -104146,8 +104133,8 @@ /obj/machinery/door_control{ id = "medeva"; name = "Medical EVA shutter control"; - req_one_access_txt = "19;41"; - pixel_y = 24 + pixel_y = 24; + req_one_access = list(19,41) }, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plating, @@ -104530,7 +104517,7 @@ id = "MechbayShutters"; name = "Mechbay Shutters"; pixel_x = 25; - req_access_txt = "29" + req_access = list(29) }, /obj/machinery/door/poddoor/shutters{ dir = 2; @@ -113239,7 +113226,7 @@ rho uSf ygl wzC -fPD +mgq aXn aXn aXn @@ -113496,7 +113483,7 @@ aXn wGX ygl wzC -inP +xCH aXn aXn aXn @@ -114532,7 +114519,7 @@ eHn ohJ gUw xZV -ljz +eTI iuf mkL aXn @@ -115049,7 +115036,7 @@ aXn aXn dLa hwS -ljz +eTI kad uCK aXn @@ -116031,7 +116018,7 @@ eHu aXn aXn aXn -inP +xCH eCI ltk wzC @@ -117820,7 +117807,7 @@ uCK aXn aXn hvI -eTI +dcR pAV pXy dHZ @@ -119867,7 +119854,7 @@ aXn aXn eCI pDl -inP +xCH aXn aXn ock @@ -120101,8 +120088,8 @@ chV evL qwd pPN -fvV -dkb +xHt +xTG emw abW nxA @@ -122740,7 +122727,7 @@ btd btd uql cBs -joS +nsy cBs cBs biB @@ -122943,7 +122930,7 @@ bpf pbY pbY pbY -xCu +gEI abT jSU grv @@ -122997,9 +122984,9 @@ cuk prN mcu pcu -jeu +kAT jKU -nsy +sNb biB hqe btd @@ -123506,7 +123493,7 @@ mrt mrt mrt mrt -enw +fOh prN biB cBs @@ -123774,7 +123761,7 @@ biB biB xNP biB -kAT +eTe kDy biB etV @@ -124548,7 +124535,7 @@ lJR lJR btd pNE -mgq +htz btd cEM eQC @@ -125309,11 +125296,11 @@ muv lYO riS mcu -uQB -uQB -uQB +aUB +aUB +aUB hpP -tMD +uQB haI lUc xAS @@ -125566,7 +125553,7 @@ baF jUW fPp cxx -htz +lhc xnz wFD rxy diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index bc2adc3fdae..5da569fb327 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -6343,17 +6343,6 @@ icon_state = "brown" }, /area/station/supply/warehouse) -"azF" = ( -/obj/machinery/door_control{ - id = "qm_warehouse"; - name = "Warehouse Door Control"; - pixel_x = 24; - pixel_y = -3; - req_access_txt = "31" - }, -/obj/effect/decal/cleanable/cobweb2, -/turf/simulated/floor/plating, -/area/station/supply/warehouse) "azG" = ( /obj/structure/table, /obj/item/stack/packageWrap, @@ -6363,7 +6352,7 @@ name = "Warehouse Door Control"; pixel_x = -24; pixel_y = -3; - req_access_txt = "31" + req_access = list(31) }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ @@ -9905,7 +9894,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = 24; - req_access_txt = "24" + req_access = list(24) }, /obj/structure/cable/yellow{ d1 = 4; @@ -12232,7 +12221,7 @@ id = "janitorshutters"; name = "Janitor Shutters Control"; pixel_x = 25; - req_access_txt = "26" + req_access = list(26) }, /turf/simulated/floor/plasteel{ dir = 4; @@ -16243,7 +16232,7 @@ id = "cell1lockdown"; name = "Cell Lockdown"; pixel_y = 32; - req_access_txt = "2" + req_access = list(2) }, /obj/machinery/flasher_button{ id = "Cell 1"; @@ -16284,7 +16273,7 @@ id = "cell2lockdown"; name = "Cell Lockdown"; pixel_y = 32; - req_access_txt = "2" + req_access = list(2) }, /turf/simulated/floor/plasteel{ icon_state = "darkredcorners" @@ -23147,7 +23136,7 @@ id = "bridge blast north"; name = "North Bridge Blast Door Control"; pixel_y = 32; - req_access_txt = "19" + req_access = list(19) }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) @@ -24371,14 +24360,14 @@ name = "Prison Wing Lockdown"; pixel_x = -7; pixel_y = -28; - req_access_txt = "2" + req_access = list(2) }, /obj/machinery/door_control{ id = "Secure Gate"; name = "Brig Lockdown"; pixel_x = 3; pixel_y = -28; - req_access_txt = "2" + req_access = list(2) }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -25716,7 +25705,7 @@ id = "bridge blast east"; name = "East Bridge Blast Door Control"; pixel_x = 26; - req_access_txt = "19" + req_access = list(19) }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) @@ -26904,7 +26893,7 @@ name = "West Bridge Blast Door Control"; pixel_x = null; pixel_y = 24; - req_access_txt = "19" + req_access = list(19) }, /obj/structure/cable{ d1 = 4; @@ -27104,7 +27093,7 @@ name = "East Bridge Blast Door Control"; pixel_x = null; pixel_y = 24; - req_access_txt = "19" + req_access = list(19) }, /obj/item/kirbyplants, /obj/structure/cable{ @@ -29284,7 +29273,7 @@ control_area = "\improper AI Upload Chamber"; name = "AI Upload Turret Control"; pixel_y = -24; - req_one_access_txt = "75" + req_access = list(75) }, /turf/simulated/floor/carpet, /area/station/command/bridge) @@ -29294,14 +29283,14 @@ name = "Expedition Shutters Access Control"; pixel_x = 7; pixel_y = -26; - req_access_txt = "62" + req_access = list(62) }, /obj/machinery/door_control{ id = "eva-shutters"; name = "Auxilary E.V.A. Storage"; pixel_x = -7; pixel_y = -26; - req_one_access_txt = "18" + req_access = list(18) }, /obj/machinery/keycard_auth{ pixel_y = -38 @@ -30343,7 +30332,7 @@ id = "transitlock"; name = "Transit Tube Lockdown Control"; pixel_y = 24; - req_access_txt = "11" + req_access = list(11) }, /turf/simulated/floor/plasteel{ dir = 8; @@ -30563,7 +30552,7 @@ name = "Privacy Shutters"; pixel_x = 5; pixel_y = -4; - req_one_access_txt = "18" + req_access = list(18) }, /obj/structure/cable{ d1 = 2; @@ -32628,7 +32617,7 @@ name = "Office Door"; normaldoorcontrol = 1; pixel_x = -5; - req_access_txt = "56" + req_access = list(56) }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -34591,7 +34580,7 @@ control_area = "\improper AI Satellite"; name = "AI Antechamber Turret Control"; pixel_x = -28; - req_access_txt = "75" + req_access = list(75) }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ @@ -34896,14 +34885,14 @@ name = "Engineering Secure Storage Control"; pixel_x = -38; pixel_y = 8; - req_access_txt = "11" + req_access = list(11) }, /obj/machinery/door_control{ id = "transitlock"; name = "Transit Tube Lockdown Control"; pixel_x = -38; pixel_y = -8; - req_access_txt = "11" + req_access = list(11) }, /obj/machinery/computer/security/engineering{ dir = 4 @@ -34914,7 +34903,7 @@ pixel_x = -24; pixel_y = 9; range = 12; - req_access_txt = "56" + req_access = list(56) }, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) @@ -36409,8 +36398,7 @@ /area/station/legal/lawoffice) "caM" = ( /obj/machinery/computer/prisoner{ - req_access = null; - req_access_txt = "2" + req_access = list(2) }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -36476,13 +36464,13 @@ name = "Privacy Shutters"; pixel_x = -24; pixel_y = -8; - req_one_access_txt = "18" + req_access = list(18) }, /obj/machinery/door_control{ id = "hopqueueshutters"; name = "Queue Shutters"; pixel_x = -24; - req_one_access_txt = "18" + req_access = list(18) }, /obj/machinery/door_control/ticket_machine_button{ pixel_x = -24; @@ -36941,7 +36929,7 @@ normaldoorcontrol = 1; pixel_x = -24; pixel_y = -8; - req_access_txt = "73" + req_access = list(73) }, /obj/machinery/light_switch{ dir = 4; @@ -37033,7 +37021,7 @@ normaldoorcontrol = 1; pixel_x = 24; pixel_y = -24; - req_access_txt = "67" + req_access = list(67) }, /turf/simulated/floor/wood, /area/station/command/office/blueshield) @@ -38413,7 +38401,7 @@ /obj/machinery/button/windowtint{ id = "Courtroom"; pixel_x = -8; - req_one_access_txt = "74;3" + req_one_access = list(74,3) }, /obj/structure/cable{ d1 = 1; @@ -38472,7 +38460,7 @@ normaldoorcontrol = 1; pixel_x = 6; pixel_y = -25; - req_access_txt = "74" + req_access = list(74) }, /turf/simulated/floor/carpet, /area/station/legal/magistrate) @@ -38761,7 +38749,7 @@ name = "Office Door"; normaldoorcontrol = 1; pixel_x = -8; - req_access_txt = "57" + req_access = list(57) }, /turf/simulated/floor/carpet, /area/station/command/office/hop) @@ -38808,7 +38796,7 @@ id = "BS"; pixel_x = -24; pixel_y = -8; - req_access_txt = "67" + req_access = list(67) }, /turf/simulated/floor/wood, /area/station/command/office/blueshield) @@ -39927,7 +39915,7 @@ id = "teleaccessshutter"; name = "Teleporter Shutters Access Control"; pixel_y = 24; - req_access_txt = "17" + req_access = list(17) }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -41447,7 +41435,7 @@ id = "teleportershutter"; name = "Teleporter Shutters Access Control"; pixel_x = -24; - req_access_txt = "17" + req_access = list(17) }, /obj/machinery/door/poddoor/shutters{ dir = 2; @@ -41574,7 +41562,7 @@ /obj/structure/closet/secure_closet{ anchored = 1; name = "Evidence Storage"; - req_access_txt = "4" + req_access = list(4) }, /obj/item/restraints/handcuffs/pinkcuffs, /obj/item/clothing/under/rank/security/officer, @@ -43005,7 +42993,7 @@ "csI" = ( /obj/machinery/door/morgue{ name = "Private Study"; - req_access_txt = "37" + req_access = list(37) }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -47154,7 +47142,7 @@ id = "eva-shutters"; name = "Auxilary E.V.A. Storage"; pixel_x = 26; - req_one_access_txt = "18" + req_access = list(18) }, /obj/machinery/door/poddoor/shutters{ dir = 2; @@ -50456,7 +50444,7 @@ /obj/machinery/door_control{ id = "xeno6"; name = "Containment Control"; - req_access_txt = "55" + req_access = list(55) }, /obj/structure/window/reinforced{ dir = 4 @@ -50886,7 +50874,7 @@ /obj/machinery/door_control{ id = "xeno4"; name = "Containment Control"; - req_access_txt = "55" + req_access = list(55) }, /obj/structure/window/reinforced{ dir = 4 @@ -50972,7 +50960,7 @@ /obj/machinery/door_control{ id = "xeno5"; name = "Containment Control"; - req_access_txt = "55" + req_access = list(55) }, /obj/structure/window/reinforced{ dir = 4 @@ -51248,7 +51236,7 @@ id = "xenosecure"; name = "Containment Control"; pixel_y = -3; - req_access_txt = "55" + req_access = list(55) }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel/white, @@ -51802,7 +51790,7 @@ /obj/machinery/door_control{ id = "xeno2"; name = "Containment Control"; - req_access_txt = "55" + req_access = list(55) }, /obj/structure/window/reinforced{ dir = 8 @@ -51815,7 +51803,7 @@ /obj/machinery/door_control{ id = "xeno3"; name = "Containment Control"; - req_access_txt = "55" + req_access = list(55) }, /obj/structure/window/reinforced{ dir = 8 @@ -56639,7 +56627,7 @@ normaldoorcontrol = 1; pixel_x = -4; pixel_y = -4; - req_access_txt = "30" + req_access = list(30) }, /turf/simulated/floor/plasteel/white, /area/station/command/office/rd) @@ -57003,7 +56991,7 @@ id = "roboticsshutters"; name = "Mech Bay Door Control"; pixel_y = 24; - req_access_txt = "29" + req_access = list(29) }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -57221,7 +57209,7 @@ id = "RD"; pixel_x = 24; pixel_y = -36; - req_access_txt = "30" + req_access = list(30) }, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" @@ -63693,7 +63681,7 @@ /obj/machinery/door_control{ id = "xeno1"; name = "Containment Control"; - req_access_txt = "55" + req_access = list(55) }, /obj/structure/window/reinforced{ dir = 8 @@ -65168,7 +65156,7 @@ name = "exterior access button"; pixel_x = 20; pixel_y = 20; - req_access_txt = "10;13" + req_access = list(10,13) }, /obj/structure/cable/yellow{ d1 = 1; @@ -65200,7 +65188,7 @@ id = "sr2"; pixel_x = 24; pixel_y = -7; - req_access_txt = "45" + req_access = list(45) }, /obj/machinery/light_switch{ dir = 8; @@ -65730,7 +65718,7 @@ name = "AI Chamber Turret Control"; pixel_x = -5; pixel_y = 24; - req_access_txt = "75" + req_access = list(75) }, /turf/simulated/floor/plasteel{ dir = 8; @@ -66074,7 +66062,7 @@ layer = 3.6; name = "Virology Lab Access Button"; pixel_x = -24; - req_access_txt = "39" + req_access = list(39) }, /obj/machinery/door/airlock/virology{ autoclose = 0; @@ -66848,7 +66836,7 @@ name = "Secure Armory Shutter Control"; pixel_x = 7; pixel_y = -28; - req_access_txt = "3" + req_access = list(3) }, /obj/structure/rack, /obj/item/storage/toolbox/mechanical, @@ -67169,7 +67157,7 @@ autolink_id = "virolab_btn_int"; name = "Virology Lab Access Button"; pixel_y = -24; - req_access_txt = "39" + req_access = list(39) }, /obj/machinery/door/airlock/virology{ autoclose = 0; @@ -69942,7 +69930,7 @@ name = "exterior access button"; pixel_x = 20; pixel_y = 20; - req_access_txt = "10;13" + req_access = list(10,13) }, /obj/structure/cable/yellow{ d1 = 2; @@ -70527,7 +70515,7 @@ id = "justice_blast"; name = "Space Vent"; pixel_x = 32; - req_access_txt = "2" + req_access = list(2) }, /obj/structure/closet/secure_closet/injection, /obj/machinery/light{ @@ -70893,8 +70881,8 @@ int_button_link_id = "enginen_btn_int"; int_door_link_id = "enginen_door_int"; pixel_y = -25; - req_access_txt = "10;13"; - vent_link_id = "enginen_vent" + vent_link_id = "enginen_vent"; + req_access = list(10,13) }, /obj/structure/cable/yellow{ d1 = 4; @@ -74518,7 +74506,7 @@ name = "interior access button"; pixel_x = -20; pixel_y = 20; - req_access_txt = "10;13" + req_access = list(10,13) }, /obj/structure/cable/yellow{ d1 = 4; @@ -74605,7 +74593,7 @@ id = "cell3lockdown"; name = "Cell Lockdown"; pixel_y = 32; - req_access_txt = "2" + req_access = list(2) }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -76250,7 +76238,7 @@ int_door_link_id = "virolab_door_int"; name = "Virology Lab Access Console"; pixel_x = -24; - req_one_access_txt = "39" + req_access = list(39) }, /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ @@ -76644,7 +76632,7 @@ id = "paramedic"; name = "Garage Door Control"; pixel_x = -24; - req_access_txt = "66" + req_access = list(66) }, /obj/machinery/door/poddoor/preopen{ id_tag = "Biohazard_medi"; @@ -79433,7 +79421,7 @@ name = "Turbine Access Console"; pixel_x = 8; pixel_y = -26; - req_access_txt = "12" + req_access = list(12) }, /obj/machinery/ignition_switch{ id = "Incinerator"; @@ -79445,7 +79433,7 @@ name = "Turbine Vent Control"; pixel_x = -8; pixel_y = -36; - req_access_txt = "12" + req_access = list(12) }, /obj/machinery/door_control{ id = "auxincineratorvent"; @@ -82397,14 +82385,14 @@ name = "Kitchen Bar Shutters Control"; pixel_x = 6; pixel_y = 24; - req_access_txt = "28" + req_access = list(28) }, /obj/machinery/door_control{ id = "kitchenhall"; name = "Kitchen Hallway Shutters Control"; pixel_x = -8; pixel_y = 24; - req_access_txt = "28" + req_access = list(28) }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -83388,7 +83376,7 @@ id = "sr1"; pixel_x = -24; pixel_y = -7; - req_access_txt = "45" + req_access = list(45) }, /turf/simulated/floor/plasteel{ dir = 8; @@ -86748,7 +86736,7 @@ dir = 4; id = "qm"; pixel_x = -28; - req_access_txt = "41" + req_access = list(41) }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -92802,14 +92790,14 @@ name = "Office Door"; normaldoorcontrol = 1; pixel_x = 25; - req_access_txt = "40" + req_access = list(40) }, /obj/machinery/button/windowtint{ dir = 8; id = "CMO"; pixel_x = 24; pixel_y = 8; - req_access_txt = "40" + req_access = list(40) }, /obj/machinery/light_switch{ dir = 8; @@ -92821,7 +92809,7 @@ id = "Biohazard_medi"; name = "Medical Quarantine"; pixel_x = 35; - req_access_txt = "40" + req_access = list(40) }, /turf/simulated/floor/plasteel{ dir = 4; @@ -94191,8 +94179,8 @@ int_button_link_id = "engines_btn_int"; int_door_link_id = "engines_door_int"; pixel_y = 25; - req_access_txt = "10;13"; - vent_link_id = "engines_vent" + vent_link_id = "engines_vent"; + req_access = list(10,13) }, /obj/structure/cable/yellow{ d1 = 4; @@ -97596,7 +97584,7 @@ name = "interior access button"; pixel_x = -20; pixel_y = -20; - req_access_txt = "10;13" + req_access = list(10,13) }, /obj/structure/cable/yellow{ d1 = 4; @@ -98417,6 +98405,17 @@ icon_state = "redyellowfull" }, /area/station/medical/break_room) +"xtw" = ( +/obj/machinery/door_control{ + id = "qm_warehouse"; + name = "Warehouse Door Control"; + pixel_x = 24; + pixel_y = -3; + req_access = list(31) + }, +/obj/effect/decal/cleanable/cobweb2, +/turf/simulated/floor/plating, +/area/station/supply/warehouse) "xtS" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, @@ -98465,7 +98464,7 @@ name = "Brig Lockdown"; pixel_x = 3; pixel_y = -28; - req_access_txt = "2" + req_access = list(2) }, /obj/machinery/door_control{ desc = "A remote control-switch to lock down the prison wing's blast doors"; @@ -98473,14 +98472,14 @@ name = "Prison Wing Lockdown"; pixel_x = -7; pixel_y = -28; - req_access_txt = "2" + req_access = list(2) }, /obj/machinery/door_control{ id = "Secure Armory"; name = "Secure Armory Shutter Control"; pixel_x = -2; pixel_y = -36; - req_access_txt = "3" + req_access = list(3) }, /obj/structure/cable{ d1 = 4; @@ -142643,7 +142642,7 @@ axm axm axt kXQ -azF +xtw aAR aCH aCH diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index 149dc06e9d8..cabe367101b 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -38,14 +38,14 @@ id = "Secure Storage"; name = "Engineering Secure Storage"; pixel_x = -24; - req_access_txt = "56" + req_access = list(56) }, /obj/machinery/door_control{ id = "atmos"; name = "Atmospherics Lockdown"; pixel_x = -24; pixel_y = 7; - req_access_txt = "24" + req_access = list(24) }, /obj/machinery/computer/security/telescreen/engine, /turf/simulated/floor/plasteel{ @@ -1697,22 +1697,22 @@ name = "Office Door"; normaldoorcontrol = 1; pixel_x = -24; - req_access_txt = "40"; - pixel_y = 24 + pixel_y = 24; + req_access = list(40) }, /obj/machinery/door_control{ id = "Biohazard_medi"; name = "Medical Quarantine"; pixel_x = -24; - req_access_txt = "40"; - pixel_y = 33 + pixel_y = 33; + req_access = list(40) }, /obj/machinery/button/windowtint{ id = "CMO"; pixel_x = -23; pixel_y = 42; - req_access_txt = "40"; - dir = 4 + dir = 4; + req_access = list(40) }, /turf/simulated/floor/plasteel{ icon_state = "darkbluecorners"; @@ -2217,8 +2217,8 @@ /obj/machinery/access_button{ autolink_id = "engsm_btn_ext"; name = "Supermatter Access Button"; - req_access_txt = "32"; - pixel_x = 24 + pixel_x = 24; + req_access = list(32) }, /obj/machinery/light{ dir = 4 @@ -2320,8 +2320,8 @@ id = "disvent"; name = "Incinerator Vent Control"; pixel_y = -24; - req_access_txt = "12"; - pixel_x = 26 + pixel_x = 26; + req_access = list(12) }, /turf/simulated/floor/plating, /area/station/maintenance/incinerator) @@ -2418,7 +2418,7 @@ autolink_id = "viro_btn_ext"; name = "Virology Lab Access Button"; pixel_x = -24; - req_access_txt = "39" + req_access = list(39) }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -4890,7 +4890,7 @@ id = "CE"; pixel_x = -8; pixel_y = 24; - req_access_txt = "56" + req_access = list(56) }, /obj/machinery/button/windowtint{ dir = 4; @@ -4898,7 +4898,7 @@ pixel_x = -24; pixel_y = 9; range = 12; - req_access_txt = "56" + req_access = list(56) }, /obj/machinery/light_switch{ dir = 4; @@ -5985,7 +5985,7 @@ normaldoorcontrol = 1; pixel_x = 37; pixel_y = -25; - req_access_txt = "63" + req_access = list(63) }, /obj/machinery/door_control{ desc = "A remote control switch for the brig foyer."; @@ -5994,7 +5994,7 @@ normaldoorcontrol = 1; pixel_x = 27; pixel_y = -25; - req_access_txt = "63" + req_access = list(63) }, /turf/simulated/floor/plasteel{ icon_state = "darkredfull" @@ -8754,8 +8754,8 @@ /obj/machinery/door_control{ id = "paramedic"; name = "Garage Door Control"; - req_access_txt = "66"; - pixel_x = 24 + pixel_x = 24; + req_access = list(66) }, /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/preopen{ @@ -10872,7 +10872,7 @@ name = "AI Chamber Turret Control"; pixel_x = 5; pixel_y = -24; - req_access_txt = "75" + req_access = list(75) }, /obj/machinery/flasher{ id = "AI"; @@ -11501,8 +11501,8 @@ /obj/machinery/access_button{ autolink_id = "engsm_btn_ext"; name = "Supermatter Access Button"; - req_access_txt = "32"; - pixel_x = -24 + pixel_x = -24; + req_access = list(32) }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -11911,7 +11911,7 @@ id = "xenobio3"; name = "Chamber 3 Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access = list(55) }, /turf/simulated/floor/plasteel{ dir = 1; @@ -13414,12 +13414,12 @@ "cyf" = ( /obj/machinery/airlock_controller/air_cycler{ pixel_x = 25; - req_access_txt = "10;13"; vent_link_id = "eng_vent"; ext_door_link_id = "eng_door_ext"; int_door_link_id = "eng_door_int"; ext_button_link_id = "eng_btn_ext"; - int_button_link_id = "eng_btn_int" + int_button_link_id = "eng_btn_int"; + req_access = list(10,13) }, /turf/simulated/floor/plating, /area/station/engineering/control) @@ -13731,7 +13731,7 @@ name = "Research and Development Lab Shutters Control"; pixel_x = 24; pixel_y = 23; - req_access_txt = "47" + req_access = list(47) }, /turf/simulated/floor/plasteel{ dir = 5; @@ -15504,7 +15504,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - req_access_txt = null; sort_type_txt = "1" }, /turf/simulated/floor/plasteel, @@ -18977,7 +18976,7 @@ id = "xenobio4"; name = "Chamber 4 Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access = list(55) }, /obj/item/radio/intercom{ name = "west bump"; @@ -20978,7 +20977,7 @@ autolink_id = "eng_btn_int"; pixel_x = -22; pixel_y = -20; - req_access_txt = "10;13" + req_access = list(10,13) }, /turf/simulated/floor/plasteel{ dir = 8; @@ -23576,7 +23575,7 @@ id = "xenobio5"; name = "Chamber 5 Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access = list(55) }, /turf/simulated/floor/plasteel{ dir = 10; @@ -24741,8 +24740,7 @@ /area/station/engineering/break_room/secondary) "eHF" = ( /obj/machinery/computer/prisoner{ - req_access = null; - req_one_access_txt = "2" + req_access = list(2) }, /turf/simulated/floor/plasteel{ dir = 10; @@ -25234,9 +25232,9 @@ id = "Prison Perma Cell 3"; name = "Cell Lockdown"; pixel_y = 31; - req_access_txt = "2"; specialfunctions = 4; - normaldoorcontrol = 1 + normaldoorcontrol = 1; + req_access = list(2) }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -26442,7 +26440,7 @@ id = "eva-shutters"; name = "Auxilary E.V.A. Storage"; pixel_x = -24; - req_one_access_txt = "18" + req_access = list(18) }, /turf/simulated/floor/plasteel, /area/station/ai_monitored/storage/eva) @@ -26594,9 +26592,9 @@ id = "Prison Perma Cell 1"; name = "Cell Lockdown"; pixel_y = 31; - req_access_txt = "2"; specialfunctions = 4; - normaldoorcontrol = 1 + normaldoorcontrol = 1; + req_access = list(2) }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -27544,7 +27542,7 @@ ext_button_link_id = "engsm_btn_ext"; int_button_link_id = "engsm_btn_int"; pixel_x = 22; - req_access_txt = "32" + req_access = list(32) }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -28998,11 +28996,11 @@ name = "Turbine Access Console"; pixel_x = 6; pixel_y = -26; - req_access_txt = "12"; ext_door_link_id = "turbine_door_ext"; int_door_link_id = "turbine_door_int"; ext_button_link_id = "turbine_btn_ext"; - int_button_link_id = "turbine_btn_int" + int_button_link_id = "turbine_btn_int"; + req_access = list(12) }, /obj/machinery/atmospherics/binary/pump/on, /turf/simulated/floor/plasteel{ @@ -29122,7 +29120,7 @@ name = "processing tint control"; pixel_x = -6; pixel_y = 24; - req_access_txt = "63" + req_access = list(63) }, /obj/machinery/light_switch{ name = "north bump"; @@ -31372,8 +31370,7 @@ "fPs" = ( /obj/machinery/computer/prisoner{ dir = 8; - req_access = null; - req_access_txt = "2" + req_access = list(2) }, /turf/simulated/floor/plasteel{ dir = 4; @@ -35385,11 +35382,11 @@ name = "Incinerator Access Console"; pixel_x = 6; pixel_y = -25; - req_access_txt = "12"; ext_door_link_id = "incinerator_door_ext"; int_door_link_id = "incinerator_door_int"; ext_button_link_id = "incinerator_btn_ext"; - int_button_link_id = "incinerator_btn_int" + int_button_link_id = "incinerator_btn_int"; + req_access = list(12) }, /obj/machinery/ignition_switch{ id = "Incinerator"; @@ -35681,7 +35678,7 @@ autolink_id = "viro_btn_int"; name = "Virology Lab Access Button"; pixel_x = -24; - req_access_txt = "39" + req_access = list(39) }, /obj/structure/cable{ d1 = 1; @@ -35871,9 +35868,9 @@ /obj/machinery/button/windowtint{ id = "Surgery 1"; pixel_y = 8; - req_access_txt = "45"; dir = 4; - pixel_x = -24 + pixel_x = -24; + req_access = list(45) }, /obj/machinery/light_switch{ dir = 4; @@ -38609,7 +38606,7 @@ normaldoorcontrol = 1; pixel_x = 28; pixel_y = 17; - req_access_txt = "58" + req_access = list(58) }, /obj/machinery/door_control{ desc = "A remote control-switch to lock down the prison wing's blast doors"; @@ -38617,14 +38614,14 @@ name = "Prison Wing Lockdown"; pixel_x = 28; pixel_y = 7; - req_access_txt = "2" + req_access = list(2) }, /obj/machinery/door_control{ id = "Secure Gate"; name = "Brig Lockdown"; pixel_x = 28; pixel_y = -3; - req_access_txt = "2" + req_access = list(2) }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -38674,7 +38671,7 @@ name = "Secure Armory Shutter Control"; pixel_x = -2; pixel_y = -36; - req_access_txt = "3" + req_access = list(3) }, /obj/machinery/door_control{ desc = "A remote control-switch to lock down the prison wing's blast doors"; @@ -38682,14 +38679,14 @@ name = "Prison Wing Lockdown"; pixel_x = -7; pixel_y = -28; - req_access_txt = "2" + req_access = list(2) }, /obj/machinery/door_control{ id = "Secure Gate"; name = "Brig Lockdown"; pixel_x = 3; pixel_y = -28; - req_access_txt = "2" + req_access = list(2) }, /turf/simulated/floor/plasteel{ icon_state = "darkred" @@ -41213,14 +41210,14 @@ id = "hopqueueshutters"; name = "Queue Shutters"; pixel_x = -24; - req_one_access_txt = "18" + req_access = list(18) }, /obj/machinery/door_control{ id = "hop"; name = "Privacy Shutters"; pixel_x = -24; pixel_y = -8; - req_one_access_txt = "18" + req_access = list(18) }, /obj/machinery/flasher_button{ id = "hopflash"; @@ -41942,7 +41939,7 @@ /obj/structure/barricade/wooden/crude, /obj/machinery/door/morgue{ name = "Private Study"; - req_access_txt = "37" + req_access = list(37) }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) @@ -45911,8 +45908,8 @@ id = "justice_blast"; name = "Space Vent"; pixel_x = 2; - req_access_txt = "2"; - pixel_y = 22 + pixel_y = 22; + req_access = list(2) }, /obj/structure/table/reinforced, /obj/item/taperecorder{ @@ -49926,19 +49923,19 @@ id = "bridge blast entrance"; name = "Bridge Lobby Blast Door Control"; pixel_y = -9; - req_one_access_txt = "19" + req_access = list(19) }, /obj/machinery/door_control{ id = "bridge blast south"; name = "Bridge Entrance Blast Door Control"; pixel_y = -1; - req_one_access_txt = "19" + req_access = list(19) }, /obj/machinery/door_control{ id = "bridge blast north"; name = "Bridge Space Blast Door Control"; pixel_y = 7; - req_one_access_txt = "19" + req_access = list(19) }, /turf/simulated/floor/plasteel, /area/station/command/bridge) @@ -50333,7 +50330,7 @@ autolink_id = "xeno_btn_int"; name = "Xenobiology Access Button"; pixel_x = -24; - req_access_txt = "55" + req_access = list(55) }, /obj/machinery/door/airlock/research{ autoclose = 0; @@ -51156,8 +51153,8 @@ /obj/machinery/turretid/stun{ control_area = "\improper AI Satellite Atmospherics"; name = "AI Satellite Atmospherics Turret Control"; - req_access_txt = "75"; - pixel_y = -26 + pixel_y = -26; + req_access = list(75) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -51808,8 +51805,8 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = -1; - req_access_txt = "10"; - pixel_x = -22 + pixel_x = -22; + req_access = list(10) }, /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/effect/turf_decal/stripes/line{ @@ -54339,15 +54336,14 @@ "kcA" = ( /obj/machinery/computer/prisoner{ dir = 4; - req_access = null; - req_access_txt = "2" + req_access = list(2) }, /obj/machinery/button/windowtint{ dir = 4; id = "IAA"; pixel_x = -24; pixel_y = 6; - req_access_txt = "38" + req_access = list(38) }, /obj/machinery/camera{ c_tag = "Internal Affairs Office"; @@ -54730,9 +54726,9 @@ id = "Prison Perma Cell 4"; name = "Cell Lockdown"; pixel_y = 31; - req_access_txt = "2"; specialfunctions = 4; - normaldoorcontrol = 1 + normaldoorcontrol = 1; + req_access = list(2) }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -56364,9 +56360,9 @@ /obj/machinery/door_control{ id = "robotics_surgery"; name = "Robotics Privacy Shutters"; - req_access_txt = "29"; pixel_y = 24; - pixel_x = -24 + pixel_x = -24; + req_access = list(29) }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -59923,18 +59919,6 @@ }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) -"lhw" = ( -/obj/structure/closet/cardboard, -/obj/effect/decal/cleanable/cobweb, -/obj/machinery/door_control{ - id = "qm_warehouse"; - name = "Warehouse Door Control"; - pixel_x = -1; - pixel_y = 24; - req_access_txt = "31" - }, -/turf/simulated/floor/plasteel, -/area/station/supply/warehouse) "lhR" = ( /obj/item/decorations/sticky_decorations/flammable/singleeye{ pixel_y = 20 @@ -60020,7 +60004,7 @@ id = "HoS"; pixel_x = 7; pixel_y = -25; - req_access_txt = "58" + req_access = list(58) }, /obj/machinery/light_switch{ dir = 1; @@ -60367,14 +60351,14 @@ name = "Auxiliary Vent"; pixel_x = 6; pixel_y = -24; - req_access_txt = "32" + req_access = list(32) }, /obj/machinery/door_control{ id = "turbinevent"; name = "Turbine Vent"; pixel_x = -6; pixel_y = -24; - req_access_txt = "32" + req_access = list(32) }, /obj/machinery/atmospherics/binary/pump/on{ dir = 1 @@ -60799,7 +60783,7 @@ name = "Engineering Lockdown"; pixel_x = 8; pixel_y = -7; - req_access_txt = "10" + req_access = list(10) }, /turf/simulated/wall/r_wall, /area/station/command/office/ce) @@ -61461,8 +61445,8 @@ name = "Office Door"; normaldoorcontrol = 1; pixel_x = 9; - req_access_txt = "74"; - pixel_y = 25 + pixel_y = 25; + req_access = list(74) }, /obj/machinery/light{ dir = 1 @@ -62648,8 +62632,7 @@ /area/station/command/bridge) "lFR" = ( /obj/structure/closet/crate/secure{ - req_one_access = list(33,41); - req_one_access_txt = "33;41" + req_one_access = list(33,41) }, /obj/item/circuitboard/thermomachine{ pixel_x = -5 @@ -68124,7 +68107,7 @@ control_area = "\improper AI Satellite Antechamber"; name = "AI Antechamber Turret Control"; pixel_x = -28; - req_access_txt = "75" + req_access = list(75) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -68745,8 +68728,7 @@ "mSw" = ( /obj/machinery/computer/prisoner{ dir = 1; - req_access = null; - req_access_txt = "2" + req_access = list(2) }, /obj/item/radio/intercom{ name = "south bump"; @@ -69519,7 +69501,7 @@ control_area = "\improper AI Satellite Service"; name = "AI Satellite Service Bay Turret Control"; pixel_x = -29; - req_access_txt = "75" + req_access = list(75) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -71488,7 +71470,7 @@ name = "Chemistry Privacy Shutter Control"; pixel_x = -24; pixel_y = 24; - req_access_txt = "33" + req_access = list(33) }, /obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ @@ -72400,7 +72382,7 @@ "nAB" = ( /obj/machinery/door/morgue{ name = "Confession Booth (Chaplain)"; - req_access_txt = "22" + req_access = list(22) }, /turf/simulated/floor/plating, /area/station/service/chapel) @@ -73065,8 +73047,8 @@ id = "Secure Storage"; name = "Engineering Secure Storage"; pixel_x = 7; - req_access_txt = "56"; - pixel_y = 24 + pixel_y = 24; + req_access = list(56) }, /turf/simulated/floor/plasteel, /area/station/engineering/control) @@ -73145,8 +73127,8 @@ /obj/machinery/button/windowtint{ id = "Courtroom"; pixel_x = -6; - req_one_access_txt = "74;3"; - range = 10 + range = 10; + req_one_access = list(74,3) }, /obj/item/megaphone{ pixel_y = -11 @@ -73173,8 +73155,8 @@ name = "Court Entrance Control"; normaldoorcontrol = 1; pixel_x = 1; - req_access_txt = "74"; - pixel_y = 10 + pixel_y = 10; + req_access = list(74) }, /turf/simulated/floor/carpet, /area/station/legal/courtroom) @@ -75106,8 +75088,7 @@ "nYy" = ( /obj/machinery/computer/prisoner{ dir = 4; - req_access = null; - req_access_txt = "2" + req_access = list(2) }, /obj/machinery/light{ dir = 8 @@ -77651,9 +77632,9 @@ /obj/machinery/door_control{ id = "mechbay_inner"; name = "Inner Mech Bay Shutter Control"; - req_access_txt = "29"; pixel_y = -24; - pixel_x = 25 + pixel_x = 25; + req_access = list(29) }, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel{ @@ -80898,9 +80879,9 @@ /obj/machinery/button/windowtint{ id = "Surgery 2"; pixel_y = 8; - req_access_txt = "45"; dir = 8; - pixel_x = 24 + pixel_x = 24; + req_access = list(45) }, /obj/machinery/light_switch{ dir = 8; @@ -82651,7 +82632,7 @@ id = "teleshutter"; name = "Teleporter Shutters Access Control"; pixel_x = 24; - req_one_access_txt = "62" + req_access = list(62) }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -84585,7 +84566,7 @@ "pHY" = ( /obj/machinery/door/morgue{ name = "Private Study"; - req_access_txt = "37" + req_access = list(37) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -85594,7 +85575,7 @@ id = "Detective"; pixel_x = -8; pixel_y = 24; - req_access_txt = "4" + req_access = list(4) }, /obj/machinery/computer/med_data, /obj/machinery/light{ @@ -86316,7 +86297,7 @@ id = "xenobio6"; name = "Chamber 6 Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access = list(55) }, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" @@ -88060,7 +88041,7 @@ id = "xenobio1"; name = "Chamber 1 Containment Blast Door"; pixel_y = 4; - req_access_txt = "55" + req_access = list(55) }, /obj/structure/cable{ d1 = 1; @@ -91334,8 +91315,8 @@ name = "Jury Entrance Control"; normaldoorcontrol = 1; pixel_x = 1; - req_access_txt = "74"; - pixel_y = 10 + pixel_y = 10; + req_access = list(74) }, /obj/item/reagent_containers/glass/beaker/waterbottle{ pixel_x = 5 @@ -92260,7 +92241,7 @@ id = "xenobio2"; name = "Chamber 2 Containment Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access = list(55) }, /turf/simulated/floor/plasteel{ dir = 9; @@ -94869,8 +94850,8 @@ /obj/machinery/door_control{ id = "mechbay_outer"; name = "Outer Mech Bay Shutters Control"; - req_access_txt = "29"; - pixel_y = 24 + pixel_y = 24; + req_access = list(29) }, /turf/simulated/floor/plasteel, /area/station/science/robotics/chargebay) @@ -95468,7 +95449,7 @@ id = "Interrogation"; name = "interrogation tint control"; pixel_x = -24; - req_access_txt = "63" + req_access = list(63) }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -95937,7 +95918,7 @@ name = "Atmospherics Lockdown"; pixel_x = -24; pixel_y = 5; - req_access_txt = "24" + req_access = list(24) }, /obj/machinery/light{ dir = 8 @@ -96431,7 +96412,7 @@ name = "Atmospherics Lockdown"; pixel_x = -8; pixel_y = 10; - req_access_txt = "24" + req_access = list(24) }, /obj/item/book/manual/atmospipes, /obj/machinery/computer/security/telescreen/engine{ @@ -99604,7 +99585,7 @@ name = "Warehouse Door Control"; pixel_x = -1; pixel_y = -24; - req_access_txt = "31" + req_access = list(31) }, /turf/simulated/floor/plasteel{ dir = 8; @@ -100016,7 +99997,7 @@ autolink_id = "xeno_btn_ext"; name = "Xenobiology Access Button"; pixel_x = -24; - req_access_txt = "55" + req_access = list(55) }, /obj/structure/cable{ d1 = 1; @@ -100887,9 +100868,9 @@ id = "Prison Perma Cell 2"; name = "Cell Lockdown"; pixel_y = 31; - req_access_txt = "2"; specialfunctions = 4; - normaldoorcontrol = 1 + normaldoorcontrol = 1; + req_access = list(2) }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -102408,11 +102389,11 @@ /obj/machinery/airlock_controller/access_controller{ name = "Virology Lab Access Console"; pixel_y = 24; - req_one_access_txt = "39"; ext_door_link_id = "viro_door_ext"; int_door_link_id = "viro_door_int"; ext_button_link_id = "viro_btn_ext"; - int_button_link_id = "viro_btn_int" + int_button_link_id = "viro_btn_int"; + req_access = list(39) }, /turf/simulated/floor/plasteel{ dir = 1; @@ -108401,9 +108382,9 @@ /obj/machinery/button/windowtint{ pixel_x = 24; id = "qm"; - req_access_txt = "41"; dir = 8; - pixel_y = 5 + pixel_y = 5; + req_access = list(41) }, /obj/machinery/light_switch{ dir = 8; @@ -115809,8 +115790,8 @@ /obj/machinery/access_button{ autolink_id = "engsm_btn_int"; name = "Supermatter Access Button"; - req_access_txt = "32"; - pixel_x = -24 + pixel_x = -24; + req_access = list(32) }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -122312,7 +122293,7 @@ /area/station/hallway/primary/starboard/south) "wFX" = ( /obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" + req_access = list(25) }, /obj/item/ammo_box/shotgun/beanbag, /turf/simulated/floor/wood, @@ -122685,7 +122666,7 @@ name = "Secure Armory Shutter Control"; pixel_x = -24; pixel_y = -28; - req_access_txt = "3" + req_access = list(3) }, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" @@ -124926,7 +124907,7 @@ name = "Office Door"; normaldoorcontrol = 1; pixel_x = -8; - req_access_txt = "57" + req_access = list(57) }, /obj/item/pen{ pixel_x = -8; @@ -125468,14 +125449,14 @@ name = "Kitchen Diner Shutters Control"; pixel_x = 26; pixel_y = 7; - req_access_txt = "28" + req_access = list(28) }, /obj/machinery/door_control{ id = "kitchenhall"; name = "Kitchen Hallway Shutters Control"; pixel_x = 26; pixel_y = -3; - req_access_txt = "28" + req_access = list(28) }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -125923,7 +125904,7 @@ autolink_id = "eng_btn_ext"; pixel_x = -22; pixel_y = 20; - req_access_txt = "10;13" + req_access = list(10,13) }, /turf/space, /area/space/nearstation) @@ -126173,14 +126154,14 @@ normaldoorcontrol = 1; pixel_x = -4; pixel_y = -4; - req_access_txt = "30" + req_access = list(30) }, /obj/machinery/door_control{ id = "Biohazard"; name = "Biohazard Shutter Control"; pixel_x = -4; pixel_y = 6; - req_access_txt = "30" + req_access = list(30) }, /obj/item/reagent_containers/drinks/coffee{ pixel_x = 8; @@ -126754,9 +126735,9 @@ /obj/machinery/door_control{ id = "robotics"; name = "Robotics Privacy Shutters"; - req_access_txt = "29"; pixel_y = 8; - pixel_x = 25 + pixel_x = 25; + req_access = list(29) }, /turf/simulated/floor/plasteel{ dir = 6; @@ -128717,6 +128698,18 @@ /obj/effect/spawner/random_spawners/oil_maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) +"xRf" = ( +/obj/structure/closet/cardboard, +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/door_control{ + id = "qm_warehouse"; + name = "Warehouse Door Control"; + pixel_x = -1; + pixel_y = 24; + req_access = list(31) + }, +/turf/simulated/floor/plasteel, +/area/station/supply/warehouse) "xRh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -128773,7 +128766,7 @@ name = "AI Chamber Hallway Turret Control"; pixel_x = 24; pixel_y = -24; - req_access_txt = "75" + req_access = list(75) }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -148768,7 +148761,7 @@ qxw tKR svJ wRe -lhw +xRf gAx vTT mYq diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 6a69edd21d2..6c527b93589 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -160,7 +160,7 @@ dir = 8; id = "Detective"; pixel_x = 24; - req_access_txt = "4" + req_access = list(4) }, /turf/simulated/floor/carpet, /area/station/security/detective) @@ -212,8 +212,7 @@ /obj/machinery/alarm/directional/west, /obj/machinery/computer/prisoner{ dir = 4; - req_access = null; - req_access_txt = "2" + req_access = list(2) }, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -631,7 +630,7 @@ name = "exterior access button"; pixel_x = 25; pixel_y = 7; - req_access_txt = "75;13" + req_access = list(75,13) }, /turf/space, /area/space/nearstation) @@ -1395,7 +1394,7 @@ name = "Disposal Vent Control"; pixel_x = -25; pixel_y = 4; - req_access_txt = "12" + req_access = list(12) }, /obj/machinery/driver_button{ id_tag = "trash"; @@ -1499,12 +1498,12 @@ /obj/machinery/airlock_controller/air_cycler{ pixel_x = -25; pixel_y = 4; - req_access_txt = "13"; vent_link_id = "arrivalsmaint_vent"; ext_door_link_id = "arrivalsmaint_door_ext"; int_door_link_id = "arrivalsmaint_door_int"; ext_button_link_id = "arrivalsmaint_btn_ext"; - int_button_link_id = "arrivalsmaint_btn_int" + int_button_link_id = "arrivalsmaint_btn_int"; + req_access = list(13) }, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -4169,7 +4168,7 @@ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_x = 24; - req_access_txt = "31" + req_access = list(31) }, /obj/structure/cable{ d1 = 1; @@ -6155,7 +6154,7 @@ id = "xenobio2"; name = "Xenobio Pen 2 Blast Doors"; pixel_y = 1; - req_access_txt = "55" + req_access = list(55) }, /turf/simulated/floor/plasteel, /area/station/science/xenobiology) @@ -8535,7 +8534,7 @@ dir = 1; id = "Courtroom"; pixel_y = 8; - req_one_access_txt = "74;3" + req_one_access = list(74,3) }, /turf/simulated/floor/carpet, /area/station/legal/courtroom) @@ -8718,7 +8717,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_x = 24; - req_access_txt = "32" + req_access = list(32) }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -8847,26 +8846,6 @@ /obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel, /area/station/engineering/control) -"aPR" = ( -/obj/machinery/door_control{ - id = "qm_warehouse"; - name = "Warehouse Door Control"; - pixel_x = -24; - req_access_txt = "31" - }, -/obj/structure/table, -/obj/machinery/kitchen_machine/microwave{ - pixel_y = 6 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light_switch{ - dir = 4; - name = "custom placement"; - pixel_x = -24; - pixel_y = -8 - }, -/turf/simulated/floor/plasteel, -/area/station/supply/warehouse) "aPS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -13941,14 +13920,14 @@ name = "Engineering Lockdown"; pixel_x = -24; pixel_y = -5; - req_access_txt = "10" + req_access = list(10) }, /obj/machinery/door_control{ id = "atmos"; name = "Atmospherics Lockdown"; pixel_x = -24; pixel_y = 5; - req_access_txt = "24" + req_access = list(24) }, /obj/machinery/light{ dir = 8 @@ -14603,7 +14582,7 @@ name = "Transit Tube Lockdown"; pixel_x = -24; pixel_y = -5; - req_access_txt = "19" + req_access = list(19) }, /obj/machinery/door_control{ desc = "A remote control-switch for secure storage."; @@ -14611,7 +14590,7 @@ name = "Engineering Secure Storage"; pixel_x = -24; pixel_y = 5; - req_access_txt = "11" + req_access = list(11) }, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" @@ -17495,7 +17474,7 @@ /obj/machinery/button/windowtint{ id = "CE"; pixel_y = -24; - req_access_txt = "56" + req_access = list(56) }, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" @@ -19890,7 +19869,7 @@ /area/station/service/barber) "buI" = ( /obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" + req_access = list(25) }, /obj/machinery/light/small{ dir = 1 @@ -20092,7 +20071,7 @@ id = "hop"; name = "Privacy Shutters Control"; pixel_y = 25; - req_access_txt = "28" + req_access = list(28) }, /obj/machinery/computer/account_database, /turf/simulated/floor/wood, @@ -20197,7 +20176,7 @@ control_area = "\improper AI Satellite Antechamber"; name = "AI Antechamber Turret Control"; pixel_x = 24; - req_access_txt = "75" + req_access = list(75) }, /turf/simulated/floor/plasteel{ dir = 1; @@ -21253,7 +21232,7 @@ id = "hop"; name = "Privacy Shutters Control"; pixel_x = -24; - req_access_txt = "28" + req_access = list(28) }, /turf/simulated/floor/carpet, /area/station/command/office/hop) @@ -21335,14 +21314,14 @@ name = "Bridge Access Blast Door Control"; pixel_x = -1; pixel_y = -24; - req_access_txt = "19" + req_access = list(19) }, /obj/machinery/door_control{ id = "council blast"; name = "Council Chamber Blast Door Control"; pixel_x = -1; pixel_y = -34; - req_access_txt = "19" + req_access = list(19) }, /obj/machinery/camera{ c_tag = "Bridge - Command Chair"; @@ -22452,13 +22431,13 @@ id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_y = -24; - req_access_txt = "19" + req_access = list(19) }, /obj/machinery/door_control{ id = "gateshutter"; name = "Expedition Shutter Control"; pixel_y = -34; - req_access_txt = "62" + req_access = list(62) }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -22511,14 +22490,14 @@ name = "Queue Shutters Control"; pixel_x = -6; pixel_y = -35; - req_access_txt = "28" + req_access = list(28) }, /obj/machinery/door_control{ id = "hop"; name = "Privacy Shutters Control"; pixel_x = -6; pixel_y = -24; - req_access_txt = "28" + req_access = list(28) }, /obj/machinery/flasher_button{ id = "hopflash"; @@ -23555,7 +23534,7 @@ id = "council blast"; name = "Council Chamber Blast Door Control"; pixel_x = -24; - req_access_txt = "19" + req_access = list(19) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -23629,7 +23608,7 @@ id = "bridge blast"; name = "Bridge Access Blast Door Control"; pixel_x = -24; - req_access_txt = "19" + req_access = list(19) }, /turf/simulated/floor/plasteel{ dir = 4; @@ -23965,7 +23944,7 @@ id = "bridge blast"; name = "Bridge Access Blast Door Control"; pixel_x = 24; - req_access_txt = "19" + req_access = list(19) }, /turf/simulated/floor/plasteel{ dir = 1; @@ -24113,7 +24092,7 @@ name = "Kitchen Counter Shutters"; pixel_x = -6; pixel_y = 24; - req_access_txt = "28" + req_access = list(28) }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -26228,7 +26207,7 @@ name = "exterior access button"; pixel_x = -25; pixel_y = -7; - req_access_txt = "75;13" + req_access = list(75,13) }, /turf/space, /area/space/nearstation) @@ -26280,7 +26259,7 @@ id = "xenobio5"; name = "Xenobio Pen 5 Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access = list(55) }, /turf/simulated/floor/plasteel, /area/station/science/xenobiology) @@ -27481,7 +27460,7 @@ "bUK" = ( /obj/machinery/door/morgue{ name = "Private Study"; - req_access_txt = "37" + req_access = list(37) }, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -28347,7 +28326,7 @@ id = "mechbay"; name = "Mech Bay Shutters Control"; pixel_y = -24; - req_access_txt = "29" + req_access = list(29) }, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" @@ -28625,7 +28604,7 @@ normaldoorcontrol = 1; pixel_x = 6; pixel_y = -24; - req_access_txt = "73" + req_access = list(73) }, /obj/structure/table/wood, /obj/machinery/photocopier/faxmachine/longrange{ @@ -28765,7 +28744,7 @@ id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_y = -26; - req_access_txt = "19" + req_access = list(19) }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -30942,20 +30921,20 @@ name = "Xenobiology Containment Control"; pixel_x = 7; pixel_y = 24; - req_access_txt = "30" + req_access = list(30) }, /obj/machinery/door_control{ id = "rdtoxins"; name = "Toxins Containment Control"; pixel_x = -7; pixel_y = 24; - req_access_txt = "30" + req_access = list(30) }, /obj/machinery/door_control{ id = "rdrnd"; name = "Experi-mentor shutters"; pixel_y = 34; - req_access_txt = "30" + req_access = list(30) }, /obj/machinery/computer/security/telescreen/rd{ pixel_x = 31; @@ -30965,7 +30944,7 @@ id = "RD"; pixel_x = -24; pixel_y = 26; - req_access_txt = "30" + req_access = list(30) }, /turf/simulated/floor/plasteel{ dir = 1; @@ -31236,7 +31215,7 @@ id = "paramedic"; name = "Garage Door Control"; pixel_y = 24; - req_access_txt = "66" + req_access = list(66) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -31868,8 +31847,7 @@ "ckx" = ( /obj/machinery/mecha_part_fabricator{ id = "0"; - name = "forgotten exosuit fabricator"; - req_access = "0" + name = "forgotten exosuit fabricator" }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -32280,7 +32258,7 @@ "cmn" = ( /obj/machinery/door/morgue{ name = "Confession Booth (Chaplain)"; - req_access_txt = "22" + req_access = list(22) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -32737,7 +32715,7 @@ id = "turbinevent"; name = "Turbine Vent Control"; pixel_y = -24; - req_access_txt = "12" + req_access = list(12) }, /obj/effect/decal/cleanable/dirt, /obj/structure/extinguisher_cabinet{ @@ -32779,14 +32757,14 @@ name = "Turbine Vent Control"; pixel_x = -8; pixel_y = -36; - req_access_txt = "12" + req_access = list(12) }, /obj/machinery/door_control{ id = "auxincineratorvent"; name = "Auxiliary Vent Control"; pixel_x = -8; pixel_y = -24; - req_access_txt = "12" + req_access = list(12) }, /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plasteel, @@ -32903,7 +32881,7 @@ id = "mechbay"; name = "Mech Bay Shutters Control"; pixel_y = 24; - req_access_txt = "29" + req_access = list(29) }, /turf/simulated/floor/plasteel, /area/station/science/robotics/chargebay) @@ -34500,7 +34478,7 @@ id = "Surgery 1"; pixel_x = -24; pixel_y = -4; - req_access_txt = "45" + req_access = list(45) }, /turf/simulated/floor/plasteel{ dir = 9; @@ -35907,7 +35885,7 @@ dir = 1; id = "BS"; pixel_y = -22; - req_access_txt = "67" + req_access = list(67) }, /turf/simulated/floor/carpet/blue, /area/station/command/office/blueshield) @@ -37782,7 +37760,7 @@ id = "imnotmakingyoulubepissoff"; name = "Chemistry Privacy Shutter Control"; pixel_y = -24; - req_access_txt = "33" + req_access = list(33) }, /obj/machinery/light, /turf/simulated/floor/plasteel{ @@ -38902,7 +38880,7 @@ "cMz" = ( /obj/machinery/door/morgue{ name = "Relic Closet"; - req_access_txt = "22" + req_access = list(22) }, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -39204,7 +39182,7 @@ id = "XenoPens"; name = "Xenobiology Shutters"; pixel_x = 24; - req_access_txt = "55" + req_access = list(55) }, /obj/machinery/camera{ c_tag = "Xenobiology Lab - Central Port"; @@ -39409,7 +39387,7 @@ "cOA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" + req_access = list(25) }, /obj/machinery/light_switch{ name = "north bump"; @@ -41499,7 +41477,7 @@ id = "Psych"; pixel_x = -24; pixel_y = 8; - req_access_txt = "64" + req_access = list(64) }, /obj/machinery/light_switch{ dir = 4; @@ -43553,7 +43531,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(8) }, /obj/item/target/alien, /obj/item/target/syndicate, @@ -44079,9 +44057,9 @@ /obj/machinery/button/windowtint{ pixel_x = 24; id = "qm"; - req_access_txt = "41"; dir = 8; - pixel_y = 5 + pixel_y = 5; + req_access = list(41) }, /turf/simulated/floor/plasteel, /area/station/supply/qm) @@ -44369,7 +44347,7 @@ id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_y = 26; - req_access_txt = "19" + req_access = list(19) }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -44660,7 +44638,7 @@ pixel_x = -6; pixel_y = 24; range = 4; - req_access_txt = "63" + req_access = list(63) }, /obj/machinery/light_switch{ name = "custom placement"; @@ -44911,8 +44889,8 @@ /obj/machinery/access_button{ autolink_id = "enginesm_btn_ext"; name = "Supermatter Access Button"; - req_access_txt = "10"; - pixel_x = 24 + pixel_x = 24; + req_access = list(10) }, /obj/machinery/camera{ c_tag = "Engineering - Central"; @@ -45439,7 +45417,6 @@ /obj/machinery/airlock_controller/air_cycler{ pixel_x = 9; pixel_y = -25; - req_access_txt = null; vent_link_id = "atmossouth_vent"; ext_door_link_id = "atmossouth_door_ext"; int_door_link_id = "atmossouth_door_int"; @@ -46259,7 +46236,7 @@ name = "Brig Lockdown"; pixel_x = -26; pixel_y = 7; - req_access_txt = "2" + req_access = list(2) }, /obj/machinery/camera{ c_tag = "Warden's Office"; @@ -47179,8 +47156,8 @@ /obj/machinery/access_button{ autolink_id = "atmossm_btn_ext"; name = "Atmospherics Access Button"; - req_access_txt = "24"; - pixel_x = 24 + pixel_x = 24; + req_access = list(24) }, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/simulated/floor/plasteel{ @@ -50830,7 +50807,7 @@ name = "interior access button"; pixel_x = 25; pixel_y = -7; - req_access_txt = "13" + req_access = list(13) }, /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/plasteel{ @@ -51025,6 +51002,26 @@ /obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel, /area/station/security/main) +"gvz" = ( +/obj/machinery/door_control{ + id = "qm_warehouse"; + name = "Warehouse Door Control"; + pixel_x = -24; + req_access = list(31) + }, +/obj/structure/table, +/obj/machinery/kitchen_machine/microwave{ + pixel_y = 6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light_switch{ + dir = 4; + name = "custom placement"; + pixel_x = -24; + pixel_y = -8 + }, +/turf/simulated/floor/plasteel, +/area/station/supply/warehouse) "gvJ" = ( /obj/structure/cable{ d1 = 4; @@ -51951,7 +51948,7 @@ id = "xenobio7"; name = "Xenobio Pen 7 Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access = list(55) }, /turf/simulated/floor/plasteel, /area/station/science/xenobiology) @@ -52445,7 +52442,7 @@ id = "armory"; name = "Armory Shutter"; pixel_y = -24; - req_access_txt = "3" + req_access = list(3) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -54333,7 +54330,7 @@ id = "paramedic"; name = "Garage Door Control"; pixel_y = -24; - req_access_txt = "66" + req_access = list(66) }, /obj/effect/turf_decal/stripes/corner, /obj/structure/disposalpipe/junction/reversed{ @@ -54671,7 +54668,7 @@ name = "Service Shutter Control"; pixel_x = 24; pixel_y = 24; - req_access_txt = "35" + req_access = list(35) }, /turf/simulated/floor/plasteel{ dir = 1; @@ -54690,7 +54687,7 @@ id = "xenobio8"; name = "Xenobio Pen 8 Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access = list(55) }, /obj/item/reagent_containers/spray/cleaner{ pixel_x = 5 @@ -56422,7 +56419,7 @@ id = "xenobio6"; name = "Xenobio Pen 6 Blast Doors"; pixel_y = 1; - req_access_txt = "55" + req_access = list(55) }, /turf/simulated/floor/plasteel, /area/station/science/xenobiology) @@ -57520,7 +57517,7 @@ name = "Xenobiology Access Button"; pixel_x = -3; pixel_y = 26; - req_access_txt = "55" + req_access = list(55) }, /turf/simulated/floor/plasteel{ icon_state = "whitepurplefull" @@ -58281,7 +58278,7 @@ autolink_id = "xeno_btn_ext"; name = "Xenobiology Access Button"; pixel_y = -24; - req_access_txt = "55" + req_access = list(55) }, /obj/structure/cable{ d1 = 4; @@ -59423,8 +59420,8 @@ /obj/machinery/access_button{ autolink_id = "atmossm_btn_int"; name = "Atmospherics Access Button"; - req_access_txt = "24"; - pixel_x = -24 + pixel_x = -24; + req_access = list(24) }, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/simulated/floor/plating, @@ -59586,15 +59583,15 @@ id = "Magistrate"; pixel_x = -24; pixel_y = 6; - req_access_txt = "74" + req_access = list(74) }, /obj/machinery/door_control{ id = "magistrateofficedoor"; name = "Office Door"; normaldoorcontrol = 1; pixel_x = -25; - req_access_txt = "74"; - pixel_y = -4 + pixel_y = -4; + req_access = list(74) }, /turf/simulated/floor/carpet, /area/station/legal/magistrate) @@ -61031,13 +61028,13 @@ normaldoorcontrol = 1; pixel_x = 6; pixel_y = 7; - req_access_txt = "63" + req_access = list(63) }, /obj/machinery/flasher_button{ id = "secentranceflasher"; name = "Brig Entrance Flash Control"; pixel_y = -3; - req_access_txt = "1" + req_access = list(1) }, /turf/simulated/floor/plasteel, /area/station/security/warden) @@ -61146,7 +61143,7 @@ name = "Atmospherics Lockdown"; pixel_x = -4; pixel_y = 24; - req_access_txt = "24" + req_access = list(24) }, /obj/machinery/light_switch{ name = "custom placement"; @@ -61260,7 +61257,7 @@ id = "xenobio4"; name = "Xenobio Pen 4 Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access = list(55) }, /turf/simulated/floor/plasteel, /area/station/science/xenobiology) @@ -62104,7 +62101,7 @@ id = "XenoPens"; name = "Xenobiology Shutters"; pixel_y = -24; - req_access_txt = "55" + req_access = list(55) }, /obj/item/book/manual/wiki/sop_science{ pixel_y = 4 @@ -62731,13 +62728,13 @@ /area/station/hallway/secondary/bridge) "lnd" = ( /obj/machinery/airlock_controller/air_cycler{ - req_access_txt = "10;13"; vent_link_id = "engine_vent"; ext_door_link_id = "engine_door_ext"; int_door_link_id = "engine_door_int"; pixel_y = 24; ext_button_link_id = "engine_btn_ext"; - int_button_link_id = "engine_btn_int" + int_button_link_id = "engine_btn_int"; + req_access = list(10,13) }, /turf/simulated/floor/plating, /area/station/engineering/control) @@ -63508,7 +63505,7 @@ name = "interior access button"; pixel_x = -22; pixel_y = 20; - req_access_txt = "10;13" + req_access = list(10,13) }, /obj/structure/lattice/catwalk, /turf/space, @@ -64198,7 +64195,7 @@ id = "xenobio1"; name = "Xenobio Pen 1 Blast Doors"; pixel_y = 1; - req_access_txt = "55" + req_access = list(55) }, /turf/simulated/floor/plasteel, /area/station/science/xenobiology) @@ -65597,7 +65594,7 @@ id = "CMO"; pixel_x = -7; pixel_y = -24; - req_access_txt = "40" + req_access = list(40) }, /obj/machinery/keycard_auth{ pixel_x = 7; @@ -67301,7 +67298,7 @@ name = "interior access button"; pixel_x = -22; pixel_y = -20; - req_access_txt = "10;13" + req_access = list(10,13) }, /turf/simulated/floor/engine, /area/station/engineering/control) @@ -68218,7 +68215,7 @@ name = "Service Shutter Control"; pixel_x = -24; pixel_y = -24; - req_access_txt = "28" + req_access = list(28) }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -71884,7 +71881,7 @@ name = "interior access button"; pixel_x = 25; pixel_y = -25; - req_access_txt = "13" + req_access = list(13) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -71970,11 +71967,11 @@ name = "Virology Lab Access Console"; pixel_x = 24; pixel_y = -24; - req_one_access_txt = "39"; ext_door_link_id = "viro_door_ext"; int_door_link_id = "viro_door_int"; ext_button_link_id = "viro_btn_ext"; - int_button_link_id = "viro_btn_int" + int_button_link_id = "viro_btn_int"; + req_access = list(39) }, /obj/structure/cable{ d1 = 4; @@ -74840,7 +74837,7 @@ id = "HoS"; pixel_x = -24; pixel_y = 6; - req_access_txt = "58" + req_access = list(58) }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -75253,7 +75250,7 @@ id = "Surgery 2"; pixel_x = 24; pixel_y = -4; - req_access_txt = "45" + req_access = list(45) }, /obj/machinery/holosign_switch{ dir = 8; @@ -75649,7 +75646,7 @@ id = "xenobio3"; name = "Xenobio Pen 3 Blast Doors"; pixel_y = 4; - req_access_txt = "55" + req_access = list(55) }, /turf/simulated/floor/plasteel, /area/station/science/xenobiology) @@ -75838,7 +75835,7 @@ name = "interrogation tint control"; pixel_x = -24; pixel_y = 6; - req_access_txt = "63" + req_access = list(63) }, /obj/structure/cable{ d1 = 2; @@ -78672,7 +78669,7 @@ id = "roboticsprivacy2"; name = "Robotics Shutters"; pixel_x = 24; - req_access_txt = "29" + req_access = list(29) }, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" @@ -79600,7 +79597,7 @@ name = "AI Chamber Turret Control"; pixel_x = 5; pixel_y = -24; - req_access_txt = "75" + req_access = list(75) }, /obj/machinery/flasher{ id = "AI"; @@ -80097,7 +80094,7 @@ name = "Robotics Privacy Control"; pixel_x = -26; pixel_y = 26; - req_access_txt = "29" + req_access = list(29) }, /turf/simulated/floor/plasteel, /area/station/science/robotics) @@ -80333,21 +80330,21 @@ name = "Justice Vent Control"; pixel_x = -26; pixel_y = 25; - req_access_txt = "3" + req_access = list(3) }, /obj/machinery/door_control{ id = "executionfireblast"; name = "Justice Area Lockdown"; pixel_x = -38; pixel_y = 25; - req_access_txt = "2" + req_access = list(2) }, /obj/machinery/ignition_switch{ id = "executionburn"; name = "Justice Ignition Switch"; pixel_x = -25; pixel_y = 36; - req_access_txt = "1" + req_access = list(1) }, /obj/machinery/flasher_button{ id = "justiceflash"; @@ -81634,7 +81631,7 @@ name = "exterior access button"; pixel_x = 25; pixel_y = -25; - req_access_txt = "13" + req_access = list(13) }, /turf/space, /area/space/nearstation) @@ -82320,8 +82317,7 @@ "tAF" = ( /obj/machinery/computer/prisoner{ dir = 1; - req_access = null; - req_access_txt = "2" + req_access = list(2) }, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -82866,7 +82862,7 @@ id = "IAA"; pixel_x = 24; pixel_y = 8; - req_access_txt = "38" + req_access = list(38) }, /turf/simulated/floor/carpet, /area/station/legal/lawoffice) @@ -85612,7 +85608,7 @@ name = "Chemistry Privacy Shutter Control"; pixel_x = 24; pixel_y = 24; - req_access_txt = "33" + req_access = list(33) }, /obj/machinery/chem_master, /turf/simulated/floor/plasteel{ @@ -85828,7 +85824,7 @@ name = "interior access button"; pixel_x = -25; pixel_y = -25; - req_access_txt = "13" + req_access = list(13) }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -85844,7 +85840,7 @@ name = "Toxins Access"; pixel_x = -27; pixel_y = 8; - req_access_txt = "8" + req_access = list(8) }, /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plasteel, @@ -86432,7 +86428,7 @@ name = "exterior access button"; pixel_x = -25; pixel_y = 7; - req_access_txt = "24;13" + req_access = list(24,13) }, /turf/simulated/floor/plating/airless, /area/station/engineering/atmos) @@ -88777,8 +88773,7 @@ "wAJ" = ( /obj/machinery/computer/prisoner{ dir = 8; - req_access = null; - req_access_txt = "2" + req_access = list(2) }, /turf/simulated/floor/plasteel{ dir = 8; @@ -89668,7 +89663,7 @@ name = "Virology Lab Access Button"; pixel_x = 8; pixel_y = -24; - req_access_txt = "39" + req_access = list(39) }, /obj/structure/cable{ d1 = 4; @@ -89743,7 +89738,7 @@ name = "Special Containment Blast Doors"; pixel_x = 4; pixel_y = -3; - req_access_txt = "55" + req_access = list(55) }, /obj/machinery/computer/security/telescreen{ desc = "Used for watching the special containment chamber."; @@ -89934,8 +89929,8 @@ /obj/machinery/access_button{ autolink_id = "enginesm_btn_int"; name = "Supermatter Access Button"; - req_access_txt = "10"; - pixel_x = 24 + pixel_x = 24; + req_access = list(10) }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -91689,7 +91684,7 @@ name = "Research Shutters Control"; pixel_x = 24; pixel_y = null; - req_access_txt = "7" + req_access = list(7) }, /obj/machinery/cell_charger, /turf/simulated/floor/plasteel{ @@ -91798,7 +91793,7 @@ name = "Experi-mentor shutters"; pixel_x = -25; pixel_y = null; - req_access_txt = "7" + req_access = list(7) }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -91990,8 +91985,8 @@ /obj/machinery/access_button{ autolink_id = "enginesm_btn_ext"; name = "Supermatter Access Button"; - req_access_txt = "10"; - pixel_x = -24 + pixel_x = -24; + req_access = list(10) }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -92216,7 +92211,7 @@ autolink_id = "viro_btn_ext"; name = "Virology Lab Access Button"; pixel_y = -24; - req_access_txt = "39" + req_access = list(39) }, /obj/structure/cable{ d1 = 4; @@ -92273,7 +92268,7 @@ id = "teleshutter"; name = "Teleporter Shutters Access Control"; pixel_x = -24; - req_access_txt = "62" + req_access = list(62) }, /turf/simulated/floor/plasteel, /area/station/command/teleporter) @@ -112382,7 +112377,7 @@ frx frx tWP aOB -aPR +gvz aWt gqF aTW diff --git a/_maps/map_files/templates/shelter_2.dmm b/_maps/map_files/templates/shelter_2.dmm index 86c7365cf34..df2b11ba477 100644 --- a/_maps/map_files/templates/shelter_2.dmm +++ b/_maps/map_files/templates/shelter_2.dmm @@ -123,8 +123,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(48) }, /turf/simulated/floor/carpet/black{ dir = 1 diff --git a/code/__DEFINES/access_defines.dm b/code/__DEFINES/access_defines.dm index 10b3c80ad65..b946f7a75ba 100644 --- a/code/__DEFINES/access_defines.dm +++ b/code/__DEFINES/access_defines.dm @@ -88,3 +88,4 @@ #define ACCESS_AWAY01 271 //! Access used for moonoutpost19 ruin. #define ACCESS_FREE_GOLEMS 300 //! Ghost role: free golems. #define ACCESS_THETA_STATION 301 //! Ghost role: Theta station. +#define ACCESS_DEEPSTORAGE 512 //! Space ruin: Deep Storage diff --git a/code/datums/status_effects/magic_disguise.dm b/code/datums/status_effects/magic_disguise.dm index f7bc83343b9..31f2b2ef0b2 100644 --- a/code/datums/status_effects/magic_disguise.dm +++ b/code/datums/status_effects/magic_disguise.dm @@ -44,7 +44,7 @@ caster_area = get_area(owner) for(var/obj/machinery/door/airlock/tmp in view(owner)) - if(get_area(tmp) == caster_area && !(tmp.req_access_txt == "0" && tmp.req_one_access_txt == "0")) //Ignore airlocks that arent in area or are public airlocks + if(get_area(tmp) == caster_area && (length(tmp.req_access) || length(tmp.req_one_access))) //Ignore airlocks that arent in area or are public airlocks AL = tmp break for(var/mob/living/carbon/human/disguise_source in shuffle(GLOB.player_list)) //Pick a random crewmember with access to this room diff --git a/code/game/area/areas/depot-areas.dm b/code/game/area/areas/depot-areas.dm index 7c25b50b623..dabbf83d947 100644 --- a/code/game/area/areas/depot-areas.dm +++ b/code/game/area/areas/depot-areas.dm @@ -183,7 +183,7 @@ for(var/mob/living/simple_animal/hostile/syndicate/N in src) N.a_intent = INTENT_HARM for(var/obj/machinery/door/airlock/A in src) - A.req_access_txt = "[ACCESS_SYNDICATE_LEADER]" + A.req_access = list(ACCESS_SYNDICATE_LEADER) for(var/obj/structure/closet/secure_closet/syndicate/depot/L in src) if(L.locked) L.locked = !L.locked diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 0587ffd3d44..629aad215de 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -15,26 +15,6 @@ else return check_access_list(acc) -/obj/proc/generate_req_lists() - //These generations have been moved out of /obj/New() because they were slowing down the creation of objects that never even used the access system. - if(!req_access) - req_access = list() - if(req_access_txt) - var/list/req_access_str = splittext(req_access_txt, ";") - for(var/x in req_access_str) - var/n = text2num(x) - if(n) - req_access += n - - if(!req_one_access) - req_one_access = list() - if(req_one_access_txt) - var/list/req_one_access_str = splittext(req_one_access_txt,";") - for(var/x in req_one_access_str) - var/n = text2num(x) - if(n) - req_one_access += n - /obj/proc/check_access(obj/item/I) var/list/L if(I) @@ -44,8 +24,6 @@ return check_access_list(L) /obj/proc/check_access_list(list/L) - generate_req_lists() - if(!L) return 0 if(!istype(L, /list)) diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 828fbb9001f..20c2c4e3f3d 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -367,11 +367,11 @@ /obj/machinery/door/airlock/hatch/syndicate name = "syndicate hatch" - req_access_txt = "150" + req_access = list(ACCESS_SYNDICATE) /obj/machinery/door/airlock/hatch/syndicate/command name = "Command Center" - req_access_txt = "153" + req_access = list(ACCESS_SYNDICATE_COMMAND) explosion_block = 2 normal_integrity = 1000 security_level = 6 @@ -398,7 +398,7 @@ /obj/machinery/door/airlock/hatch/syndicate/vault name = "syndicate vault hatch" - req_access_txt = "151" + req_access = list(ACCESS_SYNDICATE) icon = 'icons/obj/doors/airlocks/vault/vault.dmi' overlays_file = 'icons/obj/doors/airlocks/vault/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_vault diff --git a/code/game/machinery/vendors/contraband_vendors.dm b/code/game/machinery/vendors/contraband_vendors.dm index 10992d51c29..6b9d4d3542a 100644 --- a/code/game/machinery/vendors/contraband_vendors.dm +++ b/code/game/machinery/vendors/contraband_vendors.dm @@ -13,7 +13,7 @@ "Don't you want some?", "Ping!") - req_access_txt = "150" + req_access = list(ACCESS_SYNDICATE) products = list(/obj/item/stack/medical/bruise_pack = 2, /obj/item/stack/medical/ointment = 2, /obj/item/reagent_containers/syringe/charcoal = 4, @@ -107,7 +107,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/economy/vending/wallmed/syndicate, 32 desc = "An overwhelming amount of ancient patriotism washes over you just by looking at the machine." icon_state = "liberationstation" icon_lightmask = "liberationstation" - req_access_txt = "1" + req_access = list(ACCESS_SECURITY) slogan_list = list("Liberation Station: Your one-stop shop for all things second amendment!", "Be a patriot today, pick up a gun!", "Quality weapons for cheap prices!", diff --git a/code/game/machinery/vendors/departmental_vendors.dm b/code/game/machinery/vendors/departmental_vendors.dm index d19ccc0ea9b..63d9b65e5d1 100644 --- a/code/game/machinery/vendors/departmental_vendors.dm +++ b/code/game/machinery/vendors/departmental_vendors.dm @@ -5,7 +5,7 @@ icon_deny = "engivend_deny" icon_panel = "generic" category = VENDOR_TYPE_DEPARTMENTAL - req_one_access_txt = "11;24" // Engineers and atmos techs can use this + req_one_access = list(ACCESS_ENGINE_EQUIP, ACCESS_ATMOSPHERICS) products = list(/obj/item/clothing/glasses/meson/engine = 2, /obj/item/clothing/glasses/meson/engine/tray = 4, /obj/item/multitool = 4, @@ -28,7 +28,7 @@ icon_state = "engi" icon_deny = "engi_deny" category = VENDOR_TYPE_DEPARTMENTAL - req_access_txt = "11" + req_access = list(ACCESS_ENGINE_EQUIP) products = list(/obj/item/clothing/under/rank/engineering/chief_engineer = 4, /obj/item/clothing/under/rank/engineering/engineer = 40, /obj/item/clothing/shoes/workboots = 4, @@ -62,7 +62,7 @@ icon_deny = "robotics_deny" category = VENDOR_TYPE_DEPARTMENTAL icon_lightmask = "robotics" - req_access_txt = "29" + req_access = list(ACCESS_ROBOTICS) products = list(/obj/item/clothing/suit/storage/labcoat = 4, /obj/item/clothing/under/rank/rnd/roboticist = 4, /obj/item/stack/cable_coil = 4, /obj/item/flash = 4, @@ -253,7 +253,7 @@ "Don't you want some?", "Ping!") - req_access_txt = "5" + req_access = list(ACCESS_MEDICAL) category = VENDOR_TYPE_DEPARTMENTAL products = list(/obj/item/reagent_containers/hypospray/autoinjector/epinephrine = 4, /obj/item/stack/medical/bruise_pack/advanced = 2, @@ -331,7 +331,7 @@ icon_deny = "sec_deny" icon_panel = "wide_vendor" category = VENDOR_TYPE_DEPARTMENTAL - req_access_txt = "1" + req_access = list(ACCESS_SECURITY) products = list(/obj/item/restraints/handcuffs = 8, /obj/item/restraints/handcuffs/cable/zipties = 8, /obj/item/grenade/flashbang = 4, diff --git a/code/game/objects/effects/spawners/airlock_spawner.dm b/code/game/objects/effects/spawners/airlock_spawner.dm index cfeea9b4448..3fa3c557e4b 100644 --- a/code/game/objects/effects/spawners/airlock_spawner.dm +++ b/code/game/objects/effects/spawners/airlock_spawner.dm @@ -207,14 +207,10 @@ This spawner places pipe leading up to the interior door, you will need to finis // Since airlocks are created first, we steal the payload logic // to apply to the controls later req_access = airlock.req_access - req_access_txt = airlock.req_access_txt req_one_access = airlock.req_one_access - req_one_access_txt = airlock.req_one_access_txt else I.req_access = req_access - I.req_access_txt = req_access_txt I.req_one_access = req_one_access - I.req_one_access_txt = req_one_access_txt // MARK: AIRLOCK HELPERS diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 6848767af43..3d11a5dff23 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -34,10 +34,11 @@ var/emagged = FALSE // Access-related fields + + /// A list of accesses as defined by `code/__DEFINES/access_defines.dm`. All accesses are required when checking. var/list/req_access = null - var/req_access_txt = "0" + /// A list of accesses as defined by `code/__DEFINES/access_defines.dm`. At least one access is required when checking. var/list/req_one_access = null - var/req_one_access_txt = "0" /obj/Initialize(mapload) . = ..() diff --git a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm index 1690df3deff..599c9c3f1a3 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm @@ -10,7 +10,7 @@ var/open = FALSE var/animating = FALSE - req_one_access_txt = "24;10" + req_one_access = list(ACCESS_ENGINE, ACCESS_ATMOSPHERICS) /obj/machinery/atmospherics/binary/valve/examine(mob/user) . = ..() diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index c1b6dc49b04..4ef39f8aa2e 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -630,7 +630,7 @@ /obj/machinery/smartfridge/secure/circuits/aiupload/Initialize(mapload) . = ..() - req_access_txt = "[ACCESS_AI_UPLOAD]" + req_access = list(ACCESS_AI_UPLOAD) if(mapload && HAS_TRAIT(SSstation, STATION_TRAIT_UNIQUE_AI) && is_station_level(z)) drop_contents_on_delete = FALSE return INITIALIZE_HINT_QDEL @@ -649,7 +649,7 @@ /obj/machinery/smartfridge/secure/circuits/aiupload/experimental/Initialize(mapload) . = ..() - req_access_txt = "[ACCESS_RD]" + req_access = list(ACCESS_RD) /obj/machinery/smartfridge/secure/circuits/aiupload/highrisk name = "\improper High-Risk Laws Storage" @@ -665,7 +665,7 @@ /obj/machinery/smartfridge/secure/circuits/aiupload/highrisk/Initialize(mapload) . = ..() - req_access_txt = "[ACCESS_CAPTAIN]" + req_access = list(ACCESS_CAPTAIN) /** * # Refrigerated Medicine Storage @@ -702,7 +702,7 @@ /obj/machinery/smartfridge/secure/extract/Initialize(mapload) . = ..() - req_access_txt = "[ACCESS_RESEARCH]" + req_access = list(ACCESS_RESEARCH) accepted_items_typecache = typecacheof(list( /obj/item/slime_extract )) @@ -716,7 +716,7 @@ name = "\improper Secure Refrigerated Medicine Storage" desc = "A refrigerated storage unit for storing medicine and chemicals." icon_state = "smartfridge" //To fix the icon in the map editor. - req_one_access_txt = "5;33" + req_one_access = list(ACCESS_MEDICAL, ACCESS_CHEMISTRY) board_type = /obj/machinery/smartfridge/secure/medbay /obj/machinery/smartfridge/secure/medbay/Initialize(mapload) @@ -744,7 +744,7 @@ /obj/machinery/smartfridge/secure/chemistry/Initialize(mapload) . = ..() - req_access_txt = "[ACCESS_CHEMISTRY]" + req_access = list(ACCESS_CHEMISTRY) // Accepted items accepted_items_typecache = typecacheof(list( /obj/item/storage/pill_bottle, @@ -774,10 +774,6 @@ * A [Smart Chemical Storage (Preloaded)][/obj/machinery/smartfridge/secure/chemistry/preloaded] but with exclusive access to Syndicate. */ /obj/machinery/smartfridge/secure/chemistry/preloaded/syndicate - req_access_txt = null - -/obj/machinery/smartfridge/secure/chemistry/preloaded/syndicate/Initialize(mapload) - . = ..() req_access = list(ACCESS_SYNDICATE) /** @@ -840,10 +836,10 @@ desc = "A refrigerated storage unit for volatile sample storage." board_type = /obj/machinery/smartfridge/secure/chemistry/virology icon_addon = "smartfridge_virology" + req_access = list(ACCESS_VIROLOGY) /obj/machinery/smartfridge/secure/chemistry/virology/Initialize(mapload) . = ..() - req_access_txt = "[ACCESS_VIROLOGY]" accepted_items_typecache = typecacheof(list( /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/glass/bottle, @@ -876,7 +872,7 @@ * A [Smart Virus Storage (Preloaded)][/obj/machinery/smartfridge/secure/chemistry/virology/preloaded] but with exclusive access to Syndicate. */ /obj/machinery/smartfridge/secure/chemistry/virology/preloaded/syndicate - req_access_txt = null + req_access = list(ACCESS_SYNDICATE) /obj/machinery/smartfridge/secure/chemistry/virology/preloaded/syndicate/Initialize(mapload) starting_items = list( @@ -889,7 +885,6 @@ /obj/item/reagent_containers/glass/bottle/reagent/formaldehyde = 1 ) . = ..() - req_access = list(ACCESS_SYNDICATE) /** * # Drink Showcase diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm index 54582614ccf..5b9e943e04d 100644 --- a/code/modules/mapping/access_helpers.dm +++ b/code/modules/mapping/access_helpers.dm @@ -8,26 +8,23 @@ if(is_type_in_list(airlock, blacklist)) return - if(airlock.req_access_txt == "0") - // Overwrite if there is no access set, otherwise add onto existing access - if(airlock.req_one_access_txt == "0") - airlock.req_one_access_txt = "[access]" - else - airlock.req_one_access_txt += ";[access]" - else + if(length(airlock.req_access)) log_world("[src] at [AREACOORD(src)] tried to set req_one_access, but req_access was already set!") + return + + LAZYINITLIST(airlock.req_one_access) + airlock.req_one_access |= access /obj/effect/mapping_helpers/airlock/access/all/payload(obj/machinery/door/airlock/airlock) if(is_type_in_list(airlock, blacklist)) return - if(airlock.req_one_access_txt == "0") - if(airlock.req_access_txt == "0") - airlock.req_access_txt = "[access]" - else - airlock.req_access_txt += ";[access]" - else + if(length(airlock.req_one_access)) log_world("[src] at [AREACOORD(src)] tried to set req_access, but req_one_access was already set!") + return + + LAZYINITLIST(airlock.req_access) + airlock.req_access |= access // -------------------- Req Any (Only requires ONE of the given accesses to open) // -------------------- Command access helpers @@ -467,3 +464,37 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/mule_bot access = ACCESS_CARGO_BOT + +// Miscellaneous access helpers +/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage + access = ACCESS_DEEPSTORAGE + +/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19 + access = ACCESS_AWAY01 + +/obj/effect/mapping_helpers/airlock/access/all/ruins/theta + access = ACCESS_THETA_STATION + +/obj/effect/mapping_helpers/airlock/access/all/syndicate + access = ACCESS_SYNDICATE + +/obj/effect/mapping_helpers/airlock/access/all/centcomm/general + access = ACCESS_CENT_GENERAL + +/obj/effect/mapping_helpers/airlock/access/all/centcomm/security + access = ACCESS_CENT_SECURITY + +/obj/effect/mapping_helpers/airlock/access/all/centcomm/shuttles + access = ACCESS_CENT_SHUTTLES + +/obj/effect/mapping_helpers/airlock/access/all/centcomm/specops + access = ACCESS_CENT_SPECOPS + +/obj/effect/mapping_helpers/airlock/access/all/centcomm/commander + access = ACCESS_CENT_COMMANDER + +/obj/effect/mapping_helpers/airlock/access/all/shuttles/vox + access = ACCESS_VOX + +/obj/effect/mapping_helpers/airlock/access/all/centcomm/traders + access = ACCESS_TRADE_SOL diff --git a/code/modules/mapping/windoor_access_helpers.dm b/code/modules/mapping/windoor_access_helpers.dm index 8d3195cf9ca..d193060c9a5 100644 --- a/code/modules/mapping/windoor_access_helpers.dm +++ b/code/modules/mapping/windoor_access_helpers.dm @@ -11,30 +11,23 @@ return // Access already set in map edit - if(windoor.req_access_txt != "0") + if(length(windoor.req_access)) log_world("[src] at [AREACOORD(src)] tried to set req_one_access, but req_access was already set!") return - // Overwrite if there is no access set, otherwise add onto existing access - if(windoor.req_one_access_txt == "0") - windoor.req_one_access_txt = "[access]" - return - - windoor.req_one_access_txt += ";[access]" + LAZYINITLIST(windoor.req_one_access) + windoor.req_one_access |= access /obj/effect/mapping_helpers/airlock/windoor/access/all/payload(obj/machinery/door/window/windoor) if(windoor.dir != dir) return - if(windoor.req_one_access_txt != "0") + if(length(windoor.req_one_access)) log_world("[src] at [AREACOORD(src)] tried to set req_access, but req_one_access was already set!") return - if(windoor.req_access_txt == "0") - windoor.req_access_txt = "[access]" - return - - windoor.req_access_txt += ";[access]" + LAZYINITLIST(windoor.req_access) + windoor.req_access |= access // -------------------- Req Any (Only requires ONE of the given accesses to open) // -------------------- Command access helpers diff --git a/tools/UpdatePaths/Scripts/26907_req_access_refactor.txt b/tools/UpdatePaths/Scripts/26907_req_access_refactor.txt new file mode 100644 index 00000000000..b5dfabbb5eb --- /dev/null +++ b/tools/UpdatePaths/Scripts/26907_req_access_refactor.txt @@ -0,0 +1,96 @@ +/obj/machinery/door/airlock/@SUBTYPES{req_access_txt="101"} : /obj/effect/mapping_helpers/airlock/access/all/centcomm/general, /obj/machinery/door/airlock/@SUBTYPES{@OLD;req_access_txt=@SKIP} +/obj/machinery/door/airlock/@SUBTYPES{req_access_txt="104"} : /obj/effect/mapping_helpers/airlock/access/all/centcomm/security, /obj/machinery/door/airlock/@SUBTYPES{@OLD;req_access_txt=@SKIP} +/obj/machinery/door/airlock/@SUBTYPES{req_access_txt="106"} : /obj/effect/mapping_helpers/airlock/access/all/centcomm/shuttles, /obj/machinery/door/airlock/@SUBTYPES{@OLD;req_access_txt=@SKIP} +/obj/machinery/door/airlock/@SUBTYPES{req_access_txt="109"} : /obj/effect/mapping_helpers/airlock/access/all/centcomm/specops, /obj/machinery/door/airlock/@SUBTYPES{@OLD;req_access_txt=@SKIP} +/obj/machinery/door/airlock/@SUBTYPES{req_access_txt="114"} : /obj/effect/mapping_helpers/airlock/access/all/centcomm/commander, /obj/machinery/door/airlock/@SUBTYPES{@OLD;req_access_txt=@SKIP} +/obj/machinery/door/airlock/@SUBTYPES{req_access_txt="48"} : /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /obj/machinery/door/airlock/@SUBTYPES{@OLD;req_access_txt=@SKIP} +/obj/machinery/door/airlock/@SUBTYPES{req_access_txt="61"} : /obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, /obj/machinery/door/airlock/@SUBTYPES{@OLD;req_access_txt=@SKIP} +/obj/machinery/door/airlock/@SUBTYPES{req_access_txt="150"} : /obj/effect/mapping_helpers/airlock/access/all/syndicate, /obj/machinery/door/airlock/@SUBTYPES{@OLD;req_access_txt=@SKIP} +/obj/machinery/door/airlock/@SUBTYPES{req_access_txt="152"} : /obj/effect/mapping_helpers/airlock/access/all/shuttles/vox, /obj/machinery/door/airlock/@SUBTYPES{@OLD;req_access_txt=@SKIP} +/obj/machinery/door/airlock/@SUBTYPES{req_access_txt="160"} : /obj/effect/mapping_helpers/airlock/access/all/centcomm/traders, /obj/machinery/door/airlock/@SUBTYPES{@OLD;req_access_txt=@SKIP} +/obj/machinery/door/airlock/@SUBTYPES{req_access_txt="271"} : /obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19, /obj/machinery/door/airlock/@SUBTYPES{@OLD;req_access_txt=@SKIP} +/obj/machinery/door/airlock/@SUBTYPES{req_access_txt="301"} : /obj/effect/mapping_helpers/airlock/access/all/ruins/theta, /obj/machinery/door/airlock/@SUBTYPES{@OLD;req_access_txt=@SKIP} +/obj/machinery/door/airlock/@SUBTYPES{req_access_txt="512"} : /obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage, /obj/machinery/door/airlock/@SUBTYPES{@OLD;req_access_txt=@SKIP} +/obj/machinery/door/airlock/@SUBTYPES{req_one_access_txt="301"} : /obj/effect/mapping_helpers/airlock/access/all/ruins/theta, /obj/machinery/door/airlock/@SUBTYPES{@OLD;req_one_access_txt=@SKIP} + +/obj/@SUBTYPES{req_access_txt="0"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP} +/obj/@SUBTYPES{req_access_txt="1"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(1)} +/obj/@SUBTYPES{req_access_txt="10;11"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(10,11)} +/obj/@SUBTYPES{req_access_txt="10;13"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(10,13)} +/obj/@SUBTYPES{req_access_txt="10"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(10)} +/obj/@SUBTYPES{req_access_txt="101"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(101)} +/obj/@SUBTYPES{req_access_txt="102"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(102)} +/obj/@SUBTYPES{req_access_txt="104"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(104)} +/obj/@SUBTYPES{req_access_txt="109"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(109)} +/obj/@SUBTYPES{req_access_txt="11"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(11)} +/obj/@SUBTYPES{req_access_txt="114"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(114)} +/obj/@SUBTYPES{req_access_txt="12"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(12)} +/obj/@SUBTYPES{req_access_txt="13"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(13)} +/obj/@SUBTYPES{req_access_txt="150"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(150)} +/obj/@SUBTYPES{req_access_txt="151"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(151)} +/obj/@SUBTYPES{req_access_txt="152"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(152)} +/obj/@SUBTYPES{req_access_txt="153"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(153)} +/obj/@SUBTYPES{req_access_txt="160"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(160)} +/obj/@SUBTYPES{req_access_txt="17;75"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(17,75)} +/obj/@SUBTYPES{req_access_txt="17"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(17)} +/obj/@SUBTYPES{req_access_txt="19"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(19)} +/obj/@SUBTYPES{req_access_txt="2"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(2)} +/obj/@SUBTYPES{req_access_txt="22"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(22)} +/obj/@SUBTYPES{req_access_txt="24;13"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(24,13)} +/obj/@SUBTYPES{req_access_txt="24"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(24)} +/obj/@SUBTYPES{req_access_txt="25"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(25)} +/obj/@SUBTYPES{req_access_txt="26"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(26)} +/obj/@SUBTYPES{req_access_txt="271"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(271)} +/obj/@SUBTYPES{req_access_txt="28"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(28)} +/obj/@SUBTYPES{req_access_txt="29"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(29)} +/obj/@SUBTYPES{req_access_txt="3"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(3)} +/obj/@SUBTYPES{req_access_txt="30"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(30)} +/obj/@SUBTYPES{req_access_txt="31"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(31)} +/obj/@SUBTYPES{req_access_txt="32"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(32)} +/obj/@SUBTYPES{req_access_txt="33"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(33)} +/obj/@SUBTYPES{req_access_txt="35"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(35)} +/obj/@SUBTYPES{req_access_txt="37"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(37)} +/obj/@SUBTYPES{req_access_txt="38"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(38)} +/obj/@SUBTYPES{req_access_txt="39"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(39)} +/obj/@SUBTYPES{req_access_txt="4"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(4)} +/obj/@SUBTYPES{req_access_txt="40"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(40)} +/obj/@SUBTYPES{req_access_txt="41"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(41)} +/obj/@SUBTYPES{req_access_txt="45"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(45)} +/obj/@SUBTYPES{req_access_txt="47"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(47)} +/obj/@SUBTYPES{req_access_txt="48"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(48)} +/obj/@SUBTYPES{req_access_txt="54"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(54)} +/obj/@SUBTYPES{req_access_txt="55"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(55)} +/obj/@SUBTYPES{req_access_txt="56"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(56)} +/obj/@SUBTYPES{req_access_txt="57"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(57)} +/obj/@SUBTYPES{req_access_txt="58"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(58)} +/obj/@SUBTYPES{req_access_txt="62"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(62)} +/obj/@SUBTYPES{req_access_txt="63"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(63)} +/obj/@SUBTYPES{req_access_txt="64"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(64)} +/obj/@SUBTYPES{req_access_txt="66"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(66)} +/obj/@SUBTYPES{req_access_txt="67"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(67)} +/obj/@SUBTYPES{req_access_txt="7"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(7)} +/obj/@SUBTYPES{req_access_txt="73"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(73)} +/obj/@SUBTYPES{req_access_txt="74"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(74)} +/obj/@SUBTYPES{req_access_txt="75;13"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(75,13)} +/obj/@SUBTYPES{req_access_txt="75"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(75)} +/obj/@SUBTYPES{req_access_txt="8"} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP;req_access=list(8)} +/obj/@SUBTYPES{req_access_txt=null} : /obj/@SUBTYPES{@OLD;req_access_txt=@SKIP} +/obj/@SUBTYPES{req_access="0"} : /obj/@SUBTYPES{@OLD;req_access=@SKIP} +/obj/@SUBTYPES{req_one_access_txt="150"} : /obj/@SUBTYPES{@OLD;req_one_access_txt=@SKIP;req_access=list(150)} +/obj/@SUBTYPES{req_one_access_txt="150"} : /obj/@SUBTYPES{@OLD;req_one_access_txt=@SKIP;req_access=list(150)} +/obj/@SUBTYPES{req_one_access_txt="152"} : /obj/@SUBTYPES{@OLD;req_one_access_txt=@SKIP;req_access=list(152)} +/obj/@SUBTYPES{req_one_access_txt="152"} : /obj/@SUBTYPES{@OLD;req_one_access_txt=@SKIP;req_access=list(152)} +/obj/@SUBTYPES{req_one_access_txt="17;75"} : /obj/@SUBTYPES{@OLD;req_one_access_txt=@SKIP;req_one_access=list(17,75)} +/obj/@SUBTYPES{req_one_access_txt="18"} : /obj/@SUBTYPES{@OLD;req_one_access_txt=@SKIP;req_access=list(18)} +/obj/@SUBTYPES{req_one_access_txt="19;14"} : /obj/@SUBTYPES{@OLD;req_one_access_txt=@SKIP;req_one_access=list(19,14)} +/obj/@SUBTYPES{req_one_access_txt="19;41"} : /obj/@SUBTYPES{@OLD;req_one_access_txt=@SKIP;req_one_access=list(19,41)} +/obj/@SUBTYPES{req_one_access_txt="19"} : /obj/@SUBTYPES{@OLD;req_one_access_txt=@SKIP;req_access=list(19)} +/obj/@SUBTYPES{req_one_access_txt="2"} : /obj/@SUBTYPES{@OLD;req_one_access_txt=@SKIP;req_access=list(2)} +/obj/@SUBTYPES{req_one_access_txt="20"} : /obj/@SUBTYPES{@OLD;req_one_access_txt=@SKIP;req_access=list(20)} +/obj/@SUBTYPES{req_one_access_txt="28;35"} : /obj/@SUBTYPES{@OLD;req_one_access_txt=@SKIP;req_one_access=list(28,35)} +/obj/@SUBTYPES{req_one_access_txt="33;41"} : /obj/@SUBTYPES{@OLD;req_one_access_txt=@SKIP;req_one_access=list(33,41)} +/obj/@SUBTYPES{req_one_access_txt="39"} : /obj/@SUBTYPES{@OLD;req_one_access_txt=@SKIP;req_access=list(39)} +/obj/@SUBTYPES{req_one_access_txt="57"} : /obj/@SUBTYPES{@OLD;req_one_access_txt=@SKIP;req_access=list(57)} +/obj/@SUBTYPES{req_one_access_txt="62"} : /obj/@SUBTYPES{@OLD;req_one_access_txt=@SKIP;req_access=list(62)} +/obj/@SUBTYPES{req_one_access_txt="74;3"} : /obj/@SUBTYPES{@OLD;req_one_access_txt=@SKIP;req_one_access=list(74,3)} +/obj/@SUBTYPES{req_one_access_txt="75"} : /obj/@SUBTYPES{@OLD;req_one_access_txt=@SKIP;req_access=list(75)} diff --git a/tools/UpdatePaths/__main__.py b/tools/UpdatePaths/__main__.py index 477b1f125ae..0f0eb75488c 100644 --- a/tools/UpdatePaths/__main__.py +++ b/tools/UpdatePaths/__main__.py @@ -32,6 +32,10 @@ Old paths properties: default_map_directory = "../../_maps" replacement_re = re.compile(r'\s*(?P[^{]*)\s*(\{(?P.*)\})?') +# Specifically for separating out new paths once split from the line +# This was originally done by splitting on commas but that's not great +new_paths_re = re.compile(r'(?:\/[@\w]+)+\/?(?:{.*?})?') + #urgent todo: replace with actual parser, this is slow as janitor in crit split_re = re.compile(r'((?:[A-Za-z0-9_\-$]+)\s*=\s*(?:"(?:.+?)"|[^";][^;]*)|@OLD);?') @@ -68,8 +72,8 @@ def update_path(dmm_data, replacement_string, verbose=False): old_path_part, new_path_part = replacement_string.split(':', maxsplit=1) old_path, old_path_props = parse_rep_string(old_path_part, verbose) new_paths = list() - for replacement_def in new_path_part.split(','): - new_path, new_path_props = parse_rep_string(replacement_def, verbose) + for match in new_paths_re.finditer(new_path_part): + new_path, new_path_props = parse_rep_string(match.group(), verbose) new_paths.append((new_path, new_path_props)) subtypes = "" diff --git a/tools/maplint/lints/airlock_spawner_varedits.yml b/tools/maplint/lints/airlock_spawner_varedits.yml index 011faa4461e..5f1d2fcd376 100644 --- a/tools/maplint/lints/airlock_spawner_varedits.yml +++ b/tools/maplint/lints/airlock_spawner_varedits.yml @@ -1,7 +1,5 @@ -help: "Please use access helpers for airlock spawners, placed one tile north and east of the spawner itself." +help: 'Please use access helpers for airlock spawners, placed one tile north and east of the spawner itself.' /obj/effect/spawner/airlock: banned_variables: - - req_access - - req_access_txt - - req_one_access - - req_one_access_txt + - req_access + - req_one_access