From b4dcbb638e8c5068406bd7ff802ed852098dfc0f Mon Sep 17 00:00:00 2001 From: zerothebigboy Date: Tue, 14 Sep 2021 09:19:19 -0400 Subject: [PATCH 1/6] shit --- _maps/map_files/BoxStation/BoxStation.dmm | 1464 +++++++++++++-------- 1 file changed, 945 insertions(+), 519 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 26253018ff..d0f51e3460 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -94,6 +94,13 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/item/radio/intercom{ + desc = "Talk through this. It looks like it has been modified to not broadcast."; + name = "Prison Intercom (General)"; + pixel_x = -27; + pixel_y = -27; + prison_radio = 1 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "aao" = ( @@ -105,6 +112,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/security/prison/upper) "aap" = ( @@ -123,6 +131,11 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/security/prison) "aau" = ( @@ -154,6 +167,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/security/prison/upper) "aay" = ( @@ -206,6 +220,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/security/prison/upper) "aaC" = ( @@ -220,6 +235,8 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/decal/cleanable/blood/old, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/security/prison/upper) "aaD" = ( @@ -394,6 +411,9 @@ name = "Permabrig Transfer"; req_access_txt = "2" }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/dark, /area/security/prison) "aaV" = ( @@ -532,6 +552,10 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/decal/cleanable/blood/old, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "abi" = ( @@ -603,13 +627,6 @@ }, /turf/open/floor/plasteel/dark, /area/command/heads_quarters/hos) -"abs" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/tracker, -/turf/open/floor/plasteel/airless/solarpanel, -/area/solars/port/fore) "abt" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -684,6 +701,7 @@ /area/security/prison/upper) "abF" = ( /obj/structure/table, +/obj/item/flashlight/lamp, /turf/open/floor/plasteel/dark, /area/security/prison/upper) "abG" = ( @@ -728,13 +746,7 @@ /obj/structure/chair{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/security/prison) "abL" = ( /obj/structure/chair/stool, @@ -836,13 +848,6 @@ /obj/structure/grille, /turf/open/space, /area/space/nearstation) -"abZ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/solars/port/fore) "aca" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -873,6 +878,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/security/prison) "acg" = ( @@ -1129,6 +1140,11 @@ dir = 1; light_color = "#ffc1c1" }, +/obj/machinery/button/door{ + id = "permacells1"; + name = "Privacy Shutters"; + pixel_x = 25 + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "acC" = ( @@ -1140,6 +1156,12 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/security/prison) "acD" = ( @@ -1161,11 +1183,7 @@ dir = 4; light_color = "#c1caff" }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/security/prison) "acF" = ( /obj/machinery/light_switch{ @@ -1318,16 +1336,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"acV" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/solars/port/fore) "acW" = ( /obj/structure/cable{ icon_state = "0-2" @@ -1343,13 +1351,23 @@ dir = 8 }, /obj/structure/table, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/shoes/sneakers/orange{ + pixel_y = 8 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/item/clothing/shoes/sneakers/orange{ + pixel_y = 8 }, -/turf/open/floor/plasteel/dark, +/obj/item/clothing/shoes/sneakers/orange{ + pixel_y = 8 + }, +/obj/item/clothing/shoes/sneakers/orange{ + pixel_y = 8 + }, +/turf/open/floor/plasteel, /area/security/prison) "ada" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -1358,6 +1376,12 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/security/prison) "adb" = ( @@ -1369,11 +1393,23 @@ /area/security/prison/upper) "add" = ( /obj/structure/table, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/item/clothing/under/rank/prisoner/skirt, +/obj/item/clothing/under/rank/prisoner/skirt, +/obj/item/clothing/under/rank/prisoner/skirt, +/obj/item/clothing/under/rank/prisoner/skirt, +/obj/item/clothing/shoes/sneakers/orange{ + pixel_y = 8 }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel/dark, +/obj/item/clothing/shoes/sneakers/orange{ + pixel_y = 8 + }, +/obj/item/clothing/shoes/sneakers/orange{ + pixel_y = 8 + }, +/obj/item/clothing/shoes/sneakers/orange{ + pixel_y = 8 + }, +/turf/open/floor/plasteel, /area/security/prison) "adf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -1523,24 +1559,6 @@ /obj/effect/landmark/barthpot, /turf/open/floor/wood, /area/service/library) -"adw" = ( -/obj/structure/cable, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/solars/port/fore) -"adx" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/solars/port/fore) "ady" = ( /obj/structure/lattice/catwalk, /turf/open/space, @@ -1616,6 +1634,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/security/prison) "adI" = ( @@ -1807,13 +1826,6 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/solars/starboard/fore) -"adZ" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/solars/port/fore) "aeb" = ( /obj/structure/table, /obj/item/storage/box/handcuffs{ @@ -1839,8 +1851,12 @@ /area/security/prison) "aed" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/computer/prisoner/management, /obj/effect/turf_decal/delivery, +/obj/machinery/disposal/deliveryChute, +/obj/structure/plasticflaps/opaque{ + name = "Prisoner Transfer" + }, +/obj/structure/disposalpipe/trunk, /turf/open/floor/plasteel/dark, /area/security/prison) "aef" = ( @@ -1848,15 +1864,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -1866,7 +1873,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, /area/security/prison) "aeh" = ( /obj/effect/turf_decal/tile/red{ @@ -1879,9 +1895,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, /turf/open/floor/plasteel, /area/security/prison) "aei" = ( @@ -1901,6 +1914,9 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/machinery/light_switch{ + pixel_y = 23 + }, /turf/open/floor/plasteel, /area/security/prison) "aek" = ( @@ -1919,11 +1935,6 @@ /turf/open/floor/plasteel, /area/security/prison) "ael" = ( -/obj/machinery/button/flasher{ - id = "PCell 2"; - pixel_x = 6; - pixel_y = 24 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -1937,9 +1948,7 @@ /area/security/prison) "aem" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/security/prison) "aen" = ( @@ -1981,11 +1990,6 @@ /turf/open/floor/plasteel, /area/security/prison) "aeq" = ( -/obj/machinery/button/flasher{ - id = "PCell 1"; - pixel_x = 6; - pixel_y = 24 - }, /obj/effect/turf_decal/tile/red{ dir = 4 }, @@ -2221,21 +2225,15 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/structure/cable{ icon_state = "2-4" }, /obj/structure/cable{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/prison) "aeO" = ( @@ -2677,31 +2675,20 @@ }, /turf/open/floor/plasteel/dark, /area/security/prison) -"afz" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/prison) "afA" = ( /obj/structure/reagent_dispensers/peppertank{ pixel_y = -32 }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, /area/security/prison) "afB" = ( /obj/item/radio/intercom{ @@ -2809,9 +2796,6 @@ pixel_y = -27 }, /obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, /turf/open/floor/plasteel, /area/security/prison) "afK" = ( @@ -4324,9 +4308,6 @@ /turf/open/floor/plating, /area/security/brig) "aik" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -4981,9 +4962,6 @@ /turf/open/floor/plasteel, /area/commons/vacant_room/office/b) "aju" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/cable{ icon_state = "2-4" }, @@ -5303,13 +5281,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/solars/port/fore) -"ajW" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/solars/port/fore) "ajX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -6531,19 +6502,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/courtroom) -"amv" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/solars/port/fore) "amw" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -8392,16 +8350,6 @@ }, /turf/open/floor/plasteel, /area/security/processing) -"aqJ" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/solars/port/fore) "aqN" = ( /obj/structure/closet/secure_closet/warden, /obj/structure/sign/poster/official/ion_rifle{ @@ -41408,10 +41356,6 @@ "bXs" = ( /turf/open/floor/plasteel/white, /area/science/circuit) -"bXv" = ( -/obj/item/stack/rods, -/turf/open/space, -/area/space) "bXw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel, @@ -51424,6 +51368,16 @@ /obj/item/reagent_containers/food/drinks/britcup, /turf/open/floor/plasteel, /area/commons/dorms) +"cHk" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/solar{ + id = "auxsolareast"; + name = "Port Auxiliary Solar Array" + }, +/turf/open/floor/plasteel/airless/solarpanel, +/area/space/nearstation) "cHD" = ( /obj/structure/cable{ icon_state = "1-2" @@ -52901,6 +52855,12 @@ light_color = "#ffc1c1" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/decal/cleanable/blood/old, +/obj/machinery/button/door{ + id = "permacells3"; + name = "Privacy Shutters"; + pixel_x = 25 + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "dJL" = ( @@ -53009,6 +52969,7 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/security/prison/upper) "dQD" = ( @@ -53076,6 +53037,7 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/plasteel/freezer, /area/security/prison/cells) "dYZ" = ( @@ -53143,6 +53105,13 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"edX" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/space/nearstation) "efO" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -53189,9 +53158,6 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "ejr" = ( -/obj/machinery/door/airlock/security{ - name = "Permanent Cell 4" - }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -53205,6 +53171,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/door/airlock/grunge{ + name = "Permanent Cell 4"; + wiretypepath = /datum/wires/airlock/security + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "eky" = ( @@ -53262,9 +53232,6 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "eoJ" = ( -/obj/machinery/door/airlock/security{ - name = "Permanent Cell 5" - }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -53278,6 +53245,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/door/airlock/grunge{ + name = "Permanent Cell 5"; + wiretypepath = /datum/wires/airlock/security + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "eoR" = ( @@ -53428,6 +53399,17 @@ }, /turf/open/floor/plating, /area/commons/fitness) +"ewG" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "permacells5"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/security/prison/cells) "ewN" = ( /obj/machinery/hydroponics/soil{ pixel_y = 8 @@ -53587,6 +53569,12 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/security/prison) "eFx" = ( @@ -53731,6 +53719,16 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/security/execution/transfer) +"eTt" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/space) "eTA" = ( /obj/structure/table/wood/fancy, /obj/item/reagent_containers/food/condiment/saltshaker{ @@ -53891,8 +53889,9 @@ /area/maintenance/port/fore) "fcj" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, -/area/space) +/area/maintenance/prison/starboard) "fcn" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ @@ -54036,6 +54035,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "fjS" = ( @@ -54444,11 +54446,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/security/prison) "fGf" = ( /obj/machinery/smartfridge/disks{ @@ -54609,6 +54607,19 @@ /obj/structure/table, /turf/open/floor/plasteel/cafeteria, /area/commons/locker) +"fSn" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/space/nearstation) "fSO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/machinery/atmospherics/pipe/simple/orange/visible{ @@ -54745,6 +54756,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "gcX" = ( @@ -54844,6 +54858,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/button/door{ + id = "permacells4"; + name = "Privacy Shutters"; + pixel_y = 25 + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "giT" = ( @@ -54959,7 +54978,12 @@ /area/engineering/atmos) "gxK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "permacells3"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, /area/security/prison/cells) "gyr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -55161,9 +55185,6 @@ /turf/open/floor/wood, /area/maintenance/bar) "gMB" = ( -/obj/machinery/door/airlock/security{ - name = "Permanent Cell 6" - }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -55177,6 +55198,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/door/airlock/grunge{ + name = "Permanent Cell 6"; + wiretypepath = /datum/wires/airlock/security + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "gMD" = ( @@ -55245,9 +55270,6 @@ /turf/open/floor/carpet, /area/service/library) "gSj" = ( -/obj/machinery/door/airlock/security{ - name = "Permanent Cell 3" - }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -55259,6 +55281,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/airlock/grunge{ + name = "Permanent Cell 3"; + wiretypepath = /datum/wires/airlock/security + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "gTx" = ( @@ -55412,6 +55438,19 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel, /area/commons/fitness) +"hcT" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/space) "hgG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/structure/extinguisher_cabinet{ @@ -55449,7 +55488,11 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "hkA" = ( -/turf/open/floor/plasteel/dark, +/obj/machinery/flasher{ + id = "waitingflash"; + pixel_y = -28 + }, +/turf/open/floor/plasteel, /area/security/prison) "hlS" = ( /obj/structure/cable{ @@ -55525,6 +55568,10 @@ }, /turf/open/floor/plasteel/dark, /area/command/gateway) +"hpp" = ( +/obj/structure/lattice, +/turf/open/space, +/area/solars/port/fore) "hpY" = ( /obj/machinery/vr_sleeper{ dir = 8 @@ -55567,6 +55614,16 @@ }, /turf/open/floor/plating, /area/command/gateway) +"htV" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/solar{ + id = "auxsolareast"; + name = "Port Auxiliary Solar Array" + }, +/turf/open/floor/plasteel/airless/solarpanel, +/area/space) "hvC" = ( /obj/structure/chair{ dir = 4 @@ -55714,7 +55771,7 @@ /obj/item/assembly/signaler, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/space) +/area/maintenance/prison/port) "hQX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -55751,6 +55808,11 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plating, /area/service/abandoned_gambling_den) +"hSf" = ( +/obj/structure/cable, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/space) "hSl" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55888,6 +55950,18 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"ikv" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/security/prison) "iky" = ( /obj/effect/turf_decal/weather/dirt, /obj/effect/decal/cleanable/dirt, @@ -55907,6 +55981,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, +/obj/machinery/light_switch{ + pixel_y = 23 + }, /turf/open/floor/plasteel/dark, /area/security/execution/transfer) "imk" = ( @@ -56065,7 +56142,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/grille, /turf/open/floor/plating, -/area/space) +/area/maintenance/prison/starboard) "iBq" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/decal/cleanable/dirt, @@ -56749,10 +56826,6 @@ dir = 1 }, /area/commons/fitness) -"jFd" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/maintenance/port/fore) "jFB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 @@ -56811,6 +56884,9 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "jHt" = ( @@ -56848,6 +56924,19 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) +"jIz" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/space/nearstation) "jIH" = ( /obj/effect/turf_decal/tile/green{ dir = 4 @@ -56856,6 +56945,9 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "jIW" = ( @@ -56960,7 +57052,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/security/prison) "jOB" = ( /obj/machinery/door/airlock/security{ @@ -56999,6 +57091,9 @@ }, /turf/open/floor/plasteel, /area/security/prison/upper) +"jRV" = ( +/turf/open/floor/plasteel, +/area/security/prison) "jRW" = ( /obj/item/reagent_containers/glass/bucket, /obj/effect/turf_decal/tile/green{ @@ -57092,8 +57187,7 @@ /area/security/prison/upper) "jVV" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4; - pixel_y = 5 + dir = 4 }, /turf/open/floor/plasteel, /area/security/prison/upper) @@ -57189,6 +57283,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/button/door{ + id = "permacells4"; + name = "Privacy Shutters"; + pixel_y = 25 + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "kdF" = ( @@ -57773,6 +57872,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/disposaloutlet{ + dir = 4; + name = "Prisoner Delivery" + }, /turf/open/floor/plasteel, /area/security/prison/upper) "kMt" = ( @@ -57799,6 +57905,7 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/plasteel, /area/security/prison/upper) "kOL" = ( @@ -58273,6 +58380,17 @@ }, /turf/open/floor/plasteel, /area/security/prison/upper) +"lvw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "permacells6"; + name = "Privacy Shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/security/prison/cells) "lwN" = ( /obj/structure/cable{ icon_state = "1-8" @@ -58400,6 +58518,17 @@ }, /turf/open/floor/plasteel, /area/security/prison/cells) +"lEf" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "permacells4"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/security/prison/cells) "lGm" = ( /obj/machinery/shower{ dir = 4 @@ -58421,6 +58550,20 @@ }, /turf/open/floor/plating, /area/service/abandoned_gambling_den) +"lHK" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plasteel, +/area/security/prison/cells) "lJA" = ( /turf/closed/wall, /area/security/prison/cells) @@ -59279,6 +59422,9 @@ "mJy" = ( /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/item/restraints/handcuffs, +/obj/item/taperecorder, +/obj/item/folder/red, /turf/open/floor/plasteel/dark, /area/security/prison/upper) "mJH" = ( @@ -59520,6 +59666,10 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/hallway/primary/port) +"nfj" = ( +/obj/structure/grille, +/turf/open/space, +/area/space) "nfm" = ( /obj/machinery/vending/autodrobe, /turf/open/floor/wood, @@ -59533,6 +59683,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/security/prison/upper) "ngs" = ( @@ -59582,6 +59733,11 @@ light_color = "#ffc1c1" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/button/door{ + id = "permacells2"; + name = "Privacy Shutters"; + pixel_x = 25 + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "nkP" = ( @@ -59766,6 +59922,9 @@ }, /turf/closed/wall, /area/maintenance/disposal/incinerator) +"nAZ" = ( +/turf/open/space/basic, +/area/solars/port/fore) "nBI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -59911,9 +60070,6 @@ /turf/open/floor/wood, /area/maintenance/starboard/aft) "nRO" = ( -/obj/machinery/door/airlock/security{ - name = "Permanent Cell 2" - }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -59925,6 +60081,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/airlock/grunge{ + name = "Permanent Cell 2"; + wiretypepath = /datum/wires/airlock/security + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "nSt" = ( @@ -59941,6 +60101,7 @@ /area/commons/dorms) "nSI" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/plasteel/white, /area/security/prison/upper) "nTG" = ( @@ -60057,6 +60218,7 @@ dir = 1; light_color = "#ffc1c1" }, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/padded, /area/security/execution/transfer) "oby" = ( @@ -60270,6 +60432,10 @@ /obj/machinery/status_display/evac, /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai_upload) +"oue" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) "ouf" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 4 @@ -60361,18 +60527,18 @@ "ozh" = ( /obj/machinery/door/window/eastright{ dir = 8; - name = "Holding Cell" - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 + name = "Holding Cell"; + req_access_txt = "2" }, /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/dark, +/obj/machinery/button/flasher{ + id = "waitingflash"; + pixel_x = 6; + pixel_y = 24 + }, +/turf/open/floor/plasteel, /area/security/prison) "oAB" = ( /obj/structure/fireplace{ @@ -60509,6 +60675,15 @@ }, /turf/closed/wall, /area/medical/medbay/central) +"oTx" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "permacells2"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/security/prison/cells) "oTH" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/shower, @@ -60643,6 +60818,9 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "peE" = ( @@ -60812,6 +60990,19 @@ }, /turf/open/floor/wood/wood_diagonal, /area/maintenance/port/fore) +"pry" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/space) "psf" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/sign/poster/official/the_owl{ @@ -60963,6 +61154,11 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"pEC" = ( +/obj/structure/grille, +/obj/structure/lattice, +/turf/open/space, +/area/space) "pFj" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -60981,6 +61177,10 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel, /area/security/prison/cells) +"pFH" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/solars/port/fore) "pFY" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -60990,6 +61190,10 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"pGs" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/prison/starboard) "pGA" = ( /obj/machinery/hydroponics/soil, /obj/effect/turf_decal/tile/green{ @@ -61117,6 +61321,14 @@ }, /turf/open/floor/plasteel, /area/commons/fitness) +"pPE" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "permacells1"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/security/prison/cells) "pPI" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -61197,6 +61409,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/security/prison/upper) "pUf" = ( @@ -61216,6 +61429,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "pUy" = ( @@ -61260,9 +61476,6 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "pZD" = ( -/obj/machinery/door/airlock/security{ - name = "Permanent Cell 1" - }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -61274,6 +61487,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/airlock/grunge{ + name = "Permanent Cell 1"; + wiretypepath = /datum/wires/airlock/security + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "qae" = ( @@ -61372,6 +61589,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/security/prison/cells) +"qhA" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/space) "qje" = ( /obj/structure/sign/mining{ pixel_y = 7 @@ -61605,6 +61829,11 @@ }, /turf/open/floor/wood/wood_diagonal, /area/maintenance/port/fore) +"qHn" = ( +/obj/structure/lattice, +/obj/structure/grille/broken, +/turf/open/space, +/area/space) "qIw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -61753,6 +61982,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/plasteel, /area/security/prison/upper) "qSf" = ( @@ -61800,6 +62030,11 @@ }, /turf/open/floor/plasteel/dark, /area/service/chapel/office) +"qUr" = ( +/obj/structure/grille, +/obj/structure/lattice, +/turf/open/space, +/area/solars/port/fore) "qVP" = ( /obj/effect/spawner/structure/window, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -61941,6 +62176,11 @@ /area/service/hydroponics) "ref" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/security/prison) "reA" = ( @@ -62164,6 +62404,7 @@ name = "Permabrig Transfer"; req_access_txt = "2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/security/prison) "rvr" = ( @@ -62198,6 +62439,13 @@ icon_state = "platingdmg2" }, /area/maintenance/port/fore) +"rwA" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/space) "rxD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -62241,6 +62489,27 @@ }, /turf/open/floor/plasteel, /area/commons/fitness) +"ryN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/prison) "rAR" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 @@ -62364,6 +62633,16 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"rGZ" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/space) "rIA" = ( /obj/machinery/light{ dir = 8 @@ -62418,6 +62697,11 @@ /obj/machinery/status_display/evac, /turf/closed/wall, /area/ai_monitored/command/storage/eva) +"rQy" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space/basic, +/area/space) "rQJ" = ( /obj/machinery/light/small{ dir = 8 @@ -62527,6 +62811,13 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) +"rYM" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/tracker, +/turf/open/floor/plasteel/airless/solarpanel, +/area/space) "rZE" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -62634,6 +62925,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/security/prison/upper) "ske" = ( @@ -62856,6 +63148,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "sBM" = ( @@ -62875,6 +63170,13 @@ /obj/item/circuitboard/machine/monkey_recycler, /turf/open/floor/plating, /area/maintenance/port/fore) +"sCQ" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/space/nearstation) "sEi" = ( /obj/machinery/vr_sleeper{ dir = 4 @@ -62943,6 +63245,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, /area/maintenance/prison/starboard) "sJw" = ( @@ -63273,6 +63576,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "tif" = ( @@ -63575,6 +63881,29 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) +"tCs" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/window/reinforced/tinted{ + dir = 4 + }, +/obj/structure/toilet{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plasteel/dark, +/area/security/prison/cells) "tEK" = ( /obj/structure/cable{ icon_state = "4-8" @@ -63837,6 +64166,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/security/prison/upper) "tWj" = ( @@ -64386,6 +64716,7 @@ light_color = "#ffc1c1" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, /mob/living/simple_animal/mouse/brown/Tom, /turf/open/floor/plating, /area/security/prison/upper) @@ -64443,6 +64774,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/security/brig) +"uTz" = ( +/obj/structure/cable, +/obj/machinery/power/solar{ + id = "auxsolareast"; + name = "Port Auxiliary Solar Array" + }, +/turf/open/floor/plasteel/airless/solarpanel, +/area/space) "uTL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -64612,6 +64951,17 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/prison/upper) +"vhC" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/plasteel, /area/security/prison/upper) "vim" = ( @@ -64649,6 +64999,9 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "vjm" = ( @@ -65373,15 +65726,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/port/fore) -"wll" = ( -/obj/structure/toilet{ - dir = 1 - }, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/turf/open/floor/padded, -/area/security/execution/transfer) "wly" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance{ @@ -65590,6 +65934,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "wBd" = ( @@ -65606,6 +65953,22 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"wDq" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"wGc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plasteel/dark, +/area/security/prison) "wHk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -65634,8 +65997,9 @@ /obj/structure/bed, /obj/effect/spawner/lootdrop/bedsheet, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, -/area/space) +/area/maintenance/prison/port) "wII" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/maintenance, @@ -65945,6 +66309,14 @@ /obj/structure/cable, /turf/open/floor/plating, /area/security/prison/upper) +"xiv" = ( +/obj/structure/cable, +/obj/machinery/power/solar{ + id = "auxsolareast"; + name = "Port Auxiliary Solar Array" + }, +/turf/open/floor/plasteel/airless/solarpanel, +/area/space/nearstation) "xiw" = ( /obj/machinery/door/airlock{ name = "Service Hall"; @@ -65983,6 +66355,22 @@ }, /turf/open/floor/plasteel, /area/commons/fitness) +"xkk" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/sign/warning/securearea{ + pixel_x = -32 + }, +/obj/machinery/door/poddoor/preopen{ + id = "Prison Gate"; + name = "prison blast door" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/security/range) "xlX" = ( /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -66346,6 +66734,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/plasteel/cafeteria, /area/security/prison/upper) "xNV" = ( @@ -66370,6 +66759,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/flasher{ + id = "visitorflash"; + pixel_x = 16; + pixel_y = 24 + }, /turf/open/floor/plasteel, /area/security/prison/upper) "xPk" = ( @@ -66483,6 +66877,13 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"xVZ" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/space) "xWq" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/vacuum/external{ @@ -66615,6 +67016,31 @@ /obj/machinery/status_display/evac, /turf/closed/wall, /area/hallway/primary/central) +"yeU" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/landmark/start/prisoner, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/button/door{ + id = "permacells5"; + name = "Privacy Shutters"; + pixel_y = 25 + }, +/turf/open/floor/plasteel/dark, +/area/security/prison/cells) "yeZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -80858,18 +81284,12 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaS -aaS -aaS -aaS -aaS -aaS +pEC +pEC +pEC +pEC +pEC +pEC aaS aaS aaS @@ -80879,9 +81299,15 @@ aaS aba aaS aaS +gXs +gXs +gXs +eRz +eRz +eRz aaf aaf -aaf +aaT aaf aaf alU @@ -81115,17 +81541,11 @@ aaa aaa aaa aaa +nfj aaa +oue aaa -aaa -aaa -aaa -aaa -abY -aaa -aaf -aaa -aaf +oue aaa aaf aaa @@ -81133,10 +81553,16 @@ acy aaa aaf aaa -bXv +aiS aaa aaS aaa +ktS +aaa +aaa +aaa +gXs +aaa aaa aaa aaa @@ -81372,31 +81798,31 @@ aaa aaa aaa aaa +nfj aaa +htV +eTt +uTz aaa -aaa -aaa -aaa -aaa -abY -aaa -acW -acV +cHk +eTt adA -aaa +nAZ acW -acV +eTt adA -aaa -acW -acV -adA -aaa -aaS -aaf -aaf +nAZ +qUr +wDq +pFH +pFH +pFH +rQy +eRz aaf aaf +aaT +aaT aaf alU atn @@ -81626,33 +82052,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa aae aaa aaa -abY -aaf -acW -adx +nfj +oue +htV +hcT +uTz +aaa +cHk +jIz adA -aaa +nAZ acW -adx +hcT adA +hpp +hpp aaa -acW -adx -adA -aaf -aaf -aaa +nAZ +pFH +nAZ +ktS +ktS aaa aaa +wDq aaa aaa alU @@ -81886,30 +82312,30 @@ aaa aaa aaa aaa +nfj aaa -aaa -aaa -aaa -aaa -aaa -abY -aaa -acW -adx +htV +hcT +uTz +oue +cHk +hcT adA -aaf +hpp acW -adx -adA -aaf -acW -adx +jIz adA +nAZ +hpp +ktS +nAZ +pFH +nAZ aaa -aaf -aaa +ktS aaa aaa +wDq aaa aaa gXs @@ -82143,27 +82569,27 @@ aaa aaa aaa aaa +oue +oue +htV +hcT +uTz aaa -aaa -aaa -aaa -aaa -aaa -aaf -aaf -acW -adx +cHk +jIz adA -aaa +nAZ acW -adx +hcT adA -aaa -acW -adx -adA -aaf -aaf +hpp +hpp +wDq +pFH +pFH +pFH +gXs +gXs aaf aaf aaf @@ -82397,30 +82823,30 @@ aaa aaa aaa aaa +pEC +pEC +pEC +oue aaa -aaa -aaa -aaa -aaa -aaa -aaS -aaS -aaS -aaf -aaa -acW -adx +htV +jIz +xiv +ktS +cHk +hcT adA -aaa +nAZ acW -adx +hcT adA +nAZ +hpp aaa -acW -adx -adA +nAZ +nAZ +pFH aaa -aaf +ktS aaa aaa ajV @@ -82654,28 +83080,28 @@ aaa aaa aaa aaa +pEC +aaa +oue aaa aaa aaa +edX +aaa +ktS +aaa +rwA +aaa +nAZ +aaa +rwA +aaa +nAZ +oue aaa aaa -aaa -aaS -aaa -aaf -aaa -aaa -aaa -adZ -aaa -aaa -aaa -adZ -aaa -aaa -aaa -adZ -aaa +nAZ +wDq aaa ajV ajV @@ -82911,20 +83337,14 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaS -aaf -abs -abZ -abZ -adw -ady -ady +pEC +oue +rYM +qhA +qhA +hSf +aag +aag ady ady ady @@ -82934,6 +83354,12 @@ ady ady cfK uDO +uDO +uDO +uDO +uDO +uDO +uDO ajq akB akB @@ -83168,28 +83594,28 @@ aaa aaa aaa aaa +pEC +aaa +oue aaa aaa aaa +sCQ +aaa +ktS +aaa +xVZ +aaa +nAZ +aaa +xVZ +aaa +nAZ +oue aaa aaa -aaa -aaS -aaa -aaf -aaa -aaa -aaa -ajW -aaa -aaa -aaa -ajW -aaa -aaa -aaa -ajW -aaa +nAZ +wDq aaa ajV ajV @@ -83425,30 +83851,30 @@ aaa aaa aaa aaa +pEC +qHn +pEC +oue aaa -aaa -aaa -aaa -aaa -aaa -aaS -aba -aaS -aaf -aaa -acW -amv +htV +fSn +xiv +ktS +cHk +pry adA -aaa +nAZ acW -amv +pry adA +nAZ +hpp aaa -acW -amv -adA +nAZ +nAZ +pFH aaa -aaf +ktS aaa aaa ajV @@ -83685,27 +84111,27 @@ aaa aaa aaa aaa +oue +oue +htV +pry +uTz aaa -aaa -aaa -aaa -aaa -aaa -aaf -aaf -acW -amv +cHk +fSn adA -aaa +nAZ acW -amv +pry adA +hpp +hpp aaa -acW -amv -adA -aaf -aaf +nAZ +nAZ +pFH +ktS +ktS aaa aaa aaa @@ -83942,27 +84368,27 @@ aaa aaa aaa aaa +pEC aaa -aaa -aaa -aaa -aaa -aaa -aaS -aaa -acW -amv +htV +pry +uTz +oue +cHk +pry adA -aaf +hpp acW -amv +fSn adA -aaf -acW -amv -adA -aaa -aaf +nAZ +hpp +gXs +pFH +pFH +pFH +wDq +gXs aaf aaf aaf @@ -84199,28 +84625,28 @@ aaa aaa aaa aaa +pEC +oue +htV +pry +uTz aaa -aaa -aaa -aaa -aaa -aaa -aaS -aaf -acW -amv +cHk +fSn adA -aaa +nAZ acW -amv +pry adA +hpp +hpp aaa -acW -amv -adA -aaf -aaf -aaa +nAZ +nAZ +nAZ +ktS +ktS +wDq aaa aaa alU @@ -84456,28 +84882,28 @@ aaa aaa aaa aaa +pEC aaa +htV +rGZ +uTz aaa -aaa -aaa -aaa -aaa -aaS -aaa -acW -aqJ +cHk +rGZ adA -aaa +nAZ acW -aqJ +rGZ adA +nAZ +qUr aaa -acW -aqJ -adA -aaa -aaS +nAZ +nAZ +nAZ aaa +ktS +rQy aaa aaa alU @@ -84713,17 +85139,11 @@ aaa aaa aaa aaa +pEC aaa +oue aaa -aaa -aaa -aaa -aaa -aaS -aaa -aaf -aaa -aaf +oue aaa aaf aaa @@ -84734,7 +85154,13 @@ aaa aaf aaa aaS -aaf +wDq +gXs +wDq +gXs +wDq +eRz +aaT aaf aaf alU @@ -84965,18 +85391,12 @@ cNd cNd aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -gXs -gXs -gXs -gXs -gXs -aaS +wDq +wDq +wDq +wDq +wDq +pEC aaS aaS aaS @@ -84991,6 +85411,12 @@ aaS aaS aaS aaS +ktS +ktS +ktS +gXs +ktS +ktS aaa aaa aaa @@ -85245,7 +85671,7 @@ gXs aaa aaa aaa -aaa +wDq aaa aaa aaa @@ -85502,13 +85928,13 @@ gXs aaa aaa aaa +wDq aaa aaa aaa aaa aaa -aaa -jFd +ali fDn gFs aKY @@ -85759,7 +86185,7 @@ gXs aaa aaa aaa -aaa +wDq aaa aaa aaa @@ -86003,20 +86429,20 @@ gXs aaa aaa aaa -gXs -gXs -gXs +eRz +eRz +eRz gXs gXs aaa aaa aaa aaa -gXs -aaa +eRz aaa aaa aaa +wDq aaa aaa aaa @@ -86260,7 +86686,7 @@ gXs aaa aaa aaa -gXs +eRz aaa aaa aaa @@ -86269,11 +86695,11 @@ aaa aaa aaa aaa -gXs -aaa +eRz aaa aaa aaa +wDq aaa aaa aaa @@ -86517,7 +86943,7 @@ gXs aaa aaa aaa -gXs +eRz aaa aaa aaa @@ -86526,7 +86952,7 @@ gXs gXs gXs gXs -gXs +eRz gXs gXs gXs @@ -86783,7 +87209,7 @@ aaa aaa aaa aaa -gXs +eRz aaa aaa aaa @@ -87040,7 +87466,7 @@ aaa aae aaa aaa -gXs +eRz aaa aaa aaa @@ -87805,7 +88231,7 @@ mvV tso abc dIZ -wll +dIZ mbC abc abc @@ -88055,7 +88481,7 @@ wnX mAT mAT lJA -giE +yeU rBK lJA giE @@ -88312,10 +88738,10 @@ iCN lJA lJA lJA -czP +ewG eoJ lJA -czP +lEf ejr abc tJE @@ -89083,7 +89509,7 @@ wgu qCc qCc qCc -czP +lvw gMB lJA tnH @@ -89858,7 +90284,7 @@ acG acG lJA maP -wVt +lHK nRO vYF txs @@ -90116,7 +90542,7 @@ acG mnu xGm xNV -gxK +oTx nko vFZ szn @@ -90614,7 +91040,7 @@ adI mwN kfG uJY -kkb +vhC tLC aaN peD @@ -90632,7 +91058,7 @@ nFA wVt pZD vYF -txs +tCs szn pIR aeL @@ -90887,12 +91313,12 @@ acG aay oss abv -lJA +pPE acA acI adD aed -uql +wGc afv agg acd @@ -91149,7 +91575,7 @@ lJA lJA szn aeg -uql +ryN afA acd acd @@ -91407,9 +91833,9 @@ ada adF aef aeM -afz +aav ldY -lRb +xkk lRb vIi fsj @@ -91663,7 +92089,7 @@ ref aat adH aem -aeO +ikv afJ sXV sXV @@ -92173,7 +92599,7 @@ oKB vhy abA jNN -hkA +jRV hkA aai aek @@ -93959,7 +94385,7 @@ jnk sIn eZS iBj -fcj +pGs iBq vHK dCd @@ -96023,8 +96449,8 @@ eRz eRz aaT eRz -aaT -aaT +aaf +aaf aaT gXs abG From 3ef6436a4a8da94cb1efe32ee917cc26384b54ed Mon Sep 17 00:00:00 2001 From: zerothebigboy Date: Tue, 14 Sep 2021 09:27:40 -0400 Subject: [PATCH 2/6] whoopsiforgotsareas --- _maps/map_files/BoxStation/BoxStation.dmm | 572 +++++++++------------- 1 file changed, 233 insertions(+), 339 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index d0f51e3460..c06062ae3e 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -51368,16 +51368,6 @@ /obj/item/reagent_containers/food/drinks/britcup, /turf/open/floor/plasteel, /area/commons/dorms) -"cHk" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/solar{ - id = "auxsolareast"; - name = "Port Auxiliary Solar Array" - }, -/turf/open/floor/plasteel/airless/solarpanel, -/area/space/nearstation) "cHD" = ( /obj/structure/cable{ icon_state = "1-2" @@ -52893,6 +52883,10 @@ }, /turf/open/floor/plasteel, /area/security/prison/upper) +"dLl" = ( +/obj/item/stack/rods, +/turf/open/space, +/area/space) "dLZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 @@ -53105,13 +53099,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"edX" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/space/nearstation) "efO" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -53728,7 +53715,7 @@ }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/solars/port/fore) "eTA" = ( /obj/structure/table/wood/fancy, /obj/item/reagent_containers/food/condiment/saltshaker{ @@ -54607,19 +54594,6 @@ /obj/structure/table, /turf/open/floor/plasteel/cafeteria, /area/commons/locker) -"fSn" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/space/nearstation) "fSO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/machinery/atmospherics/pipe/simple/orange/visible{ @@ -55450,7 +55424,7 @@ }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/solars/port/fore) "hgG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/structure/extinguisher_cabinet{ @@ -55568,10 +55542,6 @@ }, /turf/open/floor/plasteel/dark, /area/command/gateway) -"hpp" = ( -/obj/structure/lattice, -/turf/open/space, -/area/solars/port/fore) "hpY" = ( /obj/machinery/vr_sleeper{ dir = 8 @@ -55614,16 +55584,6 @@ }, /turf/open/floor/plating, /area/command/gateway) -"htV" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/solar{ - id = "auxsolareast"; - name = "Port Auxiliary Solar Array" - }, -/turf/open/floor/plasteel/airless/solarpanel, -/area/space) "hvC" = ( /obj/structure/chair{ dir = 4 @@ -55812,7 +55772,7 @@ /obj/structure/cable, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/solars/port/fore) "hSl" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -56924,19 +56884,6 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) -"jIz" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/space/nearstation) "jIH" = ( /obj/effect/turf_decal/tile/green{ dir = 4 @@ -59666,10 +59613,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/hallway/primary/port) -"nfj" = ( -/obj/structure/grille, -/turf/open/space, -/area/space) "nfm" = ( /obj/machinery/vending/autodrobe, /turf/open/floor/wood, @@ -59922,9 +59865,6 @@ }, /turf/closed/wall, /area/maintenance/disposal/incinerator) -"nAZ" = ( -/turf/open/space/basic, -/area/solars/port/fore) "nBI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -60432,10 +60372,6 @@ /obj/machinery/status_display/evac, /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai_upload) -"oue" = ( -/obj/structure/lattice, -/turf/open/space, -/area/space) "ouf" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 4 @@ -61002,7 +60938,7 @@ }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/solars/port/fore) "psf" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/sign/poster/official/the_owl{ @@ -61154,11 +61090,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"pEC" = ( -/obj/structure/grille, -/obj/structure/lattice, -/turf/open/space, -/area/space) "pFj" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -61177,10 +61108,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel, /area/security/prison/cells) -"pFH" = ( -/obj/structure/lattice, -/turf/open/space/basic, -/area/solars/port/fore) "pFY" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -61595,7 +61522,7 @@ }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/solars/port/fore) "qje" = ( /obj/structure/sign/mining{ pixel_y = 7 @@ -61829,11 +61756,6 @@ }, /turf/open/floor/wood/wood_diagonal, /area/maintenance/port/fore) -"qHn" = ( -/obj/structure/lattice, -/obj/structure/grille/broken, -/turf/open/space, -/area/space) "qIw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -62030,11 +61952,6 @@ }, /turf/open/floor/plasteel/dark, /area/service/chapel/office) -"qUr" = ( -/obj/structure/grille, -/obj/structure/lattice, -/turf/open/space, -/area/solars/port/fore) "qVP" = ( /obj/effect/spawner/structure/window, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -62445,7 +62362,7 @@ }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/solars/port/fore) "rxD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -62642,7 +62559,7 @@ }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/solars/port/fore) "rIA" = ( /obj/machinery/light{ dir = 8 @@ -62817,7 +62734,7 @@ }, /obj/machinery/power/tracker, /turf/open/floor/plasteel/airless/solarpanel, -/area/space) +/area/solars/port/fore) "rZE" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -63170,13 +63087,6 @@ /obj/item/circuitboard/machine/monkey_recycler, /turf/open/floor/plating, /area/maintenance/port/fore) -"sCQ" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/space/nearstation) "sEi" = ( /obj/machinery/vr_sleeper{ dir = 4 @@ -64774,14 +64684,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/security/brig) -"uTz" = ( -/obj/structure/cable, -/obj/machinery/power/solar{ - id = "auxsolareast"; - name = "Port Auxiliary Solar Array" - }, -/turf/open/floor/plasteel/airless/solarpanel, -/area/space) "uTL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -66309,14 +66211,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/security/prison/upper) -"xiv" = ( -/obj/structure/cable, -/obj/machinery/power/solar{ - id = "auxsolareast"; - name = "Port Auxiliary Solar Array" - }, -/turf/open/floor/plasteel/airless/solarpanel, -/area/space/nearstation) "xiw" = ( /obj/machinery/door/airlock{ name = "Service Hall"; @@ -66883,7 +66777,7 @@ }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/solars/port/fore) "xWq" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/vacuum/external{ @@ -81284,12 +81178,12 @@ aaa aaa aaa aaa -pEC -pEC -pEC -pEC -pEC -pEC +aaS +aaS +aaS +aaS +aaS +aaS aaS aaS aaS @@ -81541,11 +81435,11 @@ aaa aaa aaa aaa -nfj +abY aaa -oue +aaf aaa -oue +aaf aaa aaf aaa @@ -81553,11 +81447,11 @@ acy aaa aaf aaa -aiS +dLl aaa aaS aaa -ktS +aaa aaa aaa aaa @@ -81798,26 +81692,26 @@ aaa aaa aaa aaa -nfj +abY aaa -htV -eTt -uTz -aaa -cHk -eTt -adA -nAZ acW eTt adA -nAZ -qUr -wDq -pFH -pFH -pFH -rQy +aaa +acW +eTt +adA +aaa +acW +eTt +adA +aaa +aaS +gXs +gXs +gXs +gXs +eRz eRz aaf aaf @@ -82055,30 +81949,30 @@ aaa aae aaa aaa -nfj -oue -htV -hcT -uTz -aaa -cHk -jIz -adA -nAZ +abY +aaf acW hcT adA -hpp -hpp aaa -nAZ -pFH -nAZ -ktS +acW +hcT +adA +aaa +acW +hcT +adA +aaf +aaf +aaa +aaa +gXs +aaa +aaa ktS aaa aaa -wDq +gXs aaa aaa alU @@ -82312,30 +82206,30 @@ aaa aaa aaa aaa -nfj +abY aaa -htV -hcT -uTz -oue -cHk -hcT -adA -hpp acW -jIz +hcT adA -nAZ -hpp -ktS -nAZ -pFH -nAZ +aaf +acW +hcT +adA +aaf +acW +hcT +adA +aaa +aaf +aaa +aaa +gXs +aaa aaa ktS aaa aaa -wDq +gXs aaa aaa gXs @@ -82569,25 +82463,25 @@ aaa aaa aaa aaa -oue -oue -htV -hcT -uTz -aaa -cHk -jIz -adA -nAZ +aaf +aaf acW hcT adA -hpp -hpp -wDq -pFH -pFH -pFH +aaa +acW +hcT +adA +aaa +acW +hcT +adA +aaf +aaf +gXs +gXs +gXs +gXs gXs gXs aaf @@ -82823,28 +82717,28 @@ aaa aaa aaa aaa -pEC -pEC -pEC -oue +aaS +aaS +aaS +aaf aaa -htV -jIz -xiv -ktS -cHk -hcT -adA -nAZ acW hcT adA -nAZ -hpp aaa -nAZ -nAZ -pFH +acW +hcT +adA +aaa +acW +hcT +adA +aaa +aaf +aaa +aaa +aaa +gXs aaa ktS aaa @@ -83080,28 +82974,28 @@ aaa aaa aaa aaa -pEC +aaS aaa -oue +aaf aaa aaa aaa -edX -aaa -ktS -aaa rwA aaa -nAZ +aaa aaa rwA aaa -nAZ -oue aaa aaa -nAZ -wDq +rwA +aaa +aaa +aaf +aaa +aaa +aaa +gXs aaa ajV ajV @@ -83337,14 +83231,14 @@ aaa aaa aaa aaa -pEC -oue +aaS +aaf rYM qhA qhA hSf -aag -aag +ady +ady ady ady ady @@ -83594,28 +83488,28 @@ aaa aaa aaa aaa -pEC +aaS aaa -oue +aaf aaa aaa aaa -sCQ -aaa -ktS -aaa xVZ aaa -nAZ +aaa aaa xVZ aaa -nAZ -oue aaa aaa -nAZ -wDq +xVZ +aaa +aaa +aaf +aaa +aaa +aaa +gXs aaa ajV ajV @@ -83851,28 +83745,28 @@ aaa aaa aaa aaa -pEC -qHn -pEC -oue +aaS +aba +aaS +aaf aaa -htV -fSn -xiv -ktS -cHk -pry -adA -nAZ acW pry adA -nAZ -hpp aaa -nAZ -nAZ -pFH +acW +pry +adA +aaa +acW +pry +adA +aaa +aaf +aaa +aaa +aaa +gXs aaa ktS aaa @@ -84111,26 +84005,26 @@ aaa aaa aaa aaa -oue -oue -htV -pry -uTz -aaa -cHk -fSn -adA -nAZ +aaf +aaf acW pry adA -hpp -hpp aaa -nAZ -nAZ -pFH -ktS +acW +pry +adA +aaa +acW +pry +adA +aaf +aaf +aaa +aaa +aaa +gXs +aaa ktS aaa aaa @@ -84368,26 +84262,26 @@ aaa aaa aaa aaa -pEC +aaS aaa -htV -pry -uTz -oue -cHk -pry -adA -hpp acW -fSn +pry adA -nAZ -hpp +aaf +acW +pry +adA +aaf +acW +pry +adA +aaa +aaf +gXs +gXs +gXs +gXs gXs -pFH -pFH -pFH -wDq gXs aaf aaf @@ -84625,26 +84519,26 @@ aaa aaa aaa aaa -pEC -oue -htV -pry -uTz -aaa -cHk -fSn -adA -nAZ +aaS +aaf acW pry adA -hpp -hpp aaa -nAZ -nAZ -nAZ -ktS +acW +pry +adA +aaa +acW +pry +adA +aaf +aaf +aaa +aaa +aaa +aaa +aaa ktS wDq aaa @@ -84882,25 +84776,25 @@ aaa aaa aaa aaa -pEC +aaS aaa -htV -rGZ -uTz -aaa -cHk -rGZ -adA -nAZ acW rGZ adA -nAZ -qUr aaa -nAZ -nAZ -nAZ +acW +rGZ +adA +aaa +acW +rGZ +adA +aaa +aaS +aaa +aaa +aaa +aaa aaa ktS rQy @@ -85139,11 +85033,11 @@ aaa aaa aaa aaa -pEC +aaS aaa -oue +aaf aaa -oue +aaf aaa aaf aaa @@ -85154,11 +85048,11 @@ aaa aaf aaa aaS -wDq gXs -wDq gXs -wDq +gXs +gXs +gXs eRz aaT aaf @@ -85391,12 +85285,12 @@ cNd cNd aaa aaa -wDq -wDq -wDq -wDq -wDq -pEC +gXs +gXs +gXs +gXs +gXs +aaS aaS aaS aaS @@ -85411,11 +85305,11 @@ aaS aaS aaS aaS -ktS -ktS -ktS +aaa +aaa +aaa gXs -ktS +aaa ktS aaa aaa @@ -85671,7 +85565,7 @@ gXs aaa aaa aaa -wDq +gXs aaa aaa aaa @@ -85928,7 +85822,7 @@ gXs aaa aaa aaa -wDq +gXs aaa aaa aaa @@ -86185,7 +86079,7 @@ gXs aaa aaa aaa -wDq +gXs aaa aaa aaa @@ -86442,7 +86336,7 @@ eRz aaa aaa aaa -wDq +gXs aaa aaa aaa @@ -86699,7 +86593,7 @@ eRz aaa aaa aaa -wDq +gXs aaa aaa aaa From 2995a767a61db677d11e21953d749492b0350cc0 Mon Sep 17 00:00:00 2001 From: zerothebigboy Date: Tue, 14 Sep 2021 09:42:32 -0400 Subject: [PATCH 3/6] theseshouldhavecommitted --- _maps/map_files/BoxStation/BoxStation.dmm | 90 ++++++++++++++++++----- 1 file changed, 71 insertions(+), 19 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index c06062ae3e..535af7f797 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -686,6 +686,10 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, /turf/open/floor/plating, /area/security/prison) "abE" = ( @@ -1173,6 +1177,10 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, /turf/open/floor/plating, /area/security/prison/upper) "acE" = ( @@ -1902,6 +1910,10 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, /turf/open/floor/plating, /area/security/prison) "aej" = ( @@ -2610,6 +2622,10 @@ /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, /turf/open/floor/plating, /area/security/brig) "afr" = ( @@ -3408,7 +3424,11 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/plasteel, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, +/turf/open/floor/plasteel/dark, /area/security/brig) "agP" = ( /obj/structure/cable{ @@ -3760,6 +3780,10 @@ /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, /turf/open/floor/plating, /area/security/brig) "ahw" = ( @@ -3771,6 +3795,10 @@ icon_state = "1-4" }, /obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, /turf/open/floor/plating, /area/security/brig) "ahx" = ( @@ -51766,6 +51794,10 @@ /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, /turf/open/floor/plating, /area/security/prison/upper) "cNE" = ( @@ -51928,13 +51960,13 @@ /obj/structure/sign/warning/securearea{ pixel_x = -32 }, -/obj/machinery/door/poddoor/preopen{ - id = "Prison Gate"; - name = "prison blast door" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, +/turf/open/floor/plasteel/dark, /area/security/prison) "cPb" = ( /turf/open/floor/wood/wood_diagonal, @@ -53772,13 +53804,13 @@ /area/cargo/miningdock) "eWL" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id = "Prison Gate"; - name = "prison blast door" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, +/turf/open/floor/plasteel/dark, /area/security/prison) "eXz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -57282,6 +57314,10 @@ /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, /turf/open/floor/plating, /area/security/prison/upper) "kfv" = ( @@ -66209,6 +66245,10 @@ name = "prison blast door" }, /obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, /turf/open/floor/plating, /area/security/prison/upper) "xiw" = ( @@ -66255,15 +66295,16 @@ icon_state = "1-2" }, /obj/structure/sign/warning/securearea{ - pixel_x = -32 - }, -/obj/machinery/door/poddoor/preopen{ - id = "Prison Gate"; - name = "prison blast door" + pixel_x = -32; + pixel_y = 32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, +/turf/open/floor/plasteel/dark, /area/security/range) "xlX" = ( /obj/structure/table/reinforced, @@ -66358,6 +66399,17 @@ }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) +"xuu" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Prison Gate"; + name = "Prison Lockdown Shutters" + }, +/turf/open/floor/plating, +/area/security/brig) "xwB" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -93013,7 +93065,7 @@ adI xKl omX afG -aim +xuu afL ahu aie @@ -94041,7 +94093,7 @@ adJ aep aeT afG -aim +xuu ajL akj afM From 82c55182564759de2d4aa24274893d2bcbb897b1 Mon Sep 17 00:00:00 2001 From: zerothebigboy Date: Tue, 14 Sep 2021 11:57:07 -0400 Subject: [PATCH 4/6] fixthefunnypipes --- _maps/map_files/BoxStation/BoxStation.dmm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 535af7f797..39c1fad675 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -535,6 +535,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "abh" = ( @@ -58495,10 +58498,10 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel, /area/security/prison/cells) "lEf" = ( From ba14896889d2d75ff90dfc64ef60a140469e3875 Mon Sep 17 00:00:00 2001 From: zerothebigboy Date: Thu, 16 Sep 2021 13:05:02 -0400 Subject: [PATCH 5/6] balls --- _maps/map_files/BoxStation/BoxStation.dmm | 238 ++++++++++------------ 1 file changed, 110 insertions(+), 128 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 39c1fad675..9b2b8363c1 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -357,7 +357,7 @@ /turf/open/floor/plating, /area/command/heads_quarters/hos) "aaN" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/structure/window/fulltile, /turf/open/floor/plating, /area/security/prison/upper) "aaO" = ( @@ -498,9 +498,6 @@ /turf/closed/wall, /area/security/execution/transfer) "abf" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Prison Laundry" - }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -512,32 +509,21 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/airlock/grunge{ + name = "Prison Laundry"; + wiretypepath = /datum/wires/airlock/security + }, /turf/open/floor/plasteel/dark, /area/security/prison/upper) "abg" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Cell Block" - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "abh" = ( @@ -1143,10 +1129,6 @@ dir = 1 }, /obj/effect/landmark/start/prisoner, -/obj/machinery/light/small{ - dir = 1; - light_color = "#ffc1c1" - }, /obj/machinery/button/door{ id = "permacells1"; name = "Privacy Shutters"; @@ -1362,22 +1344,6 @@ dir = 8 }, /obj/structure/table, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/shoes/sneakers/orange{ - pixel_y = 8 - }, -/obj/item/clothing/shoes/sneakers/orange{ - pixel_y = 8 - }, -/obj/item/clothing/shoes/sneakers/orange{ - pixel_y = 8 - }, -/obj/item/clothing/shoes/sneakers/orange{ - pixel_y = 8 - }, /turf/open/floor/plasteel, /area/security/prison) "ada" = ( @@ -1404,21 +1370,30 @@ /area/security/prison/upper) "add" = ( /obj/structure/table, -/obj/item/clothing/under/rank/prisoner/skirt, -/obj/item/clothing/under/rank/prisoner/skirt, -/obj/item/clothing/under/rank/prisoner/skirt, -/obj/item/clothing/under/rank/prisoner/skirt, /obj/item/clothing/shoes/sneakers/orange{ - pixel_y = 8 + pixel_x = -6; + pixel_y = 10 }, /obj/item/clothing/shoes/sneakers/orange{ - pixel_y = 8 + pixel_x = -6; + pixel_y = -2 }, /obj/item/clothing/shoes/sneakers/orange{ - pixel_y = 8 + pixel_x = -6; + pixel_y = 4 }, /obj/item/clothing/shoes/sneakers/orange{ - pixel_y = 8 + pixel_x = -6; + pixel_y = -8 + }, +/obj/item/clothing/under/rank/prisoner{ + pixel_x = 8; + pixel_y = 5 + }, +/obj/machinery/camera{ + c_tag = "Permabrig Processing"; + dir = 8; + network = list("ss13","prison") }, /turf/open/floor/plasteel, /area/security/prison) @@ -2682,6 +2657,9 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -32 + }, /turf/open/floor/plasteel/dark, /area/security/prison) "afy" = ( @@ -2695,9 +2673,6 @@ /turf/open/floor/plasteel/dark, /area/security/prison) "afA" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = -32 - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -42036,7 +42011,8 @@ /area/maintenance/port/aft) "bZm" = ( /obj/structure/disposaloutlet{ - dir = 8 + dir = 8; + name = "Prisoner Outlet" }, /obj/structure/disposalpipe/trunk{ dir = 4 @@ -52875,10 +52851,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/light/small{ - dir = 1; - light_color = "#ffc1c1" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/decal/cleanable/blood/old, /obj/machinery/button/door{ @@ -53067,6 +53039,10 @@ icon_state = "1-4" }, /obj/effect/decal/cleanable/blood/old, +/obj/machinery/button/electrochromatic{ + id = "!permabrigshowers"; + pixel_x = -25 + }, /turf/open/floor/plasteel/freezer, /area/security/prison/cells) "dYZ" = ( @@ -53853,10 +53829,6 @@ /turf/open/floor/plasteel, /area/security/prison/upper) "eZS" = ( -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, /obj/effect/turf_decal/bot_white, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, @@ -54536,9 +54508,6 @@ /turf/open/floor/plasteel/dark, /area/security/courtroom) "fMF" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Prison Laundry" - }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -54550,6 +54519,10 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/door/airlock/grunge{ + name = "Prison Laundry"; + wiretypepath = /datum/wires/airlock/security + }, /turf/open/floor/plasteel/dark, /area/security/prison/upper) "fMY" = ( @@ -54566,13 +54539,15 @@ /turf/open/floor/plasteel, /area/security/prison/upper) "fNB" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ icon_state = "1-4" }, /obj/structure/cable{ icon_state = "0-4" }, +/obj/effect/spawner/structure/window/reinforced/tinted/electrochromatic{ + electrochromatic_id = "!permabrigshowers" + }, /turf/open/floor/plating, /area/security/prison/cells) "fNN" = ( @@ -54861,9 +54836,6 @@ dir = 1 }, /obj/effect/landmark/start/prisoner, -/obj/machinery/light/small{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -55497,6 +55469,19 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "hkA" = ( +/obj/structure/table, +/obj/item/clothing/under/rank/prisoner/skirt{ + pixel_x = -13; + pixel_y = 5 + }, +/obj/item/clothing/under/rank/prisoner/skirt{ + pixel_x = 9; + pixel_y = 5 + }, +/obj/item/clothing/under/rank/prisoner{ + pixel_x = -2; + pixel_y = 5 + }, /obj/machinery/flasher{ id = "waitingflash"; pixel_y = -28 @@ -55725,10 +55710,12 @@ /turf/open/floor/plating, /area/security/prison/upper) "hKo" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ icon_state = "0-2" }, +/obj/effect/spawner/structure/window/reinforced/tinted/electrochromatic{ + electrochromatic_id = "!permabrigshowers" + }, /turf/open/floor/plating, /area/security/prison/cells) "hMs" = ( @@ -56690,9 +56677,6 @@ /turf/open/floor/plasteel, /area/service/hydroponics) "jxx" = ( -/obj/machinery/door/airlock/security{ - name = "Prison Yard" - }, /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral, @@ -56711,6 +56695,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/public/glass{ + name = "Prison Yard" + }, /turf/open/floor/plasteel/dark, /area/security/prison/upper) "jxF" = ( @@ -57037,9 +57024,6 @@ /turf/open/floor/plasteel, /area/security/prison) "jOB" = ( -/obj/machinery/door/airlock/security{ - name = "Prison Forestry" - }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -57053,6 +57037,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/door/airlock/medical/glass{ + name = "Prison Forestry" + }, /turf/open/floor/plasteel/dark, /area/security/prison/upper) "jRw" = ( @@ -57258,10 +57245,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/light/small{ - brightness = 3; - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -57846,15 +57829,6 @@ dir = 4; network = list("ss13","prison") }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -57865,7 +57839,9 @@ dir = 4; name = "Prisoner Delivery" }, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/delivery, +/obj/structure/window/reinforced, +/turf/open/floor/plasteel/dark, /area/security/prison/upper) "kMt" = ( /obj/machinery/computer/prisoner/gulag_teleporter_computer, @@ -58441,9 +58417,6 @@ }, /area/hallway/secondary/entry) "lBk" = ( -/obj/machinery/door/airlock/security{ - name = "Prison Yard" - }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -58458,6 +58431,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/door/airlock/public/glass{ + name = "Prison Yard" + }, /turf/open/floor/plasteel/dark, /area/security/prison/upper) "lBz" = ( @@ -59234,6 +59210,18 @@ /obj/item/clothing/under/rank/prisoner/skirt, /obj/item/clothing/under/rank/prisoner/skirt, /obj/effect/decal/cleanable/dirt, +/obj/item/clothing/shoes/sneakers/orange{ + pixel_y = 8 + }, +/obj/item/clothing/shoes/sneakers/orange{ + pixel_y = 8 + }, +/obj/item/clothing/shoes/sneakers/orange{ + pixel_y = 8 + }, +/obj/item/clothing/shoes/sneakers/orange{ + pixel_y = 8 + }, /turf/open/floor/plasteel/cafeteria, /area/security/prison/upper) "myh" = ( @@ -59369,22 +59357,10 @@ /area/maintenance/starboard/fore) "mIZ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Cell Block" - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "mJf" = ( @@ -59414,8 +59390,10 @@ /turf/open/floor/plasteel/dark, /area/security/prison/upper) "mJH" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced/tinted/electrochromatic{ + electrochromatic_id = "!permabrigshowers" + }, /turf/open/floor/plating, /area/security/prison/cells) "mLS" = ( @@ -59710,10 +59688,6 @@ dir = 1 }, /obj/effect/landmark/start/prisoner, -/obj/machinery/light/small{ - dir = 1; - light_color = "#ffc1c1" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/button/door{ id = "permacells2"; @@ -60185,11 +60159,11 @@ /turf/open/floor/wood, /area/service/bar) "obq" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/window/fulltile, /turf/open/floor/plating, /area/security/prison/upper) "obs" = ( @@ -61826,13 +61800,15 @@ /turf/open/space, /area/space/nearstation) "qLo" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ icon_state = "2-4" }, /obj/structure/cable{ icon_state = "0-4" }, +/obj/effect/spawner/structure/window/reinforced/tinted/electrochromatic{ + electrochromatic_id = "!permabrigshowers" + }, /turf/open/floor/plating, /area/security/prison/cells) "qLy" = ( @@ -62019,10 +61995,6 @@ /turf/open/space/basic, /area/space/nearstation) "qYa" = ( -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, /obj/effect/turf_decal/bot_white, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, @@ -62504,6 +62476,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/light/small, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "rBY" = ( @@ -64654,6 +64627,20 @@ }, /turf/open/floor/plating, /area/security/prison/upper) +"uLB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/security/prison/upper) "uOd" = ( /turf/open/floor/plasteel/white/side{ dir = 4 @@ -64953,12 +64940,6 @@ }, /turf/open/floor/wood, /area/maintenance/bar) -"vli" = ( -/obj/structure/lattice, -/obj/structure/grille, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) "vmQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 @@ -65485,6 +65466,10 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "vYY" = ( @@ -66977,9 +66962,6 @@ dir = 1 }, /obj/effect/landmark/start/prisoner, -/obj/machinery/light/small{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -89186,7 +89168,7 @@ aaa eRz eRz eRz -sMu +eRz eRz eRz gXs @@ -90992,7 +90974,7 @@ uJY vhC tLC aaN -peD +uLB kGj acG lux @@ -91252,7 +91234,7 @@ pgq peD sBM acG -acG +aaN jOB acG acG @@ -96391,7 +96373,7 @@ eRz eRz eRz eRz -vli +eRz eRz eRz eRz From 9af0d9c8f2a85ae748f09e40c7f19b191b979693 Mon Sep 17 00:00:00 2001 From: zerothebigboy Date: Sat, 18 Sep 2021 22:39:02 -0400 Subject: [PATCH 6/6] wiresandshityeah --- _maps/map_files/BoxStation/BoxStation.dmm | 57 ++++++++++++++++++++--- 1 file changed, 50 insertions(+), 7 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 9b2b8363c1..ea760cd55a 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -357,7 +357,7 @@ /turf/open/floor/plating, /area/command/heads_quarters/hos) "aaN" = ( -/obj/structure/window/fulltile, +/obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/security/prison/upper) "aaO" = ( @@ -1976,7 +1976,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/security/prison) "aeq" = ( @@ -2285,10 +2284,12 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/prison) "aeU" = ( @@ -52971,6 +52972,9 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/plasteel, /area/security/prison/upper) "dQD" = ( @@ -53381,6 +53385,9 @@ amount = 14 }, /obj/item/stack/packageWrap, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/security/prison/upper) "evR" = ( @@ -53516,6 +53523,16 @@ /obj/item/clothing/under/rank/civilian/lawyer/red, /turf/open/floor/plasteel, /area/commons/fitness) +"eCB" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/security/prison/upper) "eCR" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -55525,6 +55542,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/plasteel, /area/security/prison/upper) "hnU" = ( @@ -56153,6 +56173,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/security/prison/cells) "iDo" = ( @@ -57158,6 +57181,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plasteel, /area/security/prison/upper) "jVX" = ( @@ -57751,6 +57777,9 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/security/prison/upper) "kGv" = ( @@ -58127,6 +58156,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/security/prison/upper) "lip" = ( @@ -60163,7 +60195,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/window/fulltile, +/obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/security/prison/upper) "obs" = ( @@ -61459,6 +61491,9 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/security/prison/upper) "qeb" = ( @@ -62516,6 +62551,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/security/prison/upper) "rDh" = ( @@ -63092,6 +63130,9 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/security/prison/upper) "sCa" = ( @@ -66020,6 +66061,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/dark, /area/security/prison/upper) "wVt" = ( @@ -66286,7 +66330,6 @@ pixel_x = -32; pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/delivery, /obj/machinery/door/poddoor/shutters/preopen{ id = "Prison Gate"; @@ -89431,8 +89474,8 @@ aaa aaa aaa adI -adI -adI +oUF +eCB adI qCc qCc