From 9b56b96a8d54ec0c1d36f2becfc2e298005fe75d Mon Sep 17 00:00:00 2001 From: Zack Date: Mon, 12 Feb 2024 15:40:18 -0600 Subject: [PATCH] Fixes labor camp airlocks bolting open during a greytide tide event on NSS cyberiad (#23981) * damnit * Fixed what DGgamer said on discord --- _maps/map_files/cyberiad/cyberiad.dmm | 116 ++++++++++++++++---------- 1 file changed, 73 insertions(+), 43 deletions(-) diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index fac7a19ea6a..ec72572e8b2 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -804,7 +804,7 @@ "aeF" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, -/area/station/security/brig) +/area/station/security/prisonershuttle) "aeG" = ( /obj/structure/cable{ d1 = 4; @@ -812,7 +812,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel, -/area/station/security/brig) +/area/station/security/prisonershuttle) "aeH" = ( /obj/machinery/computer/secure_data{ dir = 8 @@ -821,7 +821,7 @@ dir = 5; icon_state = "red" }, -/area/station/security/brig) +/area/station/security/prisonershuttle) "aeI" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -835,7 +835,7 @@ dir = 4; icon_state = "redcorner" }, -/area/station/security/brig) +/area/station/security/prisonershuttle) "aeP" = ( /obj/machinery/light/small{ dir = 1 @@ -965,7 +965,7 @@ /area/station/command/office/hos) "afa" = ( /turf/simulated/floor/plasteel, -/area/station/security/brig) +/area/station/security/prisonershuttle) "afc" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/cable{ @@ -974,7 +974,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel, -/area/station/security/brig) +/area/station/security/prisonershuttle) "afe" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -1038,11 +1038,19 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + name = "east bump"; + pixel_x = 24 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" }, -/area/station/security/brig) +/area/station/security/prisonershuttle) "afp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1053,8 +1061,13 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/plasteel, -/area/station/security/brig) +/area/station/security/prisonershuttle) "afq" = ( /turf/simulated/floor/carpet/black, /area/station/command/meeting_room) @@ -1151,14 +1164,14 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/effect/mapping_helpers/airlock/unres{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/doors, /turf/simulated/floor/plasteel{ icon_state = "red" }, -/area/station/security/brig) +/area/station/security/prisonershuttle) "afV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1181,14 +1194,14 @@ icon_state = "2-8" }, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/effect/mapping_helpers/airlock/unres{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/doors, /turf/simulated/floor/plasteel{ icon_state = "red" }, -/area/station/security/brig) +/area/station/security/prisonershuttle) "afX" = ( /obj/structure/grille, /turf/simulated/floor/plating/airless, @@ -3502,7 +3515,7 @@ /turf/simulated/floor/plasteel{ icon_state = "red" }, -/area/station/security/brig) +/area/station/security/prisonershuttle) "ann" = ( /obj/structure/cable, /obj/structure/lattice/catwalk, @@ -5933,7 +5946,7 @@ dir = 8; icon_state = "red" }, -/area/station/security/brig) +/area/station/security/prisonershuttle) "atO" = ( /obj/machinery/door/airlock/public/glass{ name = "Prison Forestry" @@ -6157,7 +6170,7 @@ dir = 1; icon_state = "red" }, -/area/station/security/brig) +/area/station/security/prisonershuttle) "auB" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plating, @@ -6170,7 +6183,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/station/security/brig) +/area/station/security/prisonershuttle) "auF" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ @@ -6294,7 +6307,7 @@ dir = 4; icon_state = "red" }, -/area/station/security/brig) +/area/station/security/prisonershuttle) "auW" = ( /obj/machinery/power/apc{ dir = 4; @@ -6804,7 +6817,7 @@ dir = 5 }, /turf/simulated/floor/plasteel, -/area/station/security/brig) +/area/station/security/prisonershuttle) "awC" = ( /obj/structure/chair, /obj/structure/cable{ @@ -7392,7 +7405,7 @@ dir = 8; icon_state = "red" }, -/area/station/security/brig) +/area/station/security/prisonershuttle) "ayp" = ( /obj/structure/chair{ dir = 4 @@ -8032,7 +8045,7 @@ dir = 1; icon_state = "redcorner" }, -/area/station/security/brig) +/area/station/security/prisonershuttle) "azW" = ( /obj/structure/closet/secure_closet/brig{ id = "Cell 5"; @@ -8557,7 +8570,7 @@ "aBA" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/station/security/brig) +/area/station/security/prisonershuttle) "aBG" = ( /obj/structure/cable{ d1 = 4; @@ -58015,7 +58028,7 @@ dir = 4; icon_state = "redcorner" }, -/area/station/security/brig) +/area/station/security/prisonershuttle) "fvV" = ( /obj/structure/table, /obj/item/toy/crayon/spraycan, @@ -65372,7 +65385,7 @@ }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, -/area/station/security/brig) +/area/station/security/prisonershuttle) "jfa" = ( /obj/machinery/light{ dir = 1 @@ -68792,7 +68805,7 @@ dir = 10; icon_state = "red" }, -/area/station/security/brig) +/area/station/security/prisonershuttle) "kQg" = ( /obj/machinery/flasher{ id = "AI"; @@ -71823,7 +71836,7 @@ icon_state = "0-4" }, /turf/simulated/floor/plating, -/area/station/security/brig) +/area/station/security/prisonershuttle) "mnp" = ( /obj/structure/statue/cyberiad/north, /obj/structure/cable{ @@ -79525,7 +79538,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/station/security/brig) +/area/station/security/prisonershuttle) "qhq" = ( /turf/simulated/wall, /area/station/science/misc_lab) @@ -80666,7 +80679,7 @@ /obj/effect/mapping_helpers/airlock/access/all/security/brig, /obj/structure/fans/tiny, /turf/simulated/floor/plating, -/area/station/security/brig) +/area/station/security/prisonershuttle) "qDJ" = ( /obj/structure/table_frame, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -81635,7 +81648,7 @@ icon_state = "0-2" }, /turf/simulated/floor/plating, -/area/station/security/brig) +/area/station/security/prisonershuttle) "rcW" = ( /obj/structure/railing, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -82660,7 +82673,7 @@ dir = 8; icon_state = "red" }, -/area/station/security/brig) +/area/station/security/prisonershuttle) "rDI" = ( /obj/machinery/economy/vending/medical, /turf/simulated/floor/plasteel{ @@ -84010,6 +84023,9 @@ icon_state = "white" }, /area/station/science/xenobiology) +"spM" = ( +/turf/simulated/wall/r_wall, +/area/station/security/prisonershuttle) "sqb" = ( /obj/structure/bed, /obj/structure/window/reinforced{ @@ -87578,6 +87594,17 @@ /obj/effect/spawner/random_spawners/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) +"ugH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/alarm{ + dir = 1; + name = "south bump"; + pixel_y = -24 + }, +/turf/simulated/floor/plasteel, +/area/station/security/prisonershuttle) "ugW" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/effect/decal/cleanable/dirt, @@ -89904,7 +89931,7 @@ /turf/simulated/floor/plasteel{ icon_state = "red" }, -/area/station/security/brig) +/area/station/security/prisonershuttle) "vtG" = ( /obj/machinery/door/airlock/external{ id_tag = "aisat_door_ext"; @@ -91926,7 +91953,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/station/security/brig) +/area/station/security/prisonershuttle) "wsY" = ( /obj/structure/table, /obj/item/storage/box/prisoner, @@ -93074,7 +93101,7 @@ icon_state = "0-8" }, /turf/simulated/floor/plating, -/area/station/security/brig) +/area/station/security/prisonershuttle) "wZM" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -95486,6 +95513,9 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint2) +"ygh" = ( +/turf/simulated/wall, +/area/station/security/prisonershuttle) "ygr" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -118542,7 +118572,7 @@ aaa aaa aaa aaa -aqI +spM mnj abN abN @@ -118799,12 +118829,12 @@ aaa aaa aaa aaa -aqI +spM ayo atN rCT kQb -auc +ygh qNk pYa pzZ @@ -119061,7 +119091,7 @@ auC jeQ awB vtj -auc +ygh hiO uGA dFG @@ -119318,7 +119348,7 @@ fvy aBA wsT ank -auc +ygh akm lJf anu @@ -119570,12 +119600,12 @@ aaa aaa aaa aaa -aqI +spM auy aeF -wsT -auc -auc +ugH +ygh +ygh gWZ eiv uFa @@ -120341,7 +120371,7 @@ aaa aaa aaa aaa -aqI +spM aeI afc afp @@ -120598,7 +120628,7 @@ aaa aaa aaa aaa -aqI +spM aeH auV afo