From 5a18ff0bbb0d76737cf24fcad38b21344d11420b Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 12 Jan 2023 17:43:52 +0100 Subject: [PATCH] [MIRROR] Completely Culls req_access_txt/req_one_access_txt [MDB IGNORE] (#18458) * Completely Culls req_access_txt/req_one_access_txt (#72281) Hey there, Now that every instance of `req_access` and `req_one_access` is a list of strings, there is absolutely no reason for req_access_txt/req_access_one_txt to exist. In fact, any instance where they were still used in the codebase was very convoluted and was very broken! Don't worry, I fixed it all out, and life is good. I also dmdoc the surviving access variables, because those were missing. I went on the side of caution and made a more verbose documentation with an example just to have people really grasp this (it took me a while to actually get it) I believe that we changed _everything_ over to the req_access/req_one_access system earlier this year in VV, but the problem is that _new mappers don't understand the difference between the two systems_. In fact, the "txt" system is completely redundant since all it does is transition stuff to the "base" system. So, let's just completely cull the one that's all but deprecated and ensure this confusion no longer arises. The whole purpose of "txt" seemed to be to convert the access, but it's all pointless now that we can just read the list directly. I'm also 99% certain that the "access check" on vending machines broke (and didn't seem to have correct logic in the first place? I legitimately couldn't find a case where it could fail in testing, so I changed that up), and that's fixed up now. Let me know if I was clueless there. I know it's short-circuiting now as opposed to "all must be true", but it just didn't work. * Completely Culls req_access_txt/req_one_access_txt * oh the misery * makes them use the thing that actually works * test to see if engineering access is breaking it * Revert "test to see if engineering access is breaking it" This reverts commit 3cc2c554ff18f435a51601782e64c76193298db7. * Fix access checks when req_access is null (#72458) ## About The Pull Request Fixes #72450 - This seems to be an oversight in some of the access refactors we've been through recently. When there was an assumption in `check_access_list()` that `req_access` would always be a list, and that if it was not something terrible had gone wrong and the door should default to public access. With the cleanup of the _txt access vars and the introduction of mapping access helpers, this assumption is no longer true. `req_access` will be null when multiple helpers are painted onto the same door, so we need to handle that properly. Thanks to @MrMelbert for spitting out the attached fix in mapping general and letting me PR it after testing. This really needs a suite of unit tests around it. San has helpfully volunteered to work on that for three hours before getting frustrated. ## Why It's Good For The Game No more public access to engineering lobby, lathe, etc. ## Changelog :cl: Vire, MrMelbert fix: The engineering lobby and lathe are no longer public access fix: Doors will no longer be treated as public access when they have multiple accesses set on them /:cl: Co-authored-by: san7890 Co-authored-by: Paxilmaniac Co-authored-by: Vire <66576896+Maurukas@users.noreply.github.com> Co-authored-by: Tastyfish --- .../SpaceRuins/skyrat/cargodiselost.dmm | 2 +- .../SpaceRuins/skyrat/dangerous_research.dmm | 3 +- .../SpaceRuins/skyrat/piratefort.dmm | 204 +- .../SpaceRuins/spacehotel_skyrat.dmm | 10 +- _maps/RandomZLevels/blackmesa.dmm | 116 +- _maps/RandomZLevels/mothership_astrum.dmm | 2 +- _maps/RandomZLevels/research2.dmm | 6 +- _maps/map_files/MetaStation/MetaStation.dmm | 354 +-- _maps/map_files/VoidRaptor/VoidRaptor.dmm | 1898 ++++++++--------- _maps/map_files/generic/CentCom_skyrat_z2.dmm | 10 +- .../maintenance_upperbridgeright_1.dmm | 2 +- .../maintenance_upperbridgeright_2.dmm | 2 +- _maps/shuttles/skyrat/slaver_syndie.dmm | 8 +- .../templates/centcom/centcom_ferry_dock.dmm | 2 +- _maps/skyrat/xenoarch_base.dmm | 16 +- code/game/machinery/buttons.dm | 4 +- code/game/machinery/doors/airlock.dm | 1 - code/game/machinery/doors/airlock_types.dm | 2 +- code/game/objects/objs.dm | 7 +- .../structures/crates_lockers/closets.dm | 1 - code/modules/jobs/access.dm | 29 +- code/modules/vending/_vending.dm | 27 +- code/modules/vending/snack.dm | 2 +- .../wiremod/components/id/access_checker.dm | 4 - .../maps/shuttles/tradership_faction.dmm | 42 +- 25 files changed, 1353 insertions(+), 1401 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm index df39764e442..514cfa08218 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm @@ -2655,7 +2655,7 @@ /obj/effect/turf_decal/bot, /obj/effect/spawner/random/exotic/tool, /obj/structure/closet/crate/secure/engineering{ - req_one_access_txt = "150" + req_one_access = list("syndicate") }, /obj/effect/spawner/random/exotic/tool, /turf/open/floor/iron, diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/dangerous_research.dmm index 65975697f76..360969ff452 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/dangerous_research.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/dangerous_research.dmm @@ -2187,8 +2187,7 @@ /obj/machinery/computer/med_data/laptop{ dir = 8; pixel_y = 1; - req_one_access = null; - req_one_access_txt = "4;5;9" + req_one_access = list("detective","medical","genetics") }, /turf/open/floor/iron/dark, /area/ruin/space/has_grav) diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/piratefort.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/piratefort.dmm index 1d4f6fe9222..764dd59e3c8 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/piratefort.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/piratefort.dmm @@ -148,13 +148,6 @@ /obj/item/modular_computer/laptop/preset, /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/powered) -"fB" = ( -/obj/machinery/door/airlock/highsecurity{ - name = "Loot Storage"; - req_access_txt = "19;23" - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/powered) "fK" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 @@ -201,6 +194,17 @@ /obj/effect/turf_decal/tile/brown/full, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/powered) +"gl" = ( +/mob/living/basic/syndicate/ranged{ + desc = "Yarr-harr fiddley dee."; + faction = list("pirate"); + name = "Pirate Operative" + }, +/obj/effect/turf_decal/trimline/dark_red/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/powered) "gy" = ( /obj/structure/table, /obj/machinery/microwave, @@ -216,6 +220,16 @@ /obj/item/modular_computer/pda/cargo, /turf/open/floor/wood, /area/ruin/space/has_grav/powered) +"gZ" = ( +/mob/living/basic/carp/mega{ + faction = list("pirate"); + health = 50; + maxHealth = 50; + name = "Jack" + }, +/obj/effect/turf_decal/trimline/dark_red/filled/line, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/powered) "hd" = ( /obj/effect/turf_decal/trimline/dark_red/filled/corner{ dir = 8 @@ -276,16 +290,6 @@ }, /turf/open/floor/carpet, /area/ruin/space/has_grav/powered) -"jO" = ( -/mob/living/basic/carp/mega{ - faction = list("pirate"); - health = 50; - maxHealth = 50; - name = "Jack" - }, -/obj/effect/turf_decal/trimline/dark_red/filled/line, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/powered) "kb" = ( /turf/open/misc/asteroid/lowpressure, /area/ruin/space) @@ -326,17 +330,6 @@ /obj/machinery/vending/toyliberationstation, /turf/open/floor/wood, /area/ruin/space/has_grav/powered) -"lq" = ( -/mob/living/basic/syndicate/ranged{ - desc = "Yarr-harr fiddley dee."; - faction = list("pirate"); - name = "Pirate Operative" - }, -/obj/effect/turf_decal/trimline/dark_red/filled/corner{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/powered) "lC" = ( /obj/structure/lattice/catwalk, /obj/structure/marker_beacon/burgundy, @@ -369,6 +362,18 @@ }, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/powered) +"na" = ( +/mob/living/basic/syndicate/melee{ + desc = "Yo-ho-ho he took a bite'a gum-gum."; + faction = list("pirate"); + name = "Pirate Operative" + }, +/obj/effect/turf_decal/trimline/dark_red/filled/line, +/obj/effect/turf_decal/trimline/dark_red/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/powered) "nf" = ( /obj/effect/turf_decal/trimline/dark_red/filled/line{ dir = 1 @@ -376,6 +381,13 @@ /obj/effect/turf_decal/trimline/dark_red/filled/line, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/powered) +"nj" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Prison Cell"; + req_access = list("command","tech_storage") + }, +/turf/open/floor/engine, +/area/ruin/space/has_grav/powered) "nw" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/large, @@ -433,7 +445,7 @@ "oZ" = ( /turf/open/floor/engine, /area/ruin/space) -"pf" = ( +"pu" = ( /mob/living/basic/syndicate/ranged{ desc = "Yarr-harr fiddley dee."; faction = list("pirate"); @@ -456,13 +468,6 @@ }, /turf/open/floor/wood, /area/ruin/space/has_grav/powered) -"pF" = ( -/obj/machinery/door/airlock/highsecurity{ - name = "Armory"; - req_access_txt = "19;23" - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/powered) "pS" = ( /mob/living/simple_animal/hostile/pirate/melee, /obj/effect/turf_decal/trimline/dark_red/filled/line{ @@ -470,17 +475,6 @@ }, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/powered) -"pT" = ( -/mob/living/basic/syndicate/melee{ - desc = "Yo-ho-ho he took a bite'a gum-gum."; - faction = list("pirate"); - name = "Pirate Operative" - }, -/obj/effect/turf_decal/trimline/dark_red/filled/line{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/powered) "pV" = ( /obj/machinery/computer{ dir = 1 @@ -496,6 +490,14 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/powered) +"qy" = ( +/mob/living/basic/syndicate/melee{ + desc = "Yo-ho-ho he took a bite'a gum-gum."; + faction = list("pirate"); + name = "Pirate Operative" + }, +/turf/open/floor/wood, +/area/ruin/space/has_grav/powered) "qX" = ( /obj/structure/closet/secure_closet/freezer/meat{ req_access = null @@ -564,13 +566,6 @@ }, /turf/open/floor/wood, /area/ruin/space/has_grav/powered) -"tA" = ( -/obj/machinery/door/airlock/highsecurity{ - name = "Prison Cell"; - req_access_txt = "19;23" - }, -/turf/open/floor/engine, -/area/ruin/space/has_grav/powered) "tC" = ( /obj/structure/closet/crate/secure{ req_access = list("armory") @@ -738,6 +733,17 @@ }, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/powered) +"xD" = ( +/mob/living/basic/syndicate/melee{ + desc = "Yo-ho-ho he took a bite'a gum-gum."; + faction = list("pirate"); + name = "Pirate Operative" + }, +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/powered) "xL" = ( /obj/structure/table, /obj/item/reagent_containers/cocaine, @@ -867,7 +873,7 @@ }, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/powered) -"Cj" = ( +"BV" = ( /mob/living/basic/syndicate/ranged{ desc = "Yarr-harr fiddley dee."; faction = list("pirate"); @@ -989,6 +995,13 @@ }, /turf/open/floor/wood, /area/ruin/space/has_grav/powered) +"FL" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Loot Storage"; + req_access = list("command","tech_storage") + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/powered) "FP" = ( /obj/effect/turf_decal/trimline/dark_red/filled/line{ dir = 5 @@ -1042,18 +1055,6 @@ /obj/effect/spawner/random/engineering/material_cheap, /turf/open/floor/engine, /area/ruin/space/has_grav/powered) -"HP" = ( -/mob/living/basic/syndicate/melee{ - desc = "Yo-ho-ho he took a bite'a gum-gum."; - faction = list("pirate"); - name = "Pirate Operative" - }, -/obj/effect/turf_decal/trimline/dark_red/filled/line, -/obj/effect/turf_decal/trimline/dark_red/filled/corner{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/powered) "Iy" = ( /obj/structure/table/wood, /turf/open/floor/wood, @@ -1064,14 +1065,6 @@ }, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/powered) -"Jl" = ( -/mob/living/basic/syndicate/melee{ - desc = "Yo-ho-ho he took a bite'a gum-gum."; - faction = list("pirate"); - name = "Pirate Operative" - }, -/turf/open/floor/wood, -/area/ruin/space/has_grav/powered) "Js" = ( /turf/open/floor/wood, /area/ruin/space/has_grav/powered) @@ -1147,20 +1140,6 @@ /obj/effect/turf_decal/tile/brown/full, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/powered) -"MG" = ( -/mob/living/basic/syndicate/melee{ - desc = "Yo-ho-ho he took a bite'a gum-gum."; - faction = list("pirate"); - name = "Pirate Operative" - }, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/powered) "MX" = ( /obj/machinery/computer/slot_machine, /turf/open/floor/wood, @@ -1179,6 +1158,20 @@ }, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/powered) +"Nz" = ( +/mob/living/basic/syndicate/melee{ + desc = "Yo-ho-ho he took a bite'a gum-gum."; + faction = list("pirate"); + name = "Pirate Operative" + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/powered) "NJ" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/large, @@ -1204,6 +1197,13 @@ /obj/effect/turf_decal/tile/dark_red/fourcorners, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/powered) +"Oo" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Armory"; + req_access = list("command","tech_storage") + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/powered) "Ph" = ( /obj/structure/marker_beacon/burgundy, /turf/open/floor/engine, @@ -1986,14 +1986,14 @@ oR hl xg eV -MG +Nz Et fN oR WT us Js -Jl +qy Js Js Js @@ -2071,7 +2071,7 @@ oR oR oR oR -fB +FL oR oR yr @@ -2194,11 +2194,11 @@ Js Js oR Gm -Cj +BV dP dP dP -jO +gZ oR qX us @@ -2297,8 +2297,8 @@ oR oR oR oR -pF -pF +Oo +Oo oR oR FP @@ -2382,7 +2382,7 @@ rA AA uc Zj -HP +na pV oR Gm @@ -2457,7 +2457,7 @@ Kj Kj Kj Kj -pT +xD Kj zx oR @@ -2546,7 +2546,7 @@ Js pA oR Dy -pf +pu hN hN hN @@ -2613,7 +2613,7 @@ vY kh oR FP -lq +gl dP dP dP @@ -2630,11 +2630,11 @@ Js Js oR oR -tA +nj oR nf oR -tA +nj oR oR oR diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm index b52559b8953..edde37a037c 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm @@ -903,7 +903,7 @@ "fj" = ( /obj/machinery/door/airlock/maintenance{ name = "Hotel Maintenance"; - req_access_txt = "200,201" + req_access = list("away_general","away_command") }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/all/away/maintenance, @@ -1618,7 +1618,7 @@ "ij" = ( /obj/machinery/door/airlock/maintenance{ name = "Hotel Maintenance"; - req_access_txt = "200,201" + req_access = list("away_general","away_command") }, /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -1739,7 +1739,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/airlock/engineering{ name = "Power Storage"; - req_access_txt = "200,201" + req_access = list("away_general","away_command") }, /obj/effect/mapping_helpers/airlock/access/all/away/maintenance, /obj/structure/disposalpipe/segment{ @@ -2622,7 +2622,7 @@ "mx" = ( /obj/machinery/door/airlock{ name = "Custodial Closet"; - req_access_txt = "200,201" + req_access = list("away_general","away_command") }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -7822,7 +7822,7 @@ "Vk" = ( /obj/machinery/door/airlock/maintenance{ name = "Hotel Maintenance"; - req_access_txt = "200,201" + req_access = list("away_general","away_command") }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, diff --git a/_maps/RandomZLevels/blackmesa.dmm b/_maps/RandomZLevels/blackmesa.dmm index 4e662d515e0..ece540e92c4 100644 --- a/_maps/RandomZLevels/blackmesa.dmm +++ b/_maps/RandomZLevels/blackmesa.dmm @@ -2665,14 +2665,6 @@ /obj/item/paper, /turf/open/floor/iron, /area/awaymission/black_mesa/security_outpost) -"aHj" = ( -/obj/machinery/door/airlock/security{ - name = "Brig"; - req_access_txt = "63; 42" - }, -/obj/effect/mapping_helpers/airlock/locked, -/turf/open/floor/iron/smooth_large, -/area/awaymission/black_mesa/gas_emitter_chamber) "aHk" = ( /obj/structure/lattice/catwalk, /turf/open/chasm, @@ -3472,13 +3464,6 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/textured, /area/awaymission/black_mesa/entrance_hall) -"aRj" = ( -/obj/machinery/door/airlock/security{ - name = "Brig"; - req_access_txt = "63; 42" - }, -/turf/open/floor/iron, -/area/awaymission/black_mesa/entrance_lobby) "aRk" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor{ @@ -4704,6 +4689,11 @@ /obj/structure/table/optable, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa/xen/acid_lake_building) +"ccv" = ( +/obj/effect/spawner/liquids_spawner, +/mob/living/basic/carp/mega, +/turf/open/floor/iron/pool, +/area/awaymission/black_mesa/deep_sci_feesh) "ccX" = ( /obj/structure/curtain/cloth{ color = "#556B2F" @@ -5233,11 +5223,6 @@ }, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa/black_ops_bus) -"cXv" = ( -/obj/effect/spawner/liquids_spawner, -/mob/living/basic/carp/mega, -/turf/open/floor/iron/pool, -/area/awaymission/black_mesa/deep_sci_feesh) "cXw" = ( /obj/effect/turf_decal/stripes{ dir = 5 @@ -6716,11 +6701,6 @@ dir = 5 }, /area/awaymission/black_mesa/xen/lost_camp_hallway) -"fQk" = ( -/mob/living/basic/carp/mega, -/obj/effect/spawner/liquids_spawner, -/turf/open/floor/iron/pool, -/area/awaymission/black_mesa/deep_sci_feesh) "fQo" = ( /obj/structure/flora/biolumi/lamp/weaklight, /obj/structure/alien/weeds/xen, @@ -7878,6 +7858,14 @@ /obj/structure/sign/warning/test_chamber, /turf/closed/wall/r_wall, /area/awaymission/black_mesa/deep_sci_hall) +"icZ" = ( +/obj/machinery/door/airlock/security{ + name = "Brig"; + req_access = list("brig_entrance") + }, +/obj/effect/mapping_helpers/airlock/locked, +/turf/open/floor/iron/textured, +/area/awaymission/black_mesa/hecu_zone_external_sec) "idt" = ( /obj/effect/gibspawner/human/bodypartless, /obj/effect/mapping_helpers/broken_floor, @@ -8658,6 +8646,14 @@ /obj/structure/flora/biolumi/mine/weaklight, /turf/open/floor/iron/dark, /area/awaymission/black_mesa/resonant_chamber) +"jBe" = ( +/obj/machinery/door/airlock/security{ + name = "Brig"; + req_access = list("brig_entrance") + }, +/obj/effect/mapping_helpers/airlock/locked, +/turf/open/floor/iron/smooth_large, +/area/awaymission/black_mesa/gas_emitter_chamber) "jBA" = ( /obj/effect/turf_decal/trimline/darkblue/filled/line{ dir = 4 @@ -9764,6 +9760,14 @@ /obj/machinery/light/cold/directional/west, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa/hecu_zone_infirmary) +"lCv" = ( +/obj/machinery/door/airlock/security{ + name = "Brig"; + req_access = list("brig_entrance") + }, +/obj/effect/mapping_helpers/airlock/locked, +/turf/open/floor/iron/textured, +/area/awaymission/black_mesa/high_security_sec_point) "lCE" = ( /obj/machinery/light/cold/directional/north, /turf/open/floor/iron/textured_large, @@ -10915,6 +10919,14 @@ /obj/effect/baseturf_helper/black_mesa, /turf/closed/wall/r_wall, /area/awaymission/black_mesa/science_tunnel) +"nXY" = ( +/obj/machinery/door/airlock/security{ + name = "Brig"; + req_access = list("brig_entrance") + }, +/obj/effect/mapping_helpers/airlock/locked, +/turf/open/floor/iron/textured_large, +/area/awaymission/black_mesa/black_ops_entrance) "nZh" = ( /obj/structure/chair/office{ dir = 1 @@ -11295,6 +11307,11 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/iron/textured_large, /area/awaymission/black_mesa/entrance_hall) +"oQq" = ( +/mob/living/basic/carp/mega, +/obj/effect/spawner/liquids_spawner, +/turf/open/floor/iron/pool, +/area/awaymission/black_mesa/deep_sci_feesh) "oQy" = ( /obj/effect/baseturf_helper/black_mesa, /turf/closed/wall/r_wall, @@ -12017,14 +12034,6 @@ /obj/item/geiger_counter, /turf/open/floor/iron/dark, /area/awaymission/black_mesa/science_internal) -"qnK" = ( -/obj/machinery/door/airlock/security{ - name = "Brig"; - req_access_txt = "63; 42" - }, -/obj/effect/mapping_helpers/airlock/locked, -/turf/open/floor/iron/textured, -/area/awaymission/black_mesa/hecu_zone_external_sec) "qnL" = ( /obj/machinery/light/broken, /turf/open/floor/iron/dark, @@ -12542,14 +12551,6 @@ /obj/item/storage/box/cups, /turf/open/floor/iron/dark, /area/awaymission/black_mesa/hecu_zone_camp) -"raw" = ( -/obj/machinery/door/airlock/security{ - name = "Brig"; - req_access_txt = "63; 42" - }, -/obj/effect/mapping_helpers/airlock/locked, -/turf/open/floor/iron/textured_large, -/area/awaymission/black_mesa/black_ops_entrance) "raX" = ( /turf/open/floor/iron/textured, /area/awaymission/black_mesa/employee_dorm_room) @@ -14186,6 +14187,13 @@ /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa/hecu_zone_atrium) +"usf" = ( +/obj/machinery/door/airlock/security{ + name = "Brig"; + req_access = list("brig_entrance") + }, +/turf/open/floor/iron, +/area/awaymission/black_mesa/entrance_lobby) "usi" = ( /obj/item/ammo_box/magazine/multi_sprite/ladon, /turf/open/space/basic, @@ -14839,14 +14847,6 @@ /obj/structure/alien/weeds/xen, /turf/open/floor/plating, /area/awaymission/black_mesa/resonant_chamber) -"vDj" = ( -/obj/machinery/door/airlock/security{ - name = "Brig"; - req_access_txt = "63; 42" - }, -/obj/effect/mapping_helpers/airlock/locked, -/turf/open/floor/iron/textured, -/area/awaymission/black_mesa/high_security_sec_point) "vEa" = ( /obj/structure/table, /obj/item/storage/backpack/duffelbag/med/surgery, @@ -56798,7 +56798,7 @@ akt aLp aLp aLp -aHj +jBe asS aqR aqR @@ -60584,7 +60584,7 @@ sZq fGY fGY fGY -fQk +oQq fGY eZs fGY @@ -61364,7 +61364,7 @@ fGY fGY fGY fGY -cXv +ccv sZq aNo arz @@ -62550,7 +62550,7 @@ aNo baR baR baR -raw +nXY baR baR lCE @@ -62867,7 +62867,7 @@ ian tVa olm olm -vDj +lCv nyu pUu pUu @@ -64091,7 +64091,7 @@ arz aNo baR baR -raw +nXY baR baR baR @@ -66699,7 +66699,7 @@ afj afj wth olH -qnK +icZ sJE tMk sJE @@ -66917,7 +66917,7 @@ vqZ aNo aNo baR -raw +nXY baR baR oGD @@ -73765,7 +73765,7 @@ aJb aLk aLk aLk -aRj +usf aYb aFj aSa diff --git a/_maps/RandomZLevels/mothership_astrum.dmm b/_maps/RandomZLevels/mothership_astrum.dmm index ac7d24da5b3..906036c00f7 100644 --- a/_maps/RandomZLevels/mothership_astrum.dmm +++ b/_maps/RandomZLevels/mothership_astrum.dmm @@ -3203,7 +3203,7 @@ "Qr" = ( /obj/machinery/door/window/right/directional/south{ name = "Bar Door"; - req_one_access_txt = "25;28" + req_one_access = list("bar","kitchen") }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ diff --git a/_maps/RandomZLevels/research2.dmm b/_maps/RandomZLevels/research2.dmm index fbb4431f345..693ac80f75f 100644 --- a/_maps/RandomZLevels/research2.dmm +++ b/_maps/RandomZLevels/research2.dmm @@ -350,7 +350,7 @@ /obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; name = "Supermatter Chamber"; - req_one_access_txt = "10;24" + req_one_access = list("engineering","atmospherics") }, /turf/open/floor/engine, /area/awaymission/research/interior/engineering) @@ -1948,7 +1948,7 @@ "gn" = ( /obj/machinery/door/airlock/research{ name = "Secure Storage"; - req_access_txt = "9,63" + req_access = list("genetics","brig_entrance") }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -4686,7 +4686,7 @@ /obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; name = "Supermatter Chamber"; - req_one_access_txt = "10;24" + req_one_access = list("engineering","atmospherics") }, /turf/open/floor/engine, /area/awaymission/research/interior/engineering) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 6803fd60205..217d1d2d832 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -5112,12 +5112,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"bQb" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance" - }, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "bQj" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 @@ -5964,17 +5958,6 @@ /obj/structure/sign/poster/official/random/directional/south, /turf/open/floor/wood, /area/station/commons/vacant_room/office) -"ckW" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 4 - }, -/obj/effect/turf_decal/siding/purple{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "ckX" = ( /obj/effect/landmark/event_spawn, /obj/structure/cable, @@ -6948,10 +6931,6 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) -"cAV" = ( -/obj/docking_port/stationary/escape_pod, -/turf/open/space/basic, -/area/space) "cBc" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/iron, @@ -7333,6 +7312,16 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/qm, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"cJU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/window/right/directional/south{ + dir = 8; + name = "Jim Norton's Quebecois Coffee"; + req_one_access = list("service","maint_tunnels") + }, +/obj/effect/turf_decal/trimline/green/line, +/turf/open/floor/iron/dark, +/area/station/service/cafeteria) "cKd" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 4 @@ -9377,6 +9366,20 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"dwD" = ( +/obj/structure/cable, +/obj/machinery/door/airlock{ + name = "Custodial Closet" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, +/obj/effect/landmark/navigate_destination/janitor, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) "dwJ" = ( /obj/structure/lattice, /obj/effect/spawner/random/structure/grille, @@ -13733,6 +13736,13 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +"fbO" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Surgery C Maintenance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) "fbP" = ( /obj/effect/turf_decal/tile/neutral, /obj/structure/cable, @@ -15132,20 +15142,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) -"fFK" = ( -/obj/structure/cable, -/obj/machinery/door/airlock{ - name = "Custodial Closet" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/service/janitor, -/obj/effect/landmark/navigate_destination/janitor, -/turf/open/floor/iron, -/area/station/maintenance/starboard/greater) "fGb" = ( /obj/machinery/door/airlock/security/glass{ name = "Prison Sanitarium" @@ -19099,18 +19095,6 @@ "hbv" = ( /turf/closed/wall/r_wall, /area/station/medical/coldroom) -"hbC" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/item/reagent_containers/cup/glass/mug/britcup{ - pixel_y = 2 - }, -/turf/open/floor/iron, -/area/station/science/research) "hbK" = ( /turf/closed/wall, /area/station/maintenance/department/science/xenobiology) @@ -20098,6 +20082,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall/r_wall, /area/station/maintenance/starboard/greater) +"hup" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Medbay Maintenance" + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "huq" = ( /obj/machinery/modular_computer/console/preset/id{ dir = 4 @@ -20405,6 +20395,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/medical/break_room) +"hyI" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/siding/purple{ + dir = 5 + }, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "hyN" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, @@ -22295,11 +22294,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/service/hydroponics) -"ijA" = ( -/obj/effect/spawner/random/vending/snackvend, -/obj/machinery/newscaster/directional/west, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/central) "ijR" = ( /obj/structure/window/reinforced{ dir = 1; @@ -23366,15 +23360,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/virology) -"iyH" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/siding/purple{ - dir = 5 - }, -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "iyV" = ( /obj/structure/disposalpipe/segment, /obj/machinery/navbeacon{ @@ -24150,6 +24135,11 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"iLG" = ( +/obj/effect/spawner/random/vending/snackvend, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) "iLH" = ( /obj/machinery/flasher/directional/west{ id = "Cell 1" @@ -25933,6 +25923,18 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) +"jox" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/mug/britcup{ + pixel_x = -6; + pixel_y = 11 + }, +/obj/item/phone{ + pixel_x = 6; + pixel_y = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "jpr" = ( /obj/structure/rack, /obj/effect/spawner/random/techstorage/command_all, @@ -26816,6 +26818,21 @@ /obj/effect/landmark/blobstart, /turf/open/floor/iron, /area/station/cargo/warehouse) +"jDf" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "ordnancebridge" + }, +/obj/machinery/button/door{ + id = "ordnancebridge"; + pixel_x = -24; + req_one_access = list("maint_tunnels","science") + }, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) "jDk" = ( /obj/effect/spawner/random/entertainment/arcade, /obj/effect/decal/cleanable/dirt/dust, @@ -27943,6 +27960,18 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) +"jWu" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/item/reagent_containers/cup/glass/mug/britcup{ + pixel_y = 2 + }, +/turf/open/floor/iron, +/area/station/science/research) "jWR" = ( /obj/item/radio/intercom/directional/east, /obj/effect/turf_decal/siding/wood{ @@ -39448,6 +39477,21 @@ /obj/effect/landmark/start/chemist, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"oas" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "ordnancebridge" + }, +/obj/machinery/button/door{ + id = "ordnancebridge"; + pixel_y = 24; + req_one_access = list("maint_tunnels","science") + }, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) "oaw" = ( /obj/structure/table/reinforced, /obj/structure/cable, @@ -45318,41 +45362,6 @@ dir = 1 }, /area/station/service/chapel) -"qgc" = ( -/obj/structure/closet/crate/secure/weapon{ - desc = "A secure clothing crate."; - name = "formal uniform crate"; - req_access = list("armory") - }, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/suit/jacket/officer/blue, -/obj/item/clothing/suit/jacket/officer/blue, -/obj/item/clothing/suit/jacket/officer/blue, -/obj/item/clothing/suit/jacket/officer/blue, -/obj/item/clothing/suit/jacket/officer/blue, -/obj/item/clothing/suit/jacket/officer/blue, -/obj/item/clothing/under/rank/security/warden/formal, -/obj/item/clothing/suit/jacket/warden/blue, -/obj/item/clothing/under/rank/security/head_of_security/formal, -/obj/item/clothing/suit/jacket/hos/blue, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navywarden, -/obj/item/clothing/head/hats/hos/beret/navyhos, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/security/lockers) "qgf" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -46438,16 +46447,6 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/wood, /area/station/service/library) -"qzV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/window/right/directional/south{ - dir = 8; - name = "Jim Norton's Quebecois Coffee"; - req_one_access_txt = list("service","maint_tunnels") - }, -/obj/effect/turf_decal/trimline/green/line, -/turf/open/floor/iron/dark, -/area/station/service/cafeteria) "qAc" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -48142,6 +48141,10 @@ }, /turf/open/floor/engine, /area/station/science/cytology) +"rec" = ( +/obj/docking_port/stationary/escape_pod, +/turf/open/space/basic, +/area/space) "ret" = ( /obj/effect/spawner/random/trash/garbage{ spawn_scatter_radius = 1 @@ -48217,18 +48220,6 @@ /obj/effect/spawner/random/decoration/showcase, /turf/open/floor/carpet, /area/station/command/corporate_showroom) -"rgL" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/mug/britcup{ - pixel_x = -6; - pixel_y = 11 - }, -/obj/item/phone{ - pixel_x = 6; - pixel_y = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/drone_bay) "rgN" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -50099,21 +50090,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) -"rMx" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "ordnancebridge" - }, -/obj/machinery/button/door{ - id = "ordnancebridge"; - pixel_x = -24; - req_one_access_txt = list("maint_tunnels","science") - }, -/obj/effect/turf_decal/caution/stand_clear{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/aft/lesser) "rMz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/green{ @@ -50332,21 +50308,6 @@ }, /turf/open/floor/iron, /area/station/engineering/break_room) -"rQO" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 4; - id = "ordnancebridge" - }, -/obj/machinery/button/door{ - id = "ordnancebridge"; - pixel_y = 24; - req_one_access_txt = list("maint_tunnels","science") - }, -/obj/effect/turf_decal/caution/stand_clear{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/aft/lesser) "rQS" = ( /obj/structure/table, /obj/item/storage/box/evidence{ @@ -57137,13 +57098,6 @@ }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) -"ugx" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Surgery C Maintenance" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/maintenance/aft/greater) "ugE" = ( /obj/structure/chair{ name = "Judge" @@ -59559,6 +59513,41 @@ }, /turf/open/space/basic, /area/space) +"uXE" = ( +/obj/structure/closet/crate/secure/weapon{ + desc = "A secure clothing crate."; + name = "formal uniform crate"; + req_access = list("armory") + }, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/under/rank/security/warden/formal, +/obj/item/clothing/suit/jacket/warden/blue, +/obj/item/clothing/under/rank/security/head_of_security/formal, +/obj/item/clothing/suit/jacket/hos/blue, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navywarden, +/obj/item/clothing/head/hats/hos/beret/navyhos, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/security/lockers) "uXG" = ( /obj/machinery/door/airlock/maintenance{ name = "Psychology Maintenance" @@ -60038,6 +60027,17 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"vhq" = ( +/obj/machinery/computer/scan_consolenew{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "vht" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -62649,6 +62649,12 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +"waq" = ( +/obj/docking_port/stationary/escape_pod{ + dir = 4 + }, +/turf/open/space/basic, +/area/space) "was" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64937,12 +64943,6 @@ /obj/structure/table, /turf/open/floor/iron/white, /area/station/science/robotics/lab) -"wRF" = ( -/obj/docking_port/stationary/escape_pod{ - dir = 4 - }, -/turf/open/space/basic, -/area/space) "wRL" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -78459,7 +78459,7 @@ tkr aaa aaa aaa -cAV +rec cSk auJ jMZ @@ -87520,7 +87520,7 @@ tzE ucc tSw tSw -ugx +fbO tSw tSw tSw @@ -88285,7 +88285,7 @@ sWO oxW dqN vlH -bQb +hup miy tFr nMf @@ -89233,7 +89233,7 @@ fru wrG uzb phP -rgL +jox jXu tfR jXu @@ -90829,7 +90829,7 @@ sVY sVY sVY sVY -ijA +iLG xxk ahr bMY @@ -91052,7 +91052,7 @@ vvH cFp guX mgl -qzV +cJU wAj pPH hSg @@ -94091,7 +94091,7 @@ isc aaa aaa aaa -cAV +rec tYS lgS jKq @@ -97031,7 +97031,7 @@ cId rQl oIg wBq -ckW +vhq vKW jNX jxW @@ -97188,7 +97188,7 @@ aaa rrt aaa ahj -qgc +uXE sCi kiW rfb @@ -98055,7 +98055,7 @@ bBo gwf gfZ gqm -iyH +hyI cDA jrb lkL @@ -99098,7 +99098,7 @@ wna oFX lWN hND -rMx +jDf iKL nFa nFa @@ -101159,7 +101159,7 @@ svS svS svS svS -rQO +oas dKC anS lMJ @@ -106017,7 +106017,7 @@ gcV nNe nbS aHM -hbC +jWu oWk ddu wmi @@ -106257,7 +106257,7 @@ unL uNd unL unL -fFK +dwD unL tUn tUn @@ -106695,7 +106695,7 @@ aaa aaa szp aaa -wRF +waq aaa szp szp @@ -114707,7 +114707,7 @@ dgm dgB fJy aaa -wRF +waq aaa fJy oAQ diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 1ae59a4221a..28b3096d098 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -877,13 +877,6 @@ /obj/structure/sign/poster/official/random/directional/west, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"amH" = ( -/obj/structure/window/spawner, -/obj/effect/spawner/random/vending/snackvend, -/obj/effect/turf_decal/siding/wood, -/obj/effect/turf_decal/bot, -/turf/open/floor/wood/large, -/area/station/science/research) "amO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, @@ -899,10 +892,6 @@ }, /turf/open/floor/iron/large, /area/station/hallway/primary/fore) -"amU" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/vault, -/area/station/ai_monitored/turret_protected/aisat/foyer) "anq" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -1619,6 +1608,11 @@ /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, /area/station/maintenance/port) +"axd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/vault, +/area/station/ai_monitored/turret_protected/aisat/foyer) "axe" = ( /obj/structure/chair/office, /turf/open/floor/glass/reinforced, @@ -1945,6 +1939,19 @@ }, /turf/open/floor/plating/airless, /area/station/medical/pharmacy) +"aBb" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Antechamber" + }, +/obj/effect/landmark/navigate_destination/minisat_access_ai, +/obj/effect/mapping_helpers/airlock/access/all/science/minisat, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/structure/cable/layer3, +/turf/open/floor/vault, +/area/station/ai_monitored/turret_protected/aisat_interior) "aBc" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -2078,15 +2085,6 @@ /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, /area/station/engineering/atmos) -"aDt" = ( -/obj/machinery/door/airlock/external{ - name = "MiniSat External Access" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/mapping_helpers/airlock/access/any/science/minisat, -/obj/effect/mapping_helpers/airlock/access/any/engineering/external, -/turf/open/floor/catwalk_floor, -/area/station/ai_monitored/turret_protected/aisat/foyer) "aDx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/holopad, @@ -2228,6 +2226,17 @@ /obj/item/stock_parts/cell/potato, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/aft) +"aGu" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 8 + }, +/area/station/security/office) "aGE" = ( /obj/effect/landmark/start/hangover, /turf/open/floor/wood/large, @@ -2951,17 +2960,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/smooth, /area/station/engineering/gravity_generator) -"aTK" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/camera/directional/east{ - c_tag = "AI Satellite - Fore Port"; - name = "ai camera"; - network = list("minisat"); - start_active = 1 - }, -/obj/structure/cable, -/turf/open/space/basic, -/area/space/nearstation) "aTR" = ( /obj/machinery/photocopier, /obj/effect/turf_decal/bot, @@ -3593,13 +3591,6 @@ /obj/structure/sign/calendar/directional/north, /turf/open/floor/wood/large, /area/command/heads_quarters/captain/private/nt_rep) -"baM" = ( -/obj/machinery/door/airlock/security{ - name = "Evidence Storage" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/armory, -/turf/open/floor/iron/dark, -/area/station/security/warden) "baU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -3811,6 +3802,18 @@ dir = 8 }, /area/station/maintenance/disposal/incinerator) +"bdL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/circuit/green, +/area/station/ai_monitored/turret_protected/ai) +"bdP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/cable/layer3, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) "bdV" = ( /obj/effect/landmark/start/hangover, /turf/open/floor/carpet, @@ -4212,6 +4215,28 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood, /area/station/hallway/secondary/entry) +"bmg" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/corner, +/obj/effect/turf_decal/trimline/blue/filled/corner, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/obj/machinery/light/warm/directional/west, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 4; + name = "O2 to Airmix" + }, +/turf/open/floor/iron/smooth, +/area/station/engineering/atmos) "bmj" = ( /obj/item/radio/intercom/directional/east, /obj/machinery/light/warm/directional/east, @@ -4352,17 +4377,6 @@ dir = 4 }, /area/station/hallway/secondary/command) -"bow" = ( -/obj/structure/window/spawner/east, -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/effect/spawner/random/food_or_drink/donkpockets{ - pixel_y = 5 - }, -/turf/open/floor/wood/large, -/area/station/science/research) "boy" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/machinery/camera/directional/north{ @@ -4601,6 +4615,9 @@ }, /turf/open/floor/glass/reinforced, /area/station/security/execution/transfer) +"bsI" = ( +/turf/closed/wall/r_wall, +/area/station/science/auxlab) "btf" = ( /obj/structure/rack, /obj/item/stock_parts/matter_bin, @@ -4738,6 +4755,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) +"buX" = ( +/obj/structure/cable, +/obj/structure/cable/layer3, +/turf/open/floor/circuit/green, +/area/station/ai_monitored/turret_protected/ai) "bvd" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 6 @@ -5115,6 +5137,19 @@ }, /turf/open/floor/iron/smooth_edge, /area/station/engineering/atmos) +"bBp" = ( +/obj/machinery/door/airlock/external{ + name = "MiniSat External Access" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/science/minisat, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/catwalk_floor, +/area/station/ai_monitored/turret_protected/aisat/foyer) "bBq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -5346,17 +5381,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/white/smooth_large, /area/station/medical/virology) -"bGX" = ( -/obj/machinery/status_display/evac/directional/south, -/obj/machinery/light/warm/directional/south, -/obj/effect/turf_decal/siding/wood/end{ - dir = 8 - }, -/obj/structure/cable, -/obj/structure/bed/dogbed/lia, -/mob/living/basic/carp/pet/lia, -/turf/open/floor/iron/smooth_large, -/area/station/command/heads_quarters/hos) "bGZ" = ( /obj/structure/showcase/machinery/signal_decrypter, /obj/machinery/power/apc/auto_name/directional/north, @@ -5652,14 +5676,6 @@ }, /turf/open/floor/iron/cafeteria, /area/station/service/pizzeria/kitchen) -"bLt" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/toy/talking/ai, -/obj/structure/cable/layer3, -/turf/open/floor/vault, -/area/station/ai_monitored/turret_protected/aisat_interior) "bLv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/random/directional/south, @@ -6090,16 +6106,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/freezer, /area/station/medical/chemistry) -"bRm" = ( -/obj/structure/window/spawner/west, -/obj/machinery/vending/coffee, -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/machinery/status_display/ai/directional/north, -/obj/effect/turf_decal/bot, -/turf/open/floor/wood/large, -/area/station/science/research) "bRn" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -6387,13 +6393,6 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/port/fore) -"bXe" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/cable/layer3, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/ai) "bXf" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -7527,6 +7526,22 @@ /obj/machinery/light/warm/directional/north, /turf/open/floor/engine, /area/station/science/xenobiology) +"coN" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/mug/britcup{ + pixel_x = -6; + pixel_y = 11 + }, +/obj/item/phone{ + pixel_x = 6; + pixel_y = 1 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 6 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron/smooth, +/area/station/cargo/drone_bay) "coO" = ( /obj/structure/chair/comfy/brown{ color = "#A46106"; @@ -7571,12 +7586,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/command/heads_quarters/qm) -"cpt" = ( -/obj/machinery/airalarm/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable/multilayer/connected, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/aisat/foyer) "cpz" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/large, @@ -7612,6 +7621,17 @@ /obj/effect/turf_decal/box, /turf/open/floor/wood/large, /area/blueshield) +"cpP" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/camera/directional/west{ + c_tag = "AI Satellite - Fore Starboard"; + name = "ai camera"; + network = list("minisat"); + start_active = 1 + }, +/obj/structure/cable, +/turf/open/space/basic, +/area/space/nearstation) "cpU" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/xeno_spawn, @@ -8629,6 +8649,29 @@ /obj/structure/closet/firecloset, /turf/open/floor/pod/dark, /area/station/service/chapel) +"cGr" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Bridge"; + req_access = list("command") + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "bridge-left" + }, +/obj/machinery/door/poddoor/preopen{ + id = "bridge blast"; + name = "Bridge Blast Door" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/command/general, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/bridge) "cGw" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input{ dir = 4 @@ -8910,6 +8953,17 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/large, /area/station/commons/fitness/recreation) +"cLi" = ( +/obj/structure/window/spawner/east, +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/spawner/random/food_or_drink/donkpockets{ + pixel_y = 5 + }, +/turf/open/floor/wood/large, +/area/station/science/research) "cLl" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -9213,6 +9267,23 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/smooth_large, /area/station/command/heads_quarters/ce) +"cPb" = ( +/obj/machinery/status_display/evac/directional/south, +/obj/machinery/light/warm/directional/south, +/obj/effect/turf_decal/siding/wood/end{ + dir = 8 + }, +/obj/structure/cable, +/obj/structure/bed/dogbed/lia, +/mob/living/basic/carp/pet/lia, +/turf/open/floor/iron/smooth_large, +/area/station/command/heads_quarters/hos) +"cPe" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/foyer) "cPj" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -11067,6 +11138,11 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"dqT" = ( +/obj/structure/railing/corner, +/obj/structure/cable/layer3, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) "dqZ" = ( /obj/structure/flora/ocean/longseaweed, /obj/effect/spawner/liquids_spawner{ @@ -11174,6 +11250,14 @@ }, /turf/open/floor/iron/smooth_edge, /area/station/hallway/primary/aft) +"dss" = ( +/obj/machinery/status_display/evac/directional/east, +/obj/effect/turf_decal/bot, +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/aisat/atmos) "dsz" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 @@ -11379,6 +11463,10 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/smooth_large, /area/station/hallway/secondary/entry) +"duG" = ( +/obj/structure/cable/multilayer/connected, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) "duI" = ( /obj/machinery/power/shuttle_engine/propulsion, /turf/open/floor/plating, @@ -11401,6 +11489,11 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/smooth, /area/station/maintenance/department/electrical) +"duS" = ( +/obj/structure/window/spawner, +/obj/structure/window/spawner/east, +/turf/open/misc/beach/sand, +/area/station/science/research) "duU" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -11857,6 +11950,17 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/grass, /area/station/service/chapel) +"dAI" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/camera/directional/east{ + c_tag = "AI Satellite - Fore Port"; + name = "ai camera"; + network = list("minisat"); + start_active = 1 + }, +/obj/structure/cable, +/turf/open/space/basic, +/area/space/nearstation) "dAK" = ( /obj/effect/turf_decal/bot, /obj/effect/landmark/start/hangover, @@ -12253,11 +12357,6 @@ dir = 8 }, /area/station/cargo/miningdock) -"dGc" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/aisat/foyer) "dGf" = ( /obj/effect/turf_decal/siding/wood/end{ dir = 8 @@ -12283,9 +12382,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/showroomfloor, /area/station/medical/coldroom) -"dGp" = ( -/turf/closed/wall/r_wall, -/area/station/science/genetics) "dGw" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/wood/large, @@ -13724,6 +13820,15 @@ }, /turf/open/floor/wood/large, /area/station/service/library) +"dYb" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "AI Core shutters"; + name = "AI Core Shutters" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/ai) "dYc" = ( /obj/machinery/door/airlock/maintenance{ name = "Surgery Maintenance" @@ -13762,6 +13867,12 @@ }, /turf/open/floor/iron/small, /area/station/commons/dorms) +"dYr" = ( +/obj/structure/transit_tube, +/obj/effect/spawner/structure/window/hollow/reinforced/middle, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/foyer) "dYB" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/curtain/cloth/fancy/mechanical{ @@ -14478,10 +14589,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/command/bridge) -"eir" = ( -/obj/machinery/light/warm/directional/south, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/aisat/foyer) "eit" = ( /obj/structure/chair{ dir = 8 @@ -14762,6 +14869,12 @@ dir = 1 }, /area/station/science/robotics/lab) +"elt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/cable/layer3, +/turf/open/floor/circuit/green, +/area/station/ai_monitored/turret_protected/ai) "elB" = ( /obj/effect/turf_decal/tile/dark/opposingcorners{ dir = 1 @@ -15208,6 +15321,14 @@ /obj/structure/table/wood, /turf/open/floor/carpet/black, /area/station/service/chapel/office) +"erV" = ( +/obj/structure/window/spawner, +/obj/structure/bed/dogbed{ + anchored = 1; + name = "Gus's bed" + }, +/turf/open/floor/grass, +/area/station/science/research) "erX" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -15379,16 +15500,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/iron/smooth_large, /area/station/cargo/storage) -"evh" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/holopad/secure, -/obj/effect/landmark/start/cyborg, -/obj/effect/turf_decal/bot, -/obj/structure/cable/layer3, -/turf/open/floor/vault, -/area/station/ai_monitored/turret_protected/aisat_interior) "evm" = ( /obj/structure/chair{ dir = 4 @@ -15980,12 +16091,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos/pumproom) -"eDT" = ( -/obj/structure/window/spawner/north, -/obj/structure/window/spawner/east, -/obj/structure/flora/rock/pile/jungle, -/turf/open/misc/beach/sand, -/area/station/science/research) "eDY" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, @@ -16617,6 +16722,9 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/science/lab) +"eLM" = ( +/turf/closed/wall/r_wall, +/area/station/science/lab) "eLP" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, @@ -16931,15 +17039,6 @@ }, /turf/open/floor/wood/large, /area/command/heads_quarters/captain/private/nt_rep) -"eSa" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "AI Core shutters"; - name = "AI Core Shutters" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/ai_monitored/turret_protected/ai) "eSb" = ( /obj/machinery/conveyor/inverted{ dir = 10; @@ -18023,6 +18122,13 @@ dir = 1 }, /area/station/hallway/secondary/entry) +"fjr" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/cable/layer3, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) "fjM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -18227,22 +18333,6 @@ /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, /area/station/science/xenobiology) -"fmd" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/mug/britcup{ - pixel_x = -6; - pixel_y = 11 - }, -/obj/item/phone{ - pixel_x = 6; - pixel_y = 1 - }, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 6 - }, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/iron/smooth, -/area/station/cargo/drone_bay) "fmi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -19041,6 +19131,13 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/smooth, /area/station/engineering/atmos) +"fyb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/light/warm/directional/west, +/obj/structure/cable/layer3, +/turf/open/floor/circuit/green, +/area/station/ai_monitored/turret_protected/ai) "fye" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/airless, @@ -19666,6 +19763,16 @@ }, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) +"fHQ" = ( +/obj/structure/window/spawner, +/obj/structure/window/spawner/east, +/obj/effect/spawner/random/vending/colavend, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/wood/large, +/area/station/science/research) "fHY" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/green/filled/warning{ @@ -19979,6 +20086,13 @@ }, /turf/open/floor/iron/smooth_corner, /area/station/cargo/storage) +"fOp" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/vault, +/area/station/ai_monitored/turret_protected/aisat_interior) "fOq" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/mapping_helpers/airlock/access/any/engineering/external, @@ -20120,6 +20234,12 @@ initial_gas_mix = "TEMP=2.7" }, /area/space/nearstation) +"fQL" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/office) "fQS" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -20833,11 +20953,6 @@ dir = 4 }, /area/station/science/xenobiology) -"gbn" = ( -/obj/structure/closet/firecloset, -/obj/structure/sign/departments/aisat/directional/west, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/aisat/foyer) "gbo" = ( /obj/effect/turf_decal/trimline/green/filled/corner, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -21095,6 +21210,16 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/small, /area/station/hallway/primary/central) +"ggB" = ( +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/cable/layer3, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/aisat/foyer) "ggM" = ( /obj/structure/cable, /obj/structure/closet/firecloset/wall{ @@ -21552,6 +21677,18 @@ }, /turf/open/floor/plating, /area/station/science/ordnance) +"gkT" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 6 + }, +/obj/structure/cable, +/obj/item/toy/figure/secofficer{ + pixel_y = 16 + }, +/obj/effect/turf_decal/bot, +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/iron/dark, +/area/station/security/office) "gld" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -22063,6 +22200,19 @@ }, /turf/open/floor/iron/dark, /area/station/medical/break_room) +"gtq" = ( +/obj/item/radio/intercom/directional/south{ + freerange = 1; + frequency = 1447; + listening = 0; + name = "Private Channel" + }, +/obj/structure/sign/nanotrasen{ + pixel_x = 32 + }, +/obj/structure/closet/emcloset, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/aisat/foyer) "gtr" = ( /obj/structure/chair/wood, /turf/open/floor/iron/chapel{ @@ -22212,6 +22362,16 @@ }, /turf/open/floor/circuit/telecomms/server, /area/station/science/server) +"gvs" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/holopad/secure, +/obj/effect/landmark/start/cyborg, +/obj/effect/turf_decal/bot, +/obj/structure/cable/layer3, +/turf/open/floor/vault, +/area/station/ai_monitored/turret_protected/aisat_interior) "gvt" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/box, @@ -22628,6 +22788,16 @@ dir = 4 }, /area/station/medical/medbay/central) +"gBB" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/structure/cable/layer3, +/turf/open/floor/circuit/green, +/area/station/ai_monitored/turret_protected/ai) "gBM" = ( /obj/structure/table/wood/fancy, /obj/item/storage/book/bible, @@ -23238,12 +23408,6 @@ dir = 8 }, /area/station/engineering/atmos) -"gLA" = ( -/obj/structure/transit_tube, -/obj/effect/spawner/structure/window/hollow/reinforced/middle, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/ai_monitored/turret_protected/aisat/foyer) "gLD" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/item/radio/intercom/directional/south, @@ -24815,15 +24979,6 @@ "hfU" = ( /turf/closed/wall, /area/station/service/kitchen/coldroom) -"hfW" = ( -/obj/effect/spawner/liquids_spawner{ - reagent_list = list(/datum/reagent/water=600) - }, -/mob/living/basic/carp/mega/shorki{ - obj_damage = 0 - }, -/turf/open/misc/asteroid, -/area/station/commons/dorms) "hgk" = ( /obj/machinery/door/airlock/grunge{ name = "Chapel Garden" @@ -25301,6 +25456,27 @@ /obj/item/key/janitor, /turf/open/floor/noslip, /area/station/service/janitor) +"hok" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Bridge"; + req_access = list("command") + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "bridge-left" + }, +/obj/machinery/door/poddoor/preopen{ + id = "bridge blast"; + name = "Bridge Blast Door" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/command/general, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/bridge) "hoC" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -25356,6 +25532,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) +"hqf" = ( +/obj/structure/sign/clock, +/turf/closed/wall/r_wall, +/area/station/security/warden) "hqi" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 @@ -26378,28 +26558,6 @@ /obj/effect/spawner/random/medical/minor_healing, /turf/open/floor/iron/smooth, /area/station/maintenance/port/aft) -"hDK" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/filled/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/filled/corner, -/obj/effect/turf_decal/trimline/blue/filled/corner, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 4 - }, -/obj/machinery/light/warm/directional/west, -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 4; - name = "O2 to Airmix" - }, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "hDY" = ( /obj/machinery/computer/atmos_control/mix_tank{ dir = 4 @@ -26733,12 +26891,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/pod/dark, /area/station/service/chapel) -"hIV" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/ai) "hJx" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input{ dir = 4 @@ -27236,6 +27388,16 @@ }, /turf/open/floor/iron/large, /area/station/hallway/primary/fore) +"hSo" = ( +/obj/machinery/camera/motion/directional/south{ + c_tag = "Minisat Main Airlock"; + name = "AI motion-sensitive security camera"; + network = list("minisat") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/layer3, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/aisat/foyer) "hSA" = ( /obj/structure/chair/comfy/brown{ buildstackamount = 0; @@ -27754,12 +27916,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/secondary/command) -"hZQ" = ( -/obj/structure/window/spawner/west, -/obj/structure/window/spawner/north, -/obj/structure/flora/bush/jungle/a/style_2, -/turf/open/floor/grass, -/area/station/science/research) "hZV" = ( /obj/structure/chair/sofa/bench, /obj/effect/turf_decal/siding/wood{ @@ -28078,13 +28234,6 @@ dir = 4 }, /area/station/medical/virology) -"ihO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light_switch/directional/north, -/obj/machinery/power/port_gen/pacman, -/obj/structure/cable, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/aisat/atmos) "ihT" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -28182,6 +28331,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white/smooth_large, /area/station/hallway/primary/fore) +"ijR" = ( +/obj/structure/window/spawner/west, +/obj/structure/window/spawner/north, +/obj/structure/flora/bush/jungle/a/style_2, +/turf/open/floor/grass, +/area/station/science/research) "ijY" = ( /obj/structure/table/wood/fancy, /obj/item/storage/fancy/candle_box, @@ -29180,19 +29335,6 @@ /obj/machinery/status_display/ai/directional/west, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/captain) -"ivA" = ( -/obj/structure/cable, -/obj/machinery/door/airlock/hatch{ - name = "MiniSat Antechamber" - }, -/obj/effect/landmark/navigate_destination/minisat_access_ai, -/obj/effect/mapping_helpers/airlock/access/all/science/minisat, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, -/obj/structure/cable/layer3, -/turf/open/floor/vault, -/area/station/ai_monitored/turret_protected/aisat_interior) "ivF" = ( /obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 6 @@ -30362,6 +30504,9 @@ }, /turf/open/floor/pod/dark, /area/station/service/chapel/office) +"iMs" = ( +/turf/closed/wall/r_wall, +/area/station/security/holding_cell) "iMv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -30520,6 +30665,50 @@ /obj/machinery/light/floor, /turf/open/floor/engine/vacuum, /area/station/engineering/atmos) +"iPD" = ( +/obj/item/radio/intercom/directional/west{ + freerange = 1; + listening = 0; + name = "Common Channel"; + pixel_x = -32; + pixel_y = 4 + }, +/obj/item/radio/intercom/directional/south{ + freerange = 1; + frequency = 1447; + listening = 0; + name = "Private Channel"; + pixel_y = 22 + }, +/obj/item/radio/intercom/directional/east{ + freerange = 1; + listening = 0; + name = "Custom Channel"; + pixel_x = 31; + pixel_y = 4 + }, +/obj/effect/landmark/start/ai, +/obj/machinery/turretid{ + icon_state = "control_stun"; + name = "AI Chamber turret control"; + pixel_x = 32; + pixel_y = 32 + }, +/obj/machinery/button/door/directional/north{ + id = "AI Chamber Entrance Shutters"; + name = "AI Chamber Entrance Shutters Control"; + pixel_x = -26; + req_access = list("ai_upload") + }, +/obj/machinery/button/door/directional/north{ + id = "AI Core shutters"; + name = "AI Core Shutters Control"; + pixel_x = -38; + req_access = list("ai_upload") + }, +/obj/structure/cable, +/turf/open/floor/vault, +/area/station/ai_monitored/turret_protected/ai) "iPG" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -30662,6 +30851,12 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"iSa" = ( +/obj/machinery/airalarm/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/multilayer/connected, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/aisat/foyer) "iSe" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/light/warm/directional/north, @@ -31110,6 +31305,10 @@ }, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos/storage/gas) +"iXW" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/vault, +/area/station/ai_monitored/turret_protected/aisat/foyer) "iXY" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -31322,6 +31521,26 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos/hfr_room) +"jbf" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "AI Chamber" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "AI Chamber Entrance Shutters"; + name = "AI Chamber Entrance Shutters" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, +/obj/structure/cable, +/obj/machinery/flasher/directional/west{ + id = "AI"; + pixel_y = -8 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/layer3, +/turf/open/floor/vault, +/area/station/ai_monitored/turret_protected/ai) "jbg" = ( /obj/machinery/mass_driver/chapelgun, /obj/machinery/door/window/left/directional/west{ @@ -31576,6 +31795,15 @@ "jfS" = ( /turf/closed/wall, /area/station/security/medical) +"jfT" = ( +/obj/machinery/turretid{ + control_area = "/area/station/ai_monitored/turret_protected/aisat_interior"; + name = "Antechamber Turret control"; + pixel_y = -27 + }, +/obj/machinery/light/warm/directional/south, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/aisat/foyer) "jfU" = ( /obj/structure/chair/comfy/brown{ color = "#52B4E9"; @@ -32073,11 +32301,6 @@ /obj/structure/sign/warning/secure_area/directional/west, /turf/open/floor/iron/smooth, /area/station/engineering/atmos) -"jna" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable/layer3, -/turf/open/floor/circuit/green, -/area/station/ai_monitored/turret_protected/ai) "jnc" = ( /obj/machinery/atmospherics/components/unary/passive_vent{ dir = 1 @@ -32252,18 +32475,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"jpL" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 6 - }, -/obj/structure/cable, -/obj/item/toy/figure/secofficer{ - pixel_y = 16 - }, -/obj/effect/turf_decal/bot, -/obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/iron/dark, -/area/station/security/office) "jpN" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 1 @@ -32396,6 +32607,53 @@ }, /turf/open/floor/carpet, /area/station/security/courtroom) +"jrs" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/bottle/morphine{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/item/reagent_containers/cup/bottle/morphine{ + pixel_x = -7; + pixel_y = 7 + }, +/obj/item/reagent_containers/cup/bottle/chloralhydrate{ + pixel_x = -7 + }, +/obj/item/reagent_containers/cup/bottle/facid{ + pixel_x = 7 + }, +/obj/item/storage/backpack/duffelbag/sec/surgery{ + pixel_y = 5 + }, +/obj/machinery/button/door/directional/north{ + id = "justiceblast"; + name = "Justice Shutters Control"; + pixel_x = -6; + req_access = list("brig_entrance") + }, +/obj/machinery/button/door/directional/north{ + id = "justicechamber"; + name = "Justice Chamber Control"; + pixel_x = -6; + pixel_y = 36; + req_access = list("armory") + }, +/obj/machinery/button/ignition{ + id = "justicespark"; + pixel_x = 8; + pixel_y = 24; + req_access = list("brig_entrance") + }, +/obj/machinery/button/flasher{ + id = "justiceflash"; + pixel_x = 8; + pixel_y = 36; + req_access = list("brig_entrance") + }, +/obj/effect/turf_decal/tile/dark_red/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) "jru" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -34240,14 +34498,6 @@ /obj/structure/window/reinforced/fulltile, /turf/open/floor/grass, /area/station/medical/treatment_center) -"jRz" = ( -/obj/machinery/status_display/evac/directional/east, -/obj/effect/turf_decal/bot, -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/aisat/atmos) "jRN" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -34258,16 +34508,6 @@ }, /turf/open/floor/iron/white/smooth_edge, /area/station/science/xenobiology) -"jSh" = ( -/obj/structure/window/spawner, -/obj/structure/window/spawner/east, -/obj/effect/spawner/random/vending/colavend, -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/wood/large, -/area/station/science/research) "jSl" = ( /obj/effect/turf_decal/bot, /obj/machinery/computer/department_orders/science, @@ -35293,14 +35533,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/pod/dark, /area/station/engineering/storage/tech) -"kis" = ( -/obj/structure/window/spawner, -/obj/structure/bed/dogbed{ - anchored = 1; - name = "Gus's bed" - }, -/turf/open/floor/grass, -/area/station/science/research) "kit" = ( /obj/effect/turf_decal/siding/green{ dir = 1 @@ -35836,15 +36068,6 @@ dir = 8 }, /area/station/engineering/atmos) -"kpZ" = ( -/obj/machinery/turretid{ - control_area = "/area/station/ai_monitored/turret_protected/aisat_interior"; - name = "Antechamber Turret control"; - pixel_y = -27 - }, -/obj/machinery/light/warm/directional/south, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/aisat/foyer) "kqb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/smooth_edge, @@ -36631,6 +36854,19 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"kAk" = ( +/obj/structure/closet/emcloset, +/obj/item/radio/intercom/directional/south{ + freerange = 1; + frequency = 1447; + listening = 0; + name = "Private Channel" + }, +/obj/structure/sign/nanotrasen{ + pixel_x = -32 + }, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/aisat/foyer) "kAm" = ( /turf/closed/wall, /area/blueshield) @@ -37398,6 +37634,13 @@ /obj/effect/turf_decal/tile/purple/half, /turf/open/floor/iron/dark/smooth_large, /area/station/command/bridge) +"kIV" = ( +/obj/machinery/door/airlock/security{ + name = "Evidence Storage" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, +/turf/open/floor/iron/dark, +/area/station/security/warden) "kIX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/neutral/filled/corner{ @@ -40543,6 +40786,10 @@ }, /turf/open/floor/iron/smooth, /area/station/engineering/main) +"lBW" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/vault, +/area/station/ai_monitored/turret_protected/aisat/foyer) "lCb" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -40687,6 +40934,38 @@ /obj/effect/spawner/liquids_spawner, /turf/open/floor/iron/pool, /area/station/security/prison) +"lDy" = ( +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 8 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_y = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/window/brigdoor/right/directional/east{ + name = "Command Storage"; + req_access = list("eva") + }, +/obj/structure/rack/shelf, +/obj/machinery/light/warm/directional/west, +/obj/structure/sign/nanotrasen{ + pixel_x = -32 + }, +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) "lDz" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 6 @@ -41589,12 +41868,6 @@ /obj/structure/window/reinforced/fulltile, /turf/open/misc/asteroid, /area/station/engineering/lobby) -"lQd" = ( -/obj/docking_port/stationary/escape_pod{ - dir = 2 - }, -/turf/open/space/basic, -/area/space/nearstation) "lQh" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -42074,6 +42347,32 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron/grimy, /area/station/hallway/primary/central/fore) +"lVZ" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/corner, +/obj/effect/turf_decal/trimline/blue/filled/corner, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/obj/machinery/light/warm/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Atmospherics - Aft Tanks"; + name = "atmospherics camera" + }, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 4; + name = "N2 to Airmix" + }, +/turf/open/floor/iron/smooth, +/area/station/engineering/atmos) "lWb" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/firealarm/directional/east, @@ -42682,6 +42981,15 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/security/greater) +"meq" = ( +/obj/machinery/door/airlock/external{ + name = "MiniSat External Access" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/any/science/minisat, +/obj/effect/mapping_helpers/airlock/access/any/engineering/external, +/turf/open/floor/catwalk_floor, +/area/station/ai_monitored/turret_protected/aisat/foyer) "mev" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -43600,14 +43908,6 @@ dir = 4 }, /area/station/hallway/primary/central/aft) -"msB" = ( -/obj/structure/window/spawner/north, -/obj/effect/turf_decal/weather/sand{ - dir = 4 - }, -/obj/structure/flora/bush/jungle/a/style_3, -/turf/open/floor/grass, -/area/station/science/research) "msQ" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, @@ -44363,25 +44663,6 @@ }, /turf/open/floor/iron/smooth, /area/station/cargo/warehouse) -"mCn" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "5" - }, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, -/obj/machinery/duct, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron/white/smooth_large, -/area/station/medical/storage) "mCy" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 1 @@ -44645,6 +44926,13 @@ dir = 1 }, /area/station/hallway/primary/aft) +"mGP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light_switch/directional/north, +/obj/machinery/power/port_gen/pacman, +/obj/structure/cable, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/aisat/atmos) "mHn" = ( /obj/structure/closet/toolcloset, /obj/effect/decal/cleanable/dirt/dust, @@ -44940,6 +45228,12 @@ }, /turf/open/floor/iron/smooth, /area/station/engineering/atmos) +"mKV" = ( +/obj/docking_port/stationary/escape_pod{ + dir = 2 + }, +/turf/open/space/basic, +/area/space/nearstation) "mLb" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -44987,12 +45281,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/lesser) -"mLp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/cable/layer3, -/turf/open/floor/circuit/green, -/area/station/ai_monitored/turret_protected/ai) "mLs" = ( /obj/structure/bookcase/random/fiction, /obj/effect/turf_decal/siding/wood{ @@ -46058,9 +46346,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/engine, /area/station/cargo/drone_bay) -"mXR" = ( -/turf/closed/wall/r_wall, -/area/station/security/holding_cell) "mYa" = ( /obj/effect/spawner/random/engineering/tank, /obj/effect/mapping_helpers/broken_floor, @@ -46131,14 +46416,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/commons/dorms) -"mYE" = ( -/obj/machinery/power/solar_control{ - id = "forestarboard"; - name = "Starboard Bow Solar Control" - }, -/obj/structure/cable, -/turf/open/floor/vault, -/area/station/ai_monitored/turret_protected/aisat/foyer) "mYF" = ( /obj/machinery/camera/directional/south{ c_tag = "Command - Blueshield's Gear Room"; @@ -47075,6 +47352,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/science/xenobiology) +"nlD" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/toy/talking/ai, +/obj/structure/cable/layer3, +/turf/open/floor/vault, +/area/station/ai_monitored/turret_protected/aisat_interior) "nlO" = ( /obj/structure/railing{ dir = 4 @@ -47130,6 +47415,9 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/smooth_edge, /area/station/engineering/atmos/storage/gas) +"nmx" = ( +/turf/closed/wall/r_wall, +/area/station/science/robotics/mechbay) "nmy" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -47580,32 +47868,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white/smooth_large, /area/station/science/xenobiology) -"ntA" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/filled/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/filled/corner, -/obj/effect/turf_decal/trimline/blue/filled/corner, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 4 - }, -/obj/machinery/light/warm/directional/west, -/obj/machinery/camera/directional/west{ - c_tag = "Atmospherics - Aft Tanks"; - name = "atmospherics camera" - }, -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 4; - name = "N2 to Airmix" - }, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "ntF" = ( /obj/structure/window/reinforced, /obj/structure/table/wood, @@ -48724,50 +48986,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/smooth_large, /area/station/ai_monitored/command/storage/eva) -"nJG" = ( -/obj/item/radio/intercom/directional/west{ - freerange = 1; - listening = 0; - name = "Common Channel"; - pixel_x = -32; - pixel_y = 4 - }, -/obj/item/radio/intercom/directional/south{ - freerange = 1; - frequency = 1447; - listening = 0; - name = "Private Channel"; - pixel_y = 22 - }, -/obj/item/radio/intercom/directional/east{ - freerange = 1; - listening = 0; - name = "Custom Channel"; - pixel_x = 31; - pixel_y = 4 - }, -/obj/effect/landmark/start/ai, -/obj/machinery/turretid{ - icon_state = "control_stun"; - name = "AI Chamber turret control"; - pixel_x = 32; - pixel_y = 32 - }, -/obj/machinery/button/door/directional/north{ - id = "AI Chamber Entrance Shutters"; - name = "AI Chamber Entrance Shutters Control"; - pixel_x = -26; - req_access = list("ai_upload") - }, -/obj/machinery/button/door/directional/north{ - id = "AI Core shutters"; - name = "AI Core Shutters Control"; - pixel_x = -38; - req_access = list("ai_upload") - }, -/obj/structure/cable, -/turf/open/floor/vault, -/area/station/ai_monitored/turret_protected/ai) "nJH" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -48825,15 +49043,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/white, /area/station/science/lab) -"nKv" = ( -/obj/structure/window/spawner, -/obj/structure/window/spawner/west, -/obj/structure/water_source/puddle, -/obj/structure/flora/bush/reed{ - pixel_y = 8 - }, -/turf/open/floor/grass, -/area/station/science/research) "nKw" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 9 @@ -50919,6 +51128,11 @@ /obj/effect/turf_decal/bot/right, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos/hfr_room) +"onb" = ( +/obj/structure/closet/firecloset, +/obj/structure/sign/departments/aisat/directional/west, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/aisat/foyer) "onB" = ( /obj/effect/turf_decal/tile/red/full, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -52253,9 +52467,6 @@ dir = 8 }, /area/station/ai_monitored/command/storage/eva) -"oGv" = ( -/turf/closed/wall/r_wall, -/area/station/science/robotics/mechbay) "oGw" = ( /obj/structure/bodycontainer/morgue{ dir = 2 @@ -52271,19 +52482,6 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) -"oGG" = ( -/obj/structure/window/spawner/east, -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow."; - pixel_x = -8; - pixel_y = 5 - }, -/turf/open/floor/wood/large, -/area/station/science/research) "oGI" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -52907,11 +53105,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood/large, /area/station/security/courtroom) -"oRw" = ( -/obj/structure/window/spawner/north, -/mob/living/simple_animal/hostile/retaliate/tegu/gus, -/turf/open/misc/beach/sand, -/area/station/science/research) "oRx" = ( /obj/effect/turf_decal/siding/green/corner{ dir = 1 @@ -54737,11 +54930,6 @@ dir = 8 }, /area/station/hallway/primary/central/aft) -"poj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, -/obj/item/kirbyplants/random, -/turf/open/floor/vault, -/area/station/ai_monitored/turret_protected/aisat/foyer) "por" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 9 @@ -55672,6 +55860,16 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/white/smooth_edge, /area/station/medical/virology) +"pDo" = ( +/obj/structure/window/spawner/west, +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/machinery/status_display/ai/directional/north, +/obj/effect/turf_decal/bot, +/turf/open/floor/wood/large, +/area/station/science/research) "pDu" = ( /obj/structure/chair/sofa/bench/left, /obj/effect/turf_decal/siding/wood{ @@ -56475,13 +56673,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/smooth, /area/station/maintenance/department/engine/atmos/lesser) -"pPn" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/cable/layer3, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/ai) "pPp" = ( /obj/effect/spawner/random/trash/garbage, /turf/open/floor/catwalk_floor/iron_smooth, @@ -56653,9 +56844,6 @@ /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/aft/greater) -"pSW" = ( -/turf/closed/wall/r_wall, -/area/station/science/robotics/lab) "pSX" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ @@ -57807,16 +57995,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"qgo" = ( -/obj/machinery/camera/motion/directional/south{ - c_tag = "Minisat Main Airlock"; - name = "AI motion-sensitive security camera"; - network = list("minisat") - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable/layer3, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/aisat/foyer) "qgq" = ( /obj/machinery/suit_storage_unit/atmos, /obj/effect/turf_decal/delivery, @@ -58165,6 +58343,9 @@ /obj/effect/landmark/start/librarian, /turf/open/floor/iron/grimy, /area/station/service/library) +"qlN" = ( +/turf/closed/wall/r_wall, +/area/station/science/robotics/lab) "qlS" = ( /obj/machinery/door/airlock/research{ name = "Circuit Testing Lab" @@ -58787,10 +58968,6 @@ }, /turf/open/floor/wood/large, /area/station/hallway/primary/central/fore) -"qtY" = ( -/obj/item/kirbyplants/random, -/turf/open/floor/vault, -/area/station/ai_monitored/turret_protected/aisat/foyer) "qtZ" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/cable, @@ -59734,6 +59911,11 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/wood/large, /area/station/commons/fitness/recreation/entertainment) +"qIb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/obj/item/kirbyplants/random, +/turf/open/floor/vault, +/area/station/ai_monitored/turret_protected/aisat/foyer) "qIf" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/siding/wood{ @@ -59849,16 +60031,6 @@ dir = 4 }, /area/station/science/robotics/lab) -"qJC" = ( -/obj/machinery/ai_slipper{ - uses = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/cable/layer3, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/aisat/foyer) "qJZ" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 9 @@ -60441,10 +60613,6 @@ }, /turf/open/floor/engine, /area/station/ai_monitored/security/armory) -"qSP" = ( -/obj/structure/cable/multilayer/connected, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/ai) "qST" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -60919,11 +61087,6 @@ }, /turf/open/floor/iron/small, /area/station/hallway/secondary/exit/departure_lounge) -"qZe" = ( -/obj/machinery/firealarm/directional/east, -/obj/structure/closet/firecloset, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/aisat/foyer) "qZf" = ( /turf/open/floor/iron/smooth, /area/station/maintenance/aft/upper) @@ -60967,14 +61130,6 @@ /obj/machinery/smartfridge, /turf/open/floor/iron/dark/smooth_large, /area/station/service/hydroponics) -"rab" = ( -/obj/structure/window/spawner, -/obj/structure/window/spawner/east, -/turf/open/misc/beach/sand, -/area/station/science/research) -"rar" = ( -/turf/closed/wall/r_wall, -/area/station/science/lab) "raM" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -62146,16 +62301,6 @@ /obj/machinery/shower/directional/north, /turf/open/floor/iron/checker, /area/station/engineering/power_room) -"rqZ" = ( -/obj/structure/window/spawner/west, -/obj/structure/window/spawner, -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/structure/reagent_dispensers/water_cooler, -/obj/effect/turf_decal/bot, -/turf/open/floor/wood/large, -/area/station/science/research) "rrb" = ( /obj/structure/trash_pile, /turf/open/floor/iron/smooth, @@ -62232,10 +62377,6 @@ /obj/structure/sign/warning/no_smoking/directional/north, /turf/open/floor/iron/smooth, /area/station/maintenance/department/electrical) -"rsZ" = ( -/obj/docking_port/stationary/escape_pod, -/turf/open/space/basic, -/area/space/nearstation) "rtf" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -62463,6 +62604,11 @@ }, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos) +"rwg" = ( +/obj/machinery/firealarm/directional/east, +/obj/structure/closet/firecloset, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/aisat/foyer) "rwr" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -62536,10 +62682,6 @@ }, /turf/open/floor/iron/freezer, /area/station/commons/toilet) -"ryf" = ( -/obj/structure/sign/clock, -/turf/closed/wall/r_wall, -/area/station/security/warden) "ryo" = ( /turf/open/floor/engine{ name = "Holodeck Projector Floor" @@ -62624,30 +62766,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/smooth, /area/station/maintenance/port) -"rzb" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "bridge-left" - }, -/obj/machinery/door/poddoor/preopen{ - id = "bridgedoors"; - name = "Bridge Access Blast Door" - }, -/obj/effect/mapping_helpers/airlock/access/all/command/general, -/obj/effect/landmark/navigate_destination/bridge, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/command/bridge) "rzd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -65284,27 +65402,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/fore) -"slc" = ( -/obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "bridge-left" - }, -/obj/machinery/door/poddoor/preopen{ - id = "bridge blast"; - name = "Bridge Blast Door" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/access/all/command/general, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/command/bridge) "sle" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/brown/filled/line, @@ -65557,6 +65654,30 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/port/central) +"soM" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/command/glass{ + name = "Bridge"; + req_access = list("command") + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "bridge-left" + }, +/obj/machinery/door/poddoor/preopen{ + id = "bridgedoors"; + name = "Bridge Access Blast Door" + }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, +/obj/effect/landmark/navigate_destination/bridge, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/bridge) "soS" = ( /obj/structure/dresser, /obj/item/toy/figure/hos{ @@ -66360,29 +66481,6 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/pod/dark, /area/station/service/chapel/funeral) -"sAq" = ( -/obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "bridge-left" - }, -/obj/machinery/door/poddoor/preopen{ - id = "bridge blast"; - name = "Bridge Blast Door" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/command/general, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/command/bridge) "sAt" = ( /obj/structure/table, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -66476,6 +66574,16 @@ /obj/effect/turf_decal/tile/neutral/diagonal_centre, /turf/open/floor/iron/dark/diagonal, /area/station/security/execution/transfer) +"sBD" = ( +/obj/structure/window/spawner/west, +/obj/structure/window/spawner, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/structure/reagent_dispensers/water_cooler, +/obj/effect/turf_decal/bot, +/turf/open/floor/wood/large, +/area/station/science/research) "sCe" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -66832,6 +66940,27 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/solars/port/fore) +"sFN" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Bridge"; + req_access = list("command") + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "bridge-left" + }, +/obj/machinery/door/poddoor/preopen{ + id = "bridgedoors"; + name = "Bridge Access Blast Door" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/command/general, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/bridge) "sFU" = ( /obj/machinery/conveyor{ dir = 8; @@ -68512,19 +68641,6 @@ /obj/effect/turf_decal/trimline/dark_blue, /turf/open/floor/iron/dark/smooth_large, /area/station/commons/fitness/recreation/entertainment) -"tcL" = ( -/obj/structure/showcase/cyborg/old{ - dir = 8; - pixel_x = 9; - pixel_y = 2 - }, -/obj/machinery/status_display/ai/directional/east, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/cable/layer3, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/ai) "tcQ" = ( /obj/machinery/light/small/directional/north, /obj/machinery/seed_extractor, @@ -69225,19 +69341,6 @@ dir = 4 }, /area/station/engineering/atmos/pumproom) -"tmf" = ( -/obj/item/radio/intercom/directional/south{ - freerange = 1; - frequency = 1447; - listening = 0; - name = "Private Channel" - }, -/obj/structure/sign/nanotrasen{ - pixel_x = 32 - }, -/obj/structure/closet/emcloset, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/aisat/foyer) "tmv" = ( /obj/structure/chair/sofa/bench/left{ dir = 1 @@ -69718,26 +69821,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/diagonal, /area/station/hallway/secondary/service) -"trZ" = ( -/obj/machinery/door/airlock/highsecurity{ - name = "AI Chamber" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "AI Chamber Entrance Shutters"; - name = "AI Chamber Entrance Shutters" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, -/obj/structure/cable, -/obj/machinery/flasher/directional/west{ - id = "AI"; - pixel_y = -8 - }, -/obj/machinery/door/firedoor, -/obj/structure/cable/layer3, -/turf/open/floor/vault, -/area/station/ai_monitored/turret_protected/ai) "tsb" = ( /obj/structure/chair/sofa/bench, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -70944,19 +71027,6 @@ }, /turf/open/floor/iron/large, /area/station/commons/vacant_room/commissary) -"tId" = ( -/obj/structure/closet/emcloset, -/obj/item/radio/intercom/directional/south{ - freerange = 1; - frequency = 1447; - listening = 0; - name = "Private Channel" - }, -/obj/structure/sign/nanotrasen{ - pixel_x = -32 - }, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/aisat/foyer) "tIh" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 8 @@ -71264,13 +71334,6 @@ /obj/item/stack/sheet/cardboard, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/aft/upper) -"tNe" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/light/warm/directional/west, -/obj/structure/cable/layer3, -/turf/open/floor/circuit/green, -/area/station/ai_monitored/turret_protected/ai) "tNj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -71646,9 +71709,6 @@ "tTx" = ( /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/central) -"tTB" = ( -/turf/closed/wall/r_wall, -/area/station/science/auxlab) "tTI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -71782,11 +71842,6 @@ }, /turf/open/floor/iron/smooth, /area/station/command/cc_dock) -"tVN" = ( -/obj/structure/railing/corner, -/obj/structure/cable/layer3, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/ai) "tVX" = ( /obj/effect/spawner/random/trash/garbage, /obj/effect/decal/cleanable/dirt, @@ -72450,17 +72505,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/smooth, /area/station/maintenance/aft/lesser) -"ufh" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 8 - }, -/area/station/security/office) "ufk" = ( /obj/structure/cable, /obj/machinery/power/solar_control{ @@ -73666,12 +73710,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/white/smooth_edge, /area/station/medical/storage) -"uuy" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/ai_monitored/turret_protected/aisat/foyer) "uuC" = ( /obj/structure/chair{ dir = 4 @@ -74152,12 +74190,6 @@ }, /turf/open/floor/iron/dark/smooth_edge, /area/station/science/robotics/lab) -"uAp" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/office) "uAt" = ( /obj/structure/chair/stool/directional/west, /obj/structure/disposalpipe/segment{ @@ -74205,6 +74237,19 @@ }, /turf/open/floor/iron/dark/smooth_edge, /area/station/hallway/secondary/command) +"uBe" = ( +/obj/structure/showcase/cyborg/old{ + dir = 8; + pixel_x = 9; + pixel_y = 2 + }, +/obj/machinery/status_display/ai/directional/east, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/cable/layer3, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) "uBg" = ( /obj/effect/turf_decal/trimline/dark_red/arrow_cw{ dir = 1 @@ -74508,6 +74553,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) +"uGy" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/structure/cable/layer3, +/turf/open/floor/vault, +/area/station/ai_monitored/turret_protected/aisat_interior) "uGz" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 9 @@ -74636,6 +74691,11 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/airless, /area/station/engineering/storage_shared) +"uIA" = ( +/obj/structure/window/spawner/north, +/mob/living/simple_animal/hostile/retaliate/tegu/gus, +/turf/open/misc/beach/sand, +/area/station/science/research) "uIM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -74890,6 +74950,13 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix, /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) +"uMp" = ( +/obj/structure/window/spawner, +/obj/effect/spawner/random/vending/snackvend, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/bot, +/turf/open/floor/wood/large, +/area/station/science/research) "uMt" = ( /obj/item/stack/cable_coil, /obj/item/stack/cable_coil{ @@ -75326,6 +75393,14 @@ dir = 4 }, /area/station/engineering/atmos/hfr_room) +"uRG" = ( +/obj/structure/window/spawner/north, +/obj/effect/turf_decal/weather/sand{ + dir = 4 + }, +/obj/structure/flora/bush/jungle/a/style_3, +/turf/open/floor/grass, +/area/station/science/research) "uRS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -75743,16 +75818,6 @@ /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/starboard/aft) -"uYc" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/obj/structure/cable/layer3, -/turf/open/floor/circuit/green, -/area/station/ai_monitored/turret_protected/ai) "uYj" = ( /obj/structure/sign/warning/no_smoking/directional/west, /turf/closed/wall/r_wall, @@ -75889,6 +75954,12 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/smooth, /area/station/maintenance/department/engine) +"vaG" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) "vaJ" = ( /obj/structure/table, /obj/item/storage/bag/plants{ @@ -76395,6 +76466,14 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/large, /area/station/commons/fitness/recreation/entertainment) +"vkf" = ( +/obj/machinery/power/solar_control{ + id = "forestarboard"; + name = "Starboard Bow Solar Control" + }, +/obj/structure/cable, +/turf/open/floor/vault, +/area/station/ai_monitored/turret_protected/aisat/foyer) "vkx" = ( /obj/machinery/computer/secure_data, /obj/structure/window/reinforced{ @@ -76444,6 +76523,19 @@ dir = 10 }, /area/station/service/pizzeria) +"vkJ" = ( +/obj/structure/window/spawner/east, +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/machinery/microwave{ + desc = "Cooks and boils stuff, somehow."; + pixel_x = -8; + pixel_y = 5 + }, +/turf/open/floor/wood/large, +/area/station/science/research) "vkM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -77573,38 +77665,6 @@ dir = 1 }, /area/station/hallway/secondary/command) -"vAs" = ( -/obj/item/grenade/chem_grenade/smart_metal_foam{ - pixel_x = -4; - pixel_y = 6 - }, -/obj/item/grenade/chem_grenade/smart_metal_foam{ - pixel_x = 4; - pixel_y = 2 - }, -/obj/item/grenade/chem_grenade/smart_metal_foam{ - pixel_x = 8 - }, -/obj/item/grenade/chem_grenade/smart_metal_foam{ - pixel_y = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/window/brigdoor/right/directional/east{ - name = "Command Storage"; - req_access_txt = list("eva") - }, -/obj/structure/rack/shelf, -/obj/machinery/light/warm/directional/west, -/obj/structure/sign/nanotrasen{ - pixel_x = -32 - }, -/obj/effect/turf_decal/trimline/dark_red/filled/line{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/storage/eva) "vAt" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -77703,6 +77763,9 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/science/xenobiology) +"vBP" = ( +/turf/closed/wall/r_wall, +/area/station/science/genetics) "vCe" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/turf_decal/delivery, @@ -78640,6 +78703,10 @@ }, /turf/open/floor/iron/smooth, /area/station/engineering/gravity_generator) +"vPT" = ( +/obj/machinery/light/warm/directional/south, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/aisat/foyer) "vPV" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -79462,19 +79529,6 @@ }, /turf/open/floor/iron/edge, /area/station/commons/storage/primary) -"waH" = ( -/obj/machinery/door/airlock/external{ - name = "MiniSat External Access" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/access/any/science/minisat, -/obj/effect/mapping_helpers/airlock/access/any/engineering/external, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/ai_monitored/turret_protected/aisat/foyer) "waK" = ( /obj/machinery/firealarm/directional/east, /turf/open/floor/glass/reinforced, @@ -79603,6 +79657,25 @@ /obj/structure/cable, /turf/open/floor/iron/smooth, /area/station/maintenance/eva_shed/port) +"wcN" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Storage"; + req_access = list("medical") + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/machinery/duct, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/storage) "wcS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -80153,17 +80226,6 @@ dir = 8 }, /area/station/hallway/primary/central/aft) -"wlm" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/camera/directional/west{ - c_tag = "AI Satellite - Fore Starboard"; - name = "ai camera"; - network = list("minisat"); - start_active = 1 - }, -/obj/structure/cable, -/turf/open/space/basic, -/area/space/nearstation) "wlp" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -82182,27 +82244,6 @@ /obj/machinery/duct, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/commons/vacant_room) -"wNg" = ( -/obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "bridge-left" - }, -/obj/machinery/door/poddoor/preopen{ - id = "bridgedoors"; - name = "Bridge Access Blast Door" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/access/all/command/general, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/command/bridge) "wNh" = ( /obj/effect/turf_decal/trimline/dark_red/filled/line{ dir = 1 @@ -82455,6 +82496,12 @@ /obj/effect/spawner/random/trash/hobo_squat, /turf/open/floor/iron/smooth, /area/station/maintenance/department/engine/atmos) +"wRZ" = ( +/obj/structure/window/spawner/north, +/obj/structure/window/spawner/east, +/obj/structure/flora/rock/pile/jungle, +/turf/open/misc/beach/sand, +/area/station/science/research) "wSc" = ( /obj/structure/closet/secure_closet/blueshield, /obj/effect/turf_decal/bot, @@ -82891,6 +82938,10 @@ /obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron/smooth_large, /area/station/cargo/office) +"xaL" = ( +/obj/docking_port/stationary/escape_pod, +/turf/open/space/basic, +/area/space/nearstation) "xaS" = ( /obj/effect/turf_decal/bot, /obj/machinery/light/warm/directional/south, @@ -83000,53 +83051,6 @@ /obj/effect/turf_decal/trimline/white/mid_joiner, /turf/open/floor/carpet/black, /area/station/commons/dorms) -"xcw" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/bottle/morphine{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/reagent_containers/cup/bottle/morphine{ - pixel_x = -7; - pixel_y = 7 - }, -/obj/item/reagent_containers/cup/bottle/chloralhydrate{ - pixel_x = -7 - }, -/obj/item/reagent_containers/cup/bottle/facid{ - pixel_x = 7 - }, -/obj/item/storage/backpack/duffelbag/sec/surgery{ - pixel_y = 5 - }, -/obj/machinery/button/door/directional/north{ - id = "justiceblast"; - name = "Justice Shutters Control"; - pixel_x = -6; - req_access_txt = "63" - }, -/obj/machinery/button/door/directional/north{ - id = "justicechamber"; - name = "Justice Chamber Control"; - pixel_x = -6; - pixel_y = 36; - req_access_txt = "3" - }, -/obj/machinery/button/ignition{ - id = "justicespark"; - pixel_x = 8; - pixel_y = 24; - req_access_txt = "63" - }, -/obj/machinery/button/flasher{ - id = "justiceflash"; - pixel_x = 8; - pixel_y = 36; - req_access_txt = "63" - }, -/obj/effect/turf_decal/tile/dark_red/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/execution/education) "xcD" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 5 @@ -83056,16 +83060,6 @@ "xcG" = ( /turf/open/floor/engine/air, /area/station/engineering/atmos) -"xcP" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/obj/structure/cable/layer3, -/turf/open/floor/vault, -/area/station/ai_monitored/turret_protected/aisat_interior) "xcV" = ( /obj/structure/closet{ name = "Evidence Closet" @@ -83502,6 +83496,15 @@ "xlB" = ( /turf/open/floor/carpet, /area/station/security/courtroom) +"xlC" = ( +/obj/effect/spawner/liquids_spawner{ + reagent_list = list(/datum/reagent/water=600) + }, +/mob/living/basic/carp/mega/shorki{ + obj_damage = 0 + }, +/turf/open/misc/asteroid, +/area/station/commons/dorms) "xlE" = ( /turf/closed/wall/r_wall, /area/command/heads_quarters/captain/private/nt_rep) @@ -84412,13 +84415,6 @@ /obj/machinery/duct, /turf/open/floor/iron/smooth_large, /area/station/engineering/power_room) -"xwo" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable/layer3, -/turf/open/floor/vault, -/area/station/ai_monitored/turret_protected/aisat_interior) "xwq" = ( /obj/structure/table/glass, /obj/machinery/light/warm/directional/south, @@ -85236,11 +85232,6 @@ /obj/structure/chair/stool/directional/south, /turf/open/floor/iron/grimy, /area/station/commons/lounge) -"xJq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/vault, -/area/station/ai_monitored/turret_protected/aisat/foyer) "xJr" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -85695,6 +85686,11 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/security/lockers) +"xPW" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/aisat/foyer) "xQe" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -85877,11 +85873,6 @@ dir = 8 }, /area/station/science/research) -"xSg" = ( -/obj/structure/cable, -/obj/structure/cable/layer3, -/turf/open/floor/circuit/green, -/area/station/ai_monitored/turret_protected/ai) "xSl" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/trimline/dark_red/filled/line{ @@ -86463,6 +86454,15 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/grimy, /area/station/service/library) +"ybt" = ( +/obj/structure/window/spawner, +/obj/structure/window/spawner/west, +/obj/structure/water_source/puddle, +/obj/structure/flora/bush/reed{ + pixel_y = 8 + }, +/turf/open/floor/grass, +/area/station/science/research) "ybu" = ( /obj/structure/table/reinforced, /obj/item/flashlight/seclite, @@ -100381,7 +100381,7 @@ gPJ gPJ odJ kbK -aTK +dAI gRN uQV uQV @@ -100895,8 +100895,8 @@ odJ odJ jkZ jkZ -gbn -tId +onb +kAk uQV uQV nbB @@ -101153,7 +101153,7 @@ jkZ jkZ shM vFF -eir +vPT uQV uQV uQV @@ -101407,10 +101407,10 @@ odJ odJ odJ jkZ -mYE +vkf vFF vFF -dGc +xPW oBx oBx maR @@ -101425,7 +101425,7 @@ fRS teF fRS fRS -hIV +vaG toj kgu rDp @@ -101663,7 +101663,7 @@ fBB qBR sSj qBR -gLA +dYr huh vFF myX @@ -101920,25 +101920,25 @@ odJ odJ odJ xXv -uuy -poj +cPe +qIb bjS jlK -qJC -ivA -xwo -bLt -xcP -evh -xwo -xwo -trZ -uYc -xSg +ggB +aBb +fOp +nlD +uGy +gvs +fOp +fOp +jbf +gBB +buX rDp -nJG +iPD wyH -eSa +dYb uQi bWK lvx @@ -102181,7 +102181,7 @@ jkZ jkZ vFF cUV -qgo +hSo aMb ocj aLH @@ -102191,14 +102191,14 @@ qic ueg rDp qFF -mLp +elt rDp rDp sMQ rDp sgt uPy -qSP +duG xRB rDp rDp @@ -102433,12 +102433,12 @@ rDl odJ odJ xqO -aDt -amU -waH -xJq -xJq -cpt +meq +iXW +bBp +axd +axd +iSa oBx oBx cfO @@ -102448,14 +102448,14 @@ nfC tPp aeL lvx -pPn -mLp -tNe -mLp -jna -tVN -bXe -tcL +bdP +elt +fyb +elt +bdL +dqT +fjr +uBe rDp rDp rDp @@ -102693,9 +102693,9 @@ xMq jkZ jkZ jkZ -qtY +lBW vFF -kpZ +jfT nAH nAH nAH @@ -102951,11 +102951,11 @@ odJ odJ jkZ jkZ -qZe -tmf +rwg +gtq nAH nAH -ihO +mGP fHk eXP hRb @@ -103465,14 +103465,14 @@ gPJ gPJ odJ kbK -wlm +cpP gRN nAH nAH nAH wkT dFH -jRz +dss sZR rDp rDp @@ -109220,7 +109220,7 @@ gMQ ttw ttw ttw -rsZ +xaL dMY icP rBo @@ -111055,11 +111055,11 @@ jmT jTi eHC mKU -ntA +lVZ xxb gwc sCV -hDK +bmg wfX gwc wfX @@ -112238,7 +112238,7 @@ cLN ttw ttw ttw -rsZ +xaL peN rOA rOA @@ -112560,7 +112560,7 @@ kzU uyk niG niG -mCn +wcN niG niG uyk @@ -114043,14 +114043,14 @@ txu tcm wNy ohH -tTB +bsI ueH jGI aij pOB gty vLk -tTB +bsI wjI wjI wjI @@ -114307,7 +114307,7 @@ csg mJy twz gDd -tTB +bsI fPj lun mEe @@ -114564,7 +114564,7 @@ mXt tzk vSd wue -tTB +bsI gNh wjJ gNh @@ -114809,8 +114809,8 @@ jgD kFS jgD jgD -bRm -rqZ +pDo +sBD sgG pxK dEY @@ -115584,8 +115584,8 @@ vJC oee mwx sTo -hZQ -nKv +ijR +ybt lSX rhM qHf @@ -115617,7 +115617,7 @@ npn awq mgR lcC -hfW +xlC rJK mgR mYm @@ -115841,8 +115841,8 @@ bhF oee mwx sTo -msB -kis +uRG +erV sms cuZ dje @@ -116095,10 +116095,10 @@ bFO sma gHL nvL -amH +uMp ppT sTo -oRw +uIA oej juR gLD @@ -116349,14 +116349,14 @@ rMc mgl hwe glp -oGG -bow +vkJ +cLi lGm -jSh +fHQ nsp sTo -eDT -rab +wRZ +duS lSX poZ fpg @@ -117133,10 +117133,10 @@ wwN nEm nEm sOc -pSW -pSW +qlN +qlN qkB -pSW +qlN hwA mdM gSI @@ -117368,7 +117368,7 @@ mvN imR vwo fUU -dGp +vBP dwE ciI vmI @@ -117882,7 +117882,7 @@ kYC imR wMT eZa -dGp +vBP mVv exy vrs @@ -118139,7 +118139,7 @@ qBT imR wMT eoq -dGp +vBP jTC vBI hlx @@ -118162,9 +118162,9 @@ rqo qEU wvu cuq -pSW +qlN tBV -pSW +qlN thf pav jdS @@ -118396,7 +118396,7 @@ jKG imR wMT vPc -dGp +vBP jYI eKU dcF @@ -118410,7 +118410,7 @@ xJD uih kSn mDf -pSW +qlN xYy wjA uAl @@ -118653,9 +118653,9 @@ sxs imR sdh imR -dGp -dGp -dGp +vBP +vBP +vBP mwS aKt xRV @@ -118667,9 +118667,9 @@ qio qio ycU gMy -pSW +qlN uPU -pSW +qlN aMf wEY vOI @@ -118912,7 +118912,7 @@ pXG uqY dYG sJl -dGp +vBP jGj sNU iwv @@ -118926,14 +118926,14 @@ hfp pdi pGl meP -oGv -oGv +nmx +nmx avA mEl mEl qtP avA -oGv +nmx hZV sgA bmt @@ -119169,22 +119169,22 @@ hhT eSl aWD eYY -dGp +vBP dAP fHq dAP -dGp +vBP qDW qki qDW -rar +eLM eLH gmd qSW -rar +eLM cKH pOh -oGv +nmx lue sYe yeD @@ -119438,16 +119438,16 @@ ycy nKq rIU cAG -rar +eLM hVA fsY -oGv +nmx tox dvq vNz dHE mSx -oGv +nmx dto dto idu @@ -119691,14 +119691,14 @@ ijy ijy bbr iQp -rar +eLM aoH vlH uzi -rar +eLM xfM wjk -oGv +nmx qOu hMQ seo @@ -119948,11 +119948,11 @@ nXj rPp pGh nJx -rar +eLM eLH -rar +eLM eLH -rar +eLM xfM gjl fwk @@ -120211,13 +120211,13 @@ dJu mGE gmd snv -oGv -oGv +nmx +nmx vnc itE itE aWC -oGv +nmx mMu qSu qSu @@ -120440,10 +120440,10 @@ nIK xrw lCH kgR -sAq +cGr eSv bbh -rzb +soM srd gGF hZv @@ -120954,10 +120954,10 @@ cjx ncO lCH opM -slc +hok wLh bIN -wNg +sFN vGz oJI jqL @@ -121496,10 +121496,10 @@ urd rnH rNk qOn -mXR +iMs fbF fbF -mXR +iMs wzH wzH wzH @@ -121753,7 +121753,7 @@ fXv kbz fdi epl -mXR +iMs kQm tcV jEk @@ -122010,7 +122010,7 @@ ajg vzJ teQ fqI -mXR +iMs jsn jrQ jEk @@ -122267,7 +122267,7 @@ ldo naL wkj ajg -mXR +iMs xdB fcH uND @@ -122524,7 +122524,7 @@ xIC tmH dmU dAo -mXR +iMs axF rAV jEk @@ -122781,7 +122781,7 @@ drv wjq ajg iVj -mXR +iMs dxK dxK dxK @@ -123013,7 +123013,7 @@ xlE qDF kyd kWw -vAs +lDy fho ygP uOg @@ -123807,7 +123807,7 @@ wWQ lQU whY aDR -baM +kIV aDR aDR aDR @@ -124538,7 +124538,7 @@ fXl ttw ttw ttw -rsZ +xaL oyq ljV xkP @@ -124573,8 +124573,8 @@ kkk tqV vZI cFf -uAp -uAp +fQL +fQL cFf ioE xBE @@ -125091,7 +125091,7 @@ txi qLS mjP dBL -ryf +hqf nPb rUr tsG @@ -125339,7 +125339,7 @@ ttw oEn nGV dsV -bGX +cPb ngD ngD rNJ @@ -126376,9 +126376,9 @@ jty jty dps uxs -ufh +aGu ilA -jpL +gkT lvL ueZ oae @@ -129721,7 +129721,7 @@ oao bMa rPq eUy -lQd +mKV ttw ttw ttw @@ -131072,7 +131072,7 @@ emO dTO aWW iVW -fmd +coN pjT xMq sFi @@ -133328,7 +133328,7 @@ dRS dRS eAO mjH -xcw +jrs gnf mjH mjH diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm index 2612ce60038..2f5529bb273 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -4778,7 +4778,7 @@ "bDM" = ( /obj/machinery/door/airlock/centcom{ name = "Communications Access"; - req_one_access_txt = list("cent_general","captain") + req_one_access = list("cent_general","captain") }, /obj/effect/mapping_helpers/airlock/cutaiwire, /obj/effect/mapping_helpers/airlock/access/all/admin/general, @@ -5310,7 +5310,7 @@ "cOV" = ( /obj/machinery/door/airlock/centcom{ name = "Administrative Offices"; - req_one_access_txt = list("cent_general","captain") + req_one_access = list("cent_general","captain") }, /obj/effect/turf_decal/siding/white{ dir = 8 @@ -10154,7 +10154,7 @@ "pDd" = ( /obj/machinery/door/airlock/centcom{ name = "Administrative Offices"; - req_one_access_txt = list("cent_general","captain") + req_one_access = list("cent_general","captain") }, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/machinery/button/door/directional/west{ @@ -10241,7 +10241,7 @@ "pHe" = ( /obj/machinery/door/airlock/centcom{ name = "Administrative Offices"; - req_one_access_txt = list("cent_general","captain") + req_one_access = list("cent_general","captain") }, /obj/effect/mapping_helpers/airlock/access/all/command/captain, /obj/effect/turf_decal/trimline/dark_green/corner, @@ -13009,7 +13009,7 @@ "wyL" = ( /obj/machinery/door/airlock/centcom{ name = "ERT Access"; - req_one_access_txt = list("cent_general","captain") + req_one_access = list("cent_general","captain") }, /obj/effect/turf_decal/siding/white{ dir = 4 diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_upperbridgeright_1.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_upperbridgeright_1.dmm index b26826a8a91..351cdddeccf 100644 --- a/_maps/map_files/tramstation/modular_pieces/maintenance_upperbridgeright_1.dmm +++ b/_maps/map_files/tramstation/modular_pieces/maintenance_upperbridgeright_1.dmm @@ -44,7 +44,7 @@ /obj/effect/turf_decal/delivery/red, /obj/item/key/security, /obj/machinery/door/window/left/directional/north{ - req_access_txt = "security"; + req_access = list("security"); name = "Secway Storage" }, /turf/open/floor/iron/smooth, diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_upperbridgeright_2.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_upperbridgeright_2.dmm index f845fae10d9..7bed8217832 100644 --- a/_maps/map_files/tramstation/modular_pieces/maintenance_upperbridgeright_2.dmm +++ b/_maps/map_files/tramstation/modular_pieces/maintenance_upperbridgeright_2.dmm @@ -352,7 +352,7 @@ /obj/item/key/security, /obj/machinery/door/window/left/directional/north{ name = "Secway Storage"; - req_access_txt = "security" + req_access = list("security") }, /turf/open/floor/iron/smooth, /area/station/maintenance/department/security) diff --git a/_maps/shuttles/skyrat/slaver_syndie.dmm b/_maps/shuttles/skyrat/slaver_syndie.dmm index 871bc585576..7b2a54393aa 100644 --- a/_maps/shuttles/skyrat/slaver_syndie.dmm +++ b/_maps/shuttles/skyrat/slaver_syndie.dmm @@ -730,7 +730,7 @@ /obj/effect/turf_decal/stripes/full, /obj/machinery/door/airlock/external/glass{ id_tag = "prisonshipwreckdoorright"; - req_one_access_txt = "1,2,3,150" + req_one_access = list("security","brig","armory","syndicate") }, /obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cutaiwire, @@ -769,7 +769,7 @@ desc = "Kinda sleek. Doesn't offer much privacy."; dir = 8; name = "Prison Cell Door"; - req_one_access_txt = "1,2,3,150" + req_one_access = list("security","brig","armory","syndicate") }, /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 @@ -1096,7 +1096,7 @@ "SA" = ( /obj/machinery/door/airlock/external/glass{ id_tag = "prisonshipwreckdock"; - req_one_access_txt = "1,2,3,150" + req_one_access = list("security","brig","armory","syndicate") }, /obj/effect/mapping_helpers/airlock/cutaiwire, /obj/docking_port/mobile/pirate{ @@ -1221,7 +1221,7 @@ "XM" = ( /obj/machinery/door/airlock/external/glass{ id_tag = "prisonshipwreckdoorleft"; - req_one_access_txt = "1,2,3,150" + req_one_access = list("security","brig","armory","syndicate") }, /obj/effect/turf_decal/stripes/full, /obj/structure/fans/tiny, diff --git a/_maps/skyrat/automapper/templates/centcom/centcom_ferry_dock.dmm b/_maps/skyrat/automapper/templates/centcom/centcom_ferry_dock.dmm index ca63915803a..8d65b904e27 100644 --- a/_maps/skyrat/automapper/templates/centcom/centcom_ferry_dock.dmm +++ b/_maps/skyrat/automapper/templates/centcom/centcom_ferry_dock.dmm @@ -296,7 +296,7 @@ "By" = ( /obj/machinery/door/airlock/centcom{ name = "Orbital Drop Pod Loading"; - req_access_txt = "106" + req_access = list("cent_storage") }, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) diff --git a/_maps/skyrat/xenoarch_base.dmm b/_maps/skyrat/xenoarch_base.dmm index 3d6209b242f..09fea7fc381 100644 --- a/_maps/skyrat/xenoarch_base.dmm +++ b/_maps/skyrat/xenoarch_base.dmm @@ -793,7 +793,7 @@ /obj/structure/cable, /obj/machinery/door/airlock/engineering/glass{ name = "Xenoarch Engineering"; - req_one_access_txt = "32;19" + req_one_access = list("construction","command") }, /obj/machinery/door/firedoor, /turf/open/floor/iron, @@ -1029,7 +1029,7 @@ /obj/structure/cable, /obj/machinery/door/airlock/engineering/glass{ name = "Xenoarch Engineering"; - req_one_access_txt = "32;19" + req_one_access = list("construction","command") }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -1039,7 +1039,7 @@ "nR" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Xenoarch Engineering"; - req_one_access_txt = "32;19" + req_one_access = list("construction","command") }, /obj/machinery/door/firedoor, /turf/open/floor/iron, @@ -1927,7 +1927,7 @@ /obj/structure/cable, /obj/machinery/door/airlock/engineering/glass{ name = "Xenoarch Engineering"; - req_one_access_txt = "32;19" + req_one_access = list("construction","command") }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -2034,7 +2034,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance_hatch{ - req_one_access_txt = "32;19" + req_one_access = list("construction","command") }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, @@ -2110,7 +2110,7 @@ /area/mine/xenoarch/maintenance/west) "Ea" = ( /obj/machinery/door/airlock/maintenance_hatch{ - req_one_access_txt = "32;19" + req_one_access = list("construction","command") }, /turf/open/floor/plating, /area/mine/xenoarch/engineering/hfr) @@ -2319,7 +2319,7 @@ /obj/structure/cable, /obj/machinery/door/airlock/engineering/glass{ name = "Xenoarchaeology Engineering"; - req_one_access_txt = "32;19" + req_one_access = list("construction","command") }, /obj/machinery/door/firedoor, /turf/open/floor/iron, @@ -2575,7 +2575,7 @@ /obj/structure/cable, /obj/machinery/door/airlock/engineering/glass{ name = "Xenoarch Engineering"; - req_one_access_txt = "32;19" + req_one_access = list("construction","command") }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 7caec37ffa4..7d718e4bd80 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -39,9 +39,9 @@ src.check_access(null) - if(req_access.len || req_one_access.len) + if(length(req_access) || length(req_one_access)) board = new(src) - if(req_access.len) + if(length(req_access)) board.accesses = req_access else board.one_access = 1 diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index b8d9680e8f0..a780946e64a 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1482,7 +1482,6 @@ var/obj/item/electronics/airlock/ae if(!electronics) ae = new/obj/item/electronics/airlock(loc) - gen_access() if(length(req_one_access)) ae.one_access = 1 ae.accesses = req_one_access diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index c416c14731b..d241e914ea3 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -335,7 +335,7 @@ /obj/machinery/door/airlock/external/Initialize(mapload, ...) // default setting is for mapping only, let overrides work - if(!mapload || req_access_txt || req_one_access_txt) + if(!mapload) req_access = null return ..() diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index e6a4f8ceab7..78a08c351e7 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -28,10 +28,13 @@ var/infinite_reskin = FALSE // Access levels, used in modules\jobs\access.dm + /// List of accesses needed to use this object: The user must possess all accesses in this list in order to use the object. + /// Example: If req_access = list(ACCESS_ENGINE, ACCESS_CE)- then the user must have both ACCESS_ENGINE and ACCESS_CE in order to use the object. var/list/req_access - var/req_access_txt = "0" + /// List of accesses needed to use this object: The user must possess at least one access in this list in order to use the object. + /// Example: If req_one_access = list(ACCESS_ENGINE, ACCESS_CE)- then the user must have either ACCESS_ENGINE or ACCESS_CE in order to use the object. var/list/req_one_access - var/req_one_access_txt = "0" + /// Custom fire overlay icon var/custom_fire_overlay diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 092ad7726ba..563e475ef5c 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -490,7 +490,6 @@ var/obj/item/electronics/airlock/electronics_ref if (!electronics) electronics_ref = new /obj/item/electronics/airlock(loc) - gen_access() if (req_one_access.len) electronics_ref.one_access = 1 electronics_ref.accesses = req_one_access diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 0460abe61ba..b1e1e8ea48f 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -57,39 +57,12 @@ /obj/item/proc/InsertID() return FALSE -/obj/proc/text2access(access_text) - . = list() - if(!access_text) - return - var/list/split = splittext(access_text,";") - for(var/x in split) - var/n = text2num(x) - if(n) - . += n - -//Call this before using req_access or req_one_access directly -/obj/proc/gen_access() - //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() - for(var/a in text2access(req_access_txt)) - req_access += a - if(!req_one_access) - req_one_access = list() - for(var/b in text2access(req_one_access_txt)) - req_one_access += b - // Check if an item has access to this object /obj/proc/check_access(obj/item/I) return check_access_list(I ? I.GetAccess() : null) /obj/proc/check_access_list(list/access_list) - gen_access() - - if(!islist(req_access)) //something's very wrong - return TRUE - - if(!req_access.len && !length(req_one_access)) + if(!length(req_access) && !length(req_one_access)) return TRUE if(!length(access_list) || !islist(access_list)) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 96f09e296a8..31ce2ec092f 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -169,10 +169,6 @@ ///A variable to change on a per instance basis on the map that allows the instance to force cost and ID requirements var/onstation_override = FALSE //change this on the object on the map to override the onstation check. DO NOT APPLY THIS GLOBALLY. - ///ID's that can load this vending machine wtih refills - var/list/canload_access_list - - var/list/vending_machine_input = list() ///Display header on the input view var/input_display_header = "Custom Vendor" @@ -806,30 +802,17 @@ . = ..() /** - * Is the passed in user allowed to load this vending machines compartments + * Is the passed in user allowed to load this vending machines compartments? This only is ran if we are using a /obj/item/storage/bag to load the vending machine, and not a dedicated restocker. * * Arguments: * * user - mob that is doing the loading of the vending machine */ /obj/machinery/vending/proc/compartmentLoadAccessCheck(mob/user) - if(!canload_access_list) + if(!req_access || allowed(user) || (obj_flags & EMAGGED) || !scan_id) return TRUE - else - var/do_you_have_access = FALSE - var/req_access_txt_holder = req_access_txt - for(var/i in canload_access_list) - req_access_txt = i - if(!allowed(user) && !(obj_flags & EMAGGED) && scan_id) - continue - else - do_you_have_access = TRUE - break //you passed don't bother looping anymore - req_access_txt = req_access_txt_holder // revert to normal (before the proc ran) - if(do_you_have_access) - return TRUE - else - to_chat(user, span_warning("[src]'s input compartment blinks red: Access denied.")) - return FALSE + + to_chat(user, span_warning("[src]'s input compartment blinks red: Access denied.")) + return FALSE /obj/machinery/vending/exchange_parts(mob/user, obj/item/storage/part_replacer/W) if(!istype(W)) diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm index 251afbce76b..22d17761bf1 100644 --- a/code/modules/vending/snack.dm +++ b/code/modules/vending/snack.dm @@ -35,7 +35,7 @@ /obj/item/food/pistachios = 3, ) refill_canister = /obj/item/vending_refill/snack - canload_access_list = list(ACCESS_KITCHEN) + req_access = list(ACCESS_KITCHEN) default_price = PAYCHECK_CREW * 0.6 extra_price = PAYCHECK_CREW payment_department = ACCOUNT_SRV diff --git a/code/modules/wiremod/components/id/access_checker.dm b/code/modules/wiremod/components/id/access_checker.dm index f578bfd1575..038f4078ecb 100644 --- a/code/modules/wiremod/components/id/access_checker.dm +++ b/code/modules/wiremod/components/id/access_checker.dm @@ -16,10 +16,6 @@ "id-card" = "access", ) -/obj/item/circuit_component/compare/access/Initialize(mapload) - . = ..() - gen_access() - /obj/item/circuit_component/compare/access/get_ui_notices() . = ..() . += create_ui_notice("When \"Check Any\" is true, returns true if \"Access To Check\" contains ANY value in \"Required Access\".", "orange", "info") diff --git a/modular_skyrat/modules/faction/maps/shuttles/tradership_faction.dmm b/modular_skyrat/modules/faction/maps/shuttles/tradership_faction.dmm index 550171a9b18..9caba548067 100644 --- a/modular_skyrat/modules/faction/maps/shuttles/tradership_faction.dmm +++ b/modular_skyrat/modules/faction/maps/shuttles/tradership_faction.dmm @@ -31,7 +31,7 @@ /area/shuttle/trader/crew) "ah" = ( /obj/machinery/door/airlock/external{ - req_access_txt = "401" + req_access = list("401") }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/docking_port/mobile{ @@ -97,7 +97,7 @@ name = "Port Blast Door Control"; pixel_x = -24; pixel_y = 5; - req_access_txt = "403" + req_access = list("403") }, /obj/structure/closet/crate/secure/tradership_cargo_valuable{ used_preset = 4 @@ -165,7 +165,7 @@ name = "Port Blast Door Control"; pixel_x = 24; pixel_y = 5; - req_access_txt = "403" + req_access = list("403") }, /obj/structure/closet/crate/tradership_cargo, /turf/open/floor/iron/dark, @@ -372,7 +372,7 @@ /area/shuttle/trader/crew) "aI" = ( /obj/machinery/door/airlock/external{ - req_access_txt = "401" + req_access = list("401") }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -441,7 +441,7 @@ "aQ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/door/airlock/external{ - req_access_txt = "402" + req_access = list("402") }, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable, @@ -500,7 +500,7 @@ /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/door/airlock/external{ - req_access_txt = "402" + req_access = list("402") }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -581,7 +581,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/door/airlock/glass{ name = "Crew Quarters"; - req_access_txt = "402" + req_access = list("402") }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -867,7 +867,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/door/airlock/engineering{ name = "Engineering"; - req_access_txt = "402" + req_access = list("402") }, /obj/structure/cable, /turf/open/floor/plating, @@ -1315,7 +1315,7 @@ locked = 0; pixel_y = 28; req_access = null; - req_access_txt = "402" + req_access = list("402") }, /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/tile/blue{ @@ -1338,7 +1338,7 @@ /area/shuttle/trader/bridge) "ch" = ( /obj/machinery/door/airlock/external{ - req_access_txt = "402" + req_access = list("402") }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -1358,7 +1358,7 @@ /area/shuttle/trader/engine) "cj" = ( /obj/machinery/door/airlock/external{ - req_access_txt = "402" + req_access = list("402") }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -1451,7 +1451,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/door/airlock/command{ name = "Bridge"; - req_access_txt = "403"" + req_access = list("403") }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -1625,7 +1625,7 @@ /obj/machinery/vending/boozeomat{ pixel_y = -32; req_access = null; - req_access_txt = "403" + req_access = list("403") }, /turf/open/floor/iron/dark, /area/shuttle/trader/bridge) @@ -1656,14 +1656,14 @@ name = "Bridge Blast Door Control"; pixel_x = 5; pixel_y = -24; - req_access_txt = "402" + req_access = list("402") }, /obj/machinery/button/door{ id = "whiteship_windows"; name = "Windows Blast Door Control"; pixel_x = -5; pixel_y = -24; - req_access_txt = "402" + req_access = list("402") }, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/dark, @@ -2163,7 +2163,7 @@ "dt" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/door/airlock/external{ - req_access_txt = "402"" + req_access = list("402") }, /obj/structure/cable, /turf/open/floor/plating, @@ -2188,7 +2188,7 @@ /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/door/airlock/external{ - req_access_txt = "402" + req_access = list("402") }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -2424,7 +2424,7 @@ /area/shuttle/trader/bar) "dP" = ( /obj/machinery/door/airlock/external{ - req_access_txt = "401" + req_access = list("401") }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/decal/cleanable/dirt/dust, @@ -2524,7 +2524,7 @@ name = "Starboard Blast Door Control"; pixel_x = -24; pixel_y = -5; - req_access_txt = "403" + req_access = list("403") }, /obj/structure/closet/crate/secure/tradership_cargo_valuable{ used_preset = 2 @@ -2548,7 +2548,7 @@ name = "Starboard Blast Door Control"; pixel_x = 24; pixel_y = -5; - req_access_txt = "403" + req_access = list("403") }, /obj/structure/closet/crate/tradership_cargo, /turf/open/floor/iron/dark, @@ -2658,7 +2658,7 @@ /area/shuttle/trader/cargo) "ej" = ( /obj/machinery/door/airlock/external{ - req_access_txt = "401" + req_access = list("401") }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1