From 6cdef3b81fe0144d2c6e85b8a72c144887f0ab3b Mon Sep 17 00:00:00 2001 From: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Date: Fri, 12 Dec 2025 15:27:14 +0000 Subject: [PATCH] Touches up the Perma Isolation cells of Farraugs, Delta, and Box (#31120) * Isolation * Update cerestation.dmm --- _maps/map_files/stations/boxstation.dmm | 477 ++++++++------- _maps/map_files/stations/cerestation.dmm | 698 +++++++++++----------- _maps/map_files/stations/deltastation.dmm | 77 ++- 3 files changed, 659 insertions(+), 593 deletions(-) diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index d11aa47ad60..5b68c76cd1f 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -1990,15 +1990,13 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/armory/secure) "ajy" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tiles/department/security, +/obj/structure/bed, +/obj/item/radio/intercom/locked/prison{ + name = "Prison Intercom (General)"; + pixel_x = -28 + }, +/obj/item/bedsheet/orange, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "ajJ" = ( @@ -5177,13 +5175,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) -"auC" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/station/security/prisonershuttle) "auF" = ( /obj/item/kirbyplants/large, /obj/effect/turf_decal/tiles/department/security/side{ @@ -6161,9 +6152,6 @@ /obj/machinery/computer/shuttle/labor{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/turf_decal/tiles/department/security/side{ dir = 8 }, @@ -47216,6 +47204,15 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) +"eyh" = ( +/obj/structure/chair/office/dark{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/station/security/permabrig) "eyl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, @@ -49230,9 +49227,6 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/port/east) "fvy" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/cable{ icon_state = "1-4" }, @@ -49253,21 +49247,25 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "fwa" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/effect/turf_decal/tiles/department/security/side{ dir = 1 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "fwg" = ( @@ -49513,10 +49511,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/tiles/department/security/side{ dir = 1 }, -/obj/effect/turf_decal/tiles/department/security/side{ +/obj/machinery/light{ dir = 1 }, /turf/simulated/floor/plasteel, @@ -50097,6 +50095,13 @@ /obj/effect/turf_decal/tiles/department/security/side{ dir = 1 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/item/radio/intercom/locked/prison{ + name = "Prison Intercom (General)"; + pixel_y = 25 + }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "fRy" = ( @@ -50188,6 +50193,14 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/ne) +"fUi" = ( +/obj/effect/turf_decal/tiles/department/security, +/obj/structure/toilet/directional/north, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/security/permabrig) "fUw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -51272,11 +51285,13 @@ /turf/simulated/floor/plasteel/dark, /area/station/hallway/secondary/entry/north) "gxb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/effect/turf_decal/tiles/department/security, +/obj/structure/bed, +/obj/item/radio/intercom/locked/prison{ + name = "Prison Intercom (General)"; + pixel_x = 28 + }, +/obj/item/bedsheet/orange, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "gxl" = ( @@ -52983,29 +52998,25 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "hqC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/item/radio/intercom/locked/prison{ - name = "Prison Intercom (General)"; - pixel_y = 25 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, /obj/effect/turf_decal/tiles/department/security/side{ dir = 1 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/caution, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "hqU" = ( @@ -58048,27 +58059,24 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "jSq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 - }, /obj/effect/turf_decal/tiles/department/security/side{ dir = 1 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/caution, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "jSr" = ( @@ -59002,24 +59010,24 @@ /turf/simulated/floor/plasteel/white, /area/station/science/break_room) "kok" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/effect/turf_decal/tiles/department/security/side{ dir = 1 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "kot" = ( @@ -59944,6 +59952,14 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) +"kKR" = ( +/obj/effect/turf_decal/tiles/department/security, +/obj/structure/toilet/directional/north, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/security/permabrig) "kKW" = ( /obj/structure/table/glass, /obj/machinery/computer/med_data/laptop, @@ -60104,6 +60120,13 @@ }, /turf/simulated/floor/transparent/glass, /area/station/hallway/primary/central/south) +"kPE" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tiles/department/security, +/turf/simulated/floor/plasteel, +/area/station/security/permabrig) "kPH" = ( /obj/effect/spawner/window/reinforced, /obj/structure/disposalpipe/segment{ @@ -60731,17 +60754,13 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "lfn" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = 3; - pixel_y = 7 - }, -/obj/item/pen, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/turf_decal/tiles/department/security, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "lfv" = ( @@ -61972,11 +61991,12 @@ /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) "lJV" = ( -/obj/machinery/light/small, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, /obj/effect/turf_decal/tiles/department/security, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "lKj" = ( @@ -62379,18 +62399,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/north) -"lTB" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Solitary Confinement 1" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/tiles/department/security, -/turf/simulated/floor/plasteel, -/area/station/security/permabrig) "lUa" = ( /obj/structure/cable{ icon_state = "4-8" @@ -63605,6 +63613,12 @@ /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) +"mBf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/wood, +/area/station/security/permabrig) "mBl" = ( /obj/effect/spawner/random/fungus/maybe, /turf/simulated/wall, @@ -63866,20 +63880,6 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) -"mHy" = ( -/obj/effect/spawner/window/reinforced/grilled, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/sign/electricshock{ - pixel_y = 32 - }, -/obj/effect/turf_decal/stripes, -/turf/simulated/floor/plating, -/area/station/security/permabrig) "mHH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -65308,6 +65308,16 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) +"nxD" = ( +/obj/effect/turf_decal/tiles/department/security, +/obj/machinery/cryopod, +/obj/machinery/camera{ + c_tag = "Prison Solitary 1"; + network = list("Prison","SS13"); + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/security/permabrig) "nxI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/purple, /obj/machinery/door/airlock/maintenance, @@ -65690,6 +65700,21 @@ }, /turf/simulated/floor/wood, /area/station/command/meeting_room) +"nGS" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Solitary Confinement 1" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tiles/department/security, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel, +/area/station/security/permabrig) "nHq" = ( /obj/machinery/light/small, /obj/structure/cable/extra_insulated{ @@ -66439,13 +66464,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/storage) -"nYZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/chair/office/dark{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/station/security/permabrig) "nZe" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -66718,13 +66736,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) -"ofW" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/bookcase, -/turf/simulated/floor/wood, -/area/station/security/permabrig) "oga" = ( /obj/structure/closet/walllocker/emerglocker/directional/north, /obj/structure/chair/comfy/shuttle, @@ -68948,10 +68959,16 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint2) "pgW" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/effect/turf_decal/tiles/department/security, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "pgX" = ( @@ -69852,6 +69869,18 @@ }, /turf/simulated/floor/plating, /area/station/security/lobby) +"pDw" = ( +/obj/effect/turf_decal/tiles/department/security, +/obj/machinery/cryopod{ + dir = 4 + }, +/obj/machinery/camera{ + c_tag = "Prison Solitary 2"; + dir = 4; + network = list("Prison","SS13") + }, +/turf/simulated/floor/plasteel, +/area/station/security/permabrig) "pDG" = ( /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, @@ -71254,9 +71283,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -71270,6 +71296,12 @@ /obj/effect/turf_decal/tiles/department/security/side{ dir = 1 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "qod" = ( @@ -71512,6 +71544,11 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) +"qrs" = ( +/obj/machinery/hologram/holopad, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel, +/area/station/security/permabrig) "qrx" = ( /obj/machinery/power/apc/directional/east, /obj/structure/cable{ @@ -72136,13 +72173,6 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) -"qFw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/station/security/permabrig) "qFy" = ( /obj/machinery/bodyscanner, /obj/machinery/firealarm/directional/east, @@ -76730,6 +76760,10 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/aft) +"sSG" = ( +/obj/structure/bookcase, +/turf/simulated/floor/wood, +/area/station/security/permabrig) "sSP" = ( /obj/machinery/light{ dir = 4 @@ -77590,13 +77624,11 @@ /turf/simulated/floor/carpet/blue, /area/station/command/office/blueshield) "tvr" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/station/security/permabrig) "tvy" = ( @@ -77706,15 +77738,15 @@ /turf/simulated/floor/grass, /area/station/security/permabrig) "twL" = ( -/obj/structure/bed{ - dir = 4 - }, -/obj/item/radio/intercom/locked/prison{ - name = "Prison Intercom (General)"; - pixel_y = 25 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tiles/department/security, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/structure/sink/directional/west, +/obj/structure/mirror{ + pixel_x = -28 + }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "txr" = ( @@ -78923,20 +78955,13 @@ /turf/simulated/floor/plasteel/white, /area/station/medical/patients_rooms_secondary) "tYe" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/turf_decal/tiles/department/security, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "tYl" = ( @@ -79071,6 +79096,12 @@ /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel/white, /area/station/maintenance/aft) +"uaM" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/station/security/permabrig) "ubq" = ( /obj/structure/rack, /obj/item/clothing/gloves/boxing/green{ @@ -79752,12 +79783,13 @@ /turf/simulated/floor/plasteel, /area/station/security/prisonlockers) "utC" = ( -/obj/machinery/light/small, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tiles/department/security, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "utK" = ( @@ -80718,19 +80750,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) -"uWf" = ( -/obj/structure/toilet/directional/east, -/obj/machinery/camera{ - c_tag = "Prison Solitary 2"; - dir = 8; - network = list("Prison","SS13") - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/turf_decal/tiles/department/security, -/turf/simulated/floor/plasteel, -/area/station/security/permabrig) "uWp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -81308,6 +81327,12 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) +"vnA" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/station/security/permabrig) "vnO" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel/dark, @@ -81720,12 +81745,14 @@ /turf/simulated/floor/plasteel/dark, /area/station/maintenance/apmaint) "vxy" = ( -/obj/structure/bed, -/obj/item/radio/intercom/locked/prison{ - name = "Prison Intercom (General)"; - pixel_y = 25 - }, /obj/effect/turf_decal/tiles/department/security, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/sink/directional/east, +/obj/structure/mirror{ + pixel_x = 28 + }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "vxz" = ( @@ -84353,16 +84380,17 @@ /turf/simulated/floor/plating, /area/station/medical/chemistry) "wOM" = ( -/obj/machinery/camera{ - c_tag = "Prison Solitary 1"; - network = list("Prison","SS13"); - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/toilet/directional/west, /obj/effect/turf_decal/tiles/department/security, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_x = 9; + pixel_y = 8 + }, +/obj/item/food/tofu, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "wOW" = ( @@ -87064,13 +87092,24 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "ybN" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tiles/department/security, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) +"ybQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, +/area/station/security/permabrig) "ycb" = ( /obj/structure/disposalpipe/segment/corner{ dir = 2 @@ -107664,9 +107703,9 @@ aaa aaa aab abN -abN laL -spo +mBf +ybQ tvr uGG nDZ @@ -107920,11 +107959,11 @@ aaa aaa aaa aab -aaa abN iPz -nYZ -rhk +eyh +spo +vnA qIS sqb fxP @@ -108177,11 +108216,11 @@ aaa aaa aaa aaa -aab abN oWe -uLp -ofW +rhk +sSG +abN abN abN abN @@ -108434,12 +108473,12 @@ aaa aaa aaa aaa -aaa abN abN abN abN abN +fUi twL wOM abN @@ -108695,11 +108734,11 @@ aaa aaa aaa aaa -aaa wjM +kPE ybN utC -abN +nGS hqC ado oUV @@ -108952,11 +108991,11 @@ aaa aaa aaa aaa -aaa abN +nxD lfn gxb -lTB +abN fwa ado asi @@ -109208,14 +109247,14 @@ aaa aaa aaa aaa -aaa xRI abN -mHy +abN +abN abN abN fBw -krG +qrs hNf lKq eOI @@ -109466,11 +109505,11 @@ aaa aaa aaa aaa -aaa abN +pDw tYe ajy -vpR +abN kok anf asi @@ -109723,13 +109762,13 @@ aaa aaa aaa aaa -aaa wjM +kPE pgW lJV -abN +vpR jSq -qFw +anf hNf abN abN @@ -109980,13 +110019,13 @@ dOd aab aab qws -aaa abN +kKR vxy -uWf +wOM abN qnW -ado +uaM asi tKe jgx @@ -110237,7 +110276,7 @@ aaa aaa aaa spM -mnj +abN abN abN abN @@ -110751,7 +110790,7 @@ aaa aaa hoB qhg -auC +aBA jeQ awB vtj diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 15238fe221f..bc1a14548f4 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -45,11 +45,15 @@ /turf/simulated/floor/wood, /area/station/service/bar) "aax" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/machinery/light/small{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tiles/department/security, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) @@ -1304,21 +1308,6 @@ }, /turf/simulated/floor/plasteel, /area/station/security/prison/cell_block/a) -"aja" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/simulated/floor/plasteel, -/area/station/security/permabrig) "aje" = ( /obj/machinery/door/poddoor/shutters/preopen{ dir = 8; @@ -1640,12 +1629,12 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/permabrig) "alp" = ( -/obj/structure/bed, -/obj/item/bedsheet/orange, -/obj/item/radio/intercom/locked/prison{ - name = "Prison Intercom (General)"; - pixel_y = 25 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" }, +/obj/effect/turf_decal/tiles/department/security, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "alv" = ( @@ -6782,6 +6771,17 @@ /obj/effect/turf_decal/tiles/neutral, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/north) +"bgk" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/sign/electricshock{ + pixel_x = -32 + }, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating" + }, +/area/station/security/permabrig) "bgq" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -7190,15 +7190,6 @@ /obj/effect/turf_decal/tiles/dark/checker, /turf/simulated/floor/plasteel/white, /area/station/medical/break_room) -"bjz" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/station/security/permabrig) "bjA" = ( /obj/machinery/cryopod{ dir = 2 @@ -7849,6 +7840,20 @@ }, /turf/simulated/floor/plasteel, /area/station/security/processing) +"bnG" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Solitary Confinement 1" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tiles/department/security, +/turf/simulated/floor/plasteel, +/area/station/security/permabrig) "bnN" = ( /obj/vehicle/secway, /obj/effect/turf_decal/delivery/hollow, @@ -12228,6 +12233,8 @@ id = "prison"; pixel_y = 20 }, +/obj/item/storage/fancy/donut_box, +/obj/structure/table, /turf/simulated/floor/plasteel/dark, /area/station/security/permabrig) "bUh" = ( @@ -15673,19 +15680,6 @@ /obj/effect/turf_decal/tiles/department/security/corner, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/west) -"cwr" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Solitary Confinement 2" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/station/security/permabrig) "cwt" = ( /obj/structure/sign/chemistry, /turf/simulated/wall/r_wall, @@ -18774,8 +18768,13 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/permabrig) "cVR" = ( -/obj/item/beach_ball/holoball, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/holohoop{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "cVX" = ( @@ -18828,6 +18827,16 @@ /obj/item/chair, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) +"cWy" = ( +/obj/effect/turf_decal/tiles/department/security, +/obj/machinery/cryopod/right, +/obj/machinery/camera{ + c_tag = "Prison Solitary Confinement 2"; + dir = 4; + network = list("Prison","SS13") + }, +/turf/simulated/floor/plasteel, +/area/station/security/permabrig) "cWz" = ( /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) @@ -21121,16 +21130,6 @@ /obj/effect/turf_decal/tiles/department/security/side, /turf/simulated/floor/plasteel, /area/station/security/prisonershuttle) -"drA" = ( -/obj/machinery/power/apc/directional/east, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/effect/turf_decal/tiles/department/security/corner{ - dir = 1 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/security/permabrig) "drC" = ( /mob/living/basic/snake{ name = "Sssylvester" @@ -23378,6 +23377,10 @@ }, /turf/simulated/floor/plating, /area/station/security/prison/cell_block/a) +"dPd" = ( +/obj/effect/spawner/random/fungus/probably, +/turf/simulated/wall/r_wall, +/area/station/maintenance/security/fore_starboard) "dPe" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -24695,17 +24698,12 @@ }, /area/station/medical/cryo) "efP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/effect/turf_decal/tiles/department/security, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/camera{ - c_tag = "Prison Solitary Confinement 2"; - dir = 5; - network = list("Prison","SS13") - }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/light/small{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) @@ -25583,11 +25581,6 @@ }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) -"epy" = ( -/obj/structure/table, -/obj/item/storage/fancy/donut_box, -/turf/simulated/floor/plasteel/dark, -/area/station/security/permabrig) "epH" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ @@ -32501,8 +32494,8 @@ /turf/simulated/floor/plasteel/white, /area/station/hallway/primary/port/north) "fQH" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/station/security/permabrig) @@ -32611,15 +32604,6 @@ /obj/structure/closet/firecloset/full, /turf/simulated/floor/plating, /area/station/maintenance/starboard) -"fRS" = ( -/obj/machinery/door/airlock/security/glass{ - security_level = 1 - }, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plasteel/dark, -/area/station/security/permabrig) "fRW" = ( /turf/simulated/floor/plating/airless, /area/station/maintenance/security/aft_port) @@ -35328,17 +35312,6 @@ icon_state = "asteroidplating" }, /area/station/maintenance/service/aft_starboard) -"gBX" = ( -/obj/machinery/computer/cryopod{ - pixel_x = 32; - pixel_y = -10; - dir = 8 - }, -/obj/effect/turf_decal/tiles/department/security/side{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/security/permabrig) "gCj" = ( /obj/machinery/conveyor_switch/oneway{ id = "QMLoad2" @@ -38891,9 +38864,7 @@ name = "Prison Lockdown Blast Doors"; opacity = 0 }, -/obj/structure/cable{ - icon_state = "0-4" - }, +/obj/structure/cable, /turf/simulated/floor/plating, /area/station/security/permabrig) "hrG" = ( @@ -39363,12 +39334,6 @@ /obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) -"hxj" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/station/security/permabrig) "hxp" = ( /obj/structure/disposalpipe/segment{ color = "#954535" @@ -40290,6 +40255,13 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) +"hGS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/item/beach_ball/holoball, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating" + }, +/area/station/security/permabrig) "hGW" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -41515,6 +41487,14 @@ /obj/structure/railing, /turf/simulated/floor/plating/airless, /area/station/turret_protected/aisat/interior/secondary) +"hTB" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating" + }, +/area/station/security/permabrig) "hTI" = ( /obj/effect/spawner/random/engineering/tools, /turf/simulated/floor/plating{ @@ -45707,6 +45687,18 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/storage) +"iNf" = ( +/obj/effect/turf_decal/tiles/department/security, +/obj/machinery/cryopod/right{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Prison Solitary Confinement 1"; + dir = 8; + network = list("Prison","SS13") + }, +/turf/simulated/floor/plasteel, +/area/station/security/permabrig) "iNj" = ( /obj/machinery/computer/shuttle/mining{ dir = 1 @@ -46468,6 +46460,17 @@ /obj/effect/mapping_helpers/airlock/windoor/access/any/science/xenobio, /turf/simulated/floor/engine, /area/station/science/xenobiology) +"iUb" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/turf_decal/tiles/department/security, +/obj/structure/sink/directional/west, +/obj/structure/mirror{ + pixel_x = -28 + }, +/turf/simulated/floor/plasteel, +/area/station/security/permabrig) "iUh" = ( /obj/item/radio/intercom{ name = "east bump"; @@ -46654,11 +46657,12 @@ /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) "iXo" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/tiles/department/security, +/obj/structure/bed, +/obj/item/bedsheet/orange, +/obj/item/radio/intercom/locked/prison{ + name = "Prison Intercom (General)"; + pixel_y = -28 }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) @@ -47340,6 +47344,20 @@ "jft" = ( /turf/simulated/mineral/ancient, /area/mine/unexplored/cere/orbiting) +"jfu" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Solitary Confinement 2" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tiles/department/security, +/turf/simulated/floor/plasteel, +/area/station/security/permabrig) "jfC" = ( /obj/machinery/hydroponics/constructable{ desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; @@ -54808,6 +54826,9 @@ "kKb" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "kKh" = ( @@ -54978,6 +54999,14 @@ /obj/structure/sink/kitchen/old/directional/north, /turf/simulated/floor/plasteel, /area/station/security/permabrig) +"kLP" = ( +/obj/effect/turf_decal/tiles/department/security, +/obj/structure/toilet/directional/north, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/security/permabrig) "kLQ" = ( /obj/structure/cable/extra_insulated{ icon_state = "1-8" @@ -56986,16 +57015,10 @@ /turf/simulated/mineral/ancient, /area/station/hallway/spacebridge/scidock) "lko" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/food/tofu, -/obj/item/pen{ - pixel_x = 9; - pixel_y = 8 +/obj/structure/cable{ + icon_state = "1-2" }, +/obj/effect/turf_decal/tiles/department/security, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "lkx" = ( @@ -57250,11 +57273,15 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/vault) "lmh" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/machinery/light/small{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tiles/department/security, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) @@ -58778,6 +58805,15 @@ "lAN" = ( /turf/simulated/wall/r_wall, /area/station/hallway/spacebridge/sercom) +"lAU" = ( +/obj/effect/turf_decal/tiles/department/security/side{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/security/permabrig) "lBb" = ( /obj/structure/disposalpipe/segment/corner{ dir = 8 @@ -65001,6 +65037,7 @@ "mZg" = ( /obj/machinery/hologram/holopad, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "mZi" = ( @@ -73704,7 +73741,14 @@ /turf/simulated/floor/plating, /area/station/hallway/primary/aft/west) "oWP" = ( -/obj/effect/turf_decal/tiles/department/security, +/obj/effect/turf_decal/tiles/department/security/side{ + dir = 8 + }, +/obj/machinery/computer/cryopod{ + pixel_x = 32; + pixel_y = -10; + dir = 8 + }, /turf/simulated/floor/plasteel/dark, /area/station/security/permabrig) "oWR" = ( @@ -74185,11 +74229,12 @@ /area/station/turret_protected/ai) "pcm" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "0-8" }, -/obj/effect/turf_decal/tiles/department/security/side{ +/obj/effect/turf_decal/tiles/department/security/corner{ dir = 1 }, +/obj/machinery/power/apc/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/security/permabrig) "pco" = ( @@ -74343,16 +74388,6 @@ /obj/effect/turf_decal/tiles/department/virology, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/service/aft_starboard) -"pdt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/holohoop{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/station/security/permabrig) "pdu" = ( /obj/structure/fans/tiny, /obj/machinery/door/airlock/titanium/glass, @@ -75766,6 +75801,14 @@ /obj/effect/turf_decal/tiles/neutral, /turf/simulated/floor/plasteel, /area/station/security/lobby) +"puI" = ( +/obj/structure/holohoop{ + dir = 8 + }, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating" + }, +/area/station/security/permabrig) "puQ" = ( /obj/structure/chair/wood, /obj/effect/landmark/start/assistant, @@ -77269,6 +77312,20 @@ /obj/machinery/atmospherics/refill_station/plasma, /turf/simulated/floor/plasteel/white, /area/station/hallway/primary/port/north) +"pOi" = ( +/obj/effect/turf_decal/tiles/department/security, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_x = 9; + pixel_y = 8 + }, +/obj/item/food/tofu, +/turf/simulated/floor/plasteel, +/area/station/security/permabrig) "pOk" = ( /obj/machinery/barsign{ pixel_y = -32 @@ -77655,15 +77712,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/engineering/break_room/secondary) -"pRX" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tiles/department/security/side{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/security/permabrig) "pSc" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line{ @@ -78042,12 +78090,12 @@ /area/station/service/chapel) "pWr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "pWs" = ( @@ -78427,6 +78475,11 @@ /obj/item/bedsheet/cmo, /turf/simulated/floor/carpet/blue, /area/station/command/office/cmo) +"qci" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel, +/area/station/security/permabrig) "qcl" = ( /obj/structure/chair{ dir = 4 @@ -79208,6 +79261,10 @@ /obj/item/stock_parts/cell/high, /turf/simulated/floor/plasteel/dark, /area/station/aisat/service) +"qlI" = ( +/obj/effect/turf_decal/stripes/corner, +/turf/simulated/floor/plasteel, +/area/station/security/permabrig) "qlV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -79923,27 +79980,6 @@ /obj/effect/turf_decal/tiles/neutral, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/west) -"qtU" = ( -/obj/item/radio/intercom{ - name = "east bump"; - pixel_x = 28 - }, -/obj/structure/table, -/obj/item/wrench, -/obj/item/screwdriver, -/obj/item/storage/box/teargas{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/effect/turf_decal/tiles/department/security/corner{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/security/permabrig) "qtV" = ( /obj/structure/table/wood, /obj/item/ashtray/glass{ @@ -80051,23 +80087,6 @@ /obj/item/pickaxe, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) -"quJ" = ( -/obj/effect/spawner/window/reinforced/grilled, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Prison Gate"; - name = "Prison Lockdown Blast Doors"; - opacity = 0 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/station/security/permabrig) "quK" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -84458,12 +84477,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/station/medical/storage/secondary) -"rwv" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/station/security/permabrig) "rwx" = ( /obj/structure/cable{ icon_state = "4-8" @@ -86622,12 +86635,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "rSq" = ( @@ -88051,21 +88067,6 @@ }, /turf/simulated/floor/plasteel/white, /area/station/medical/virology) -"siM" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/security/permabrig) "siX" = ( /obj/machinery/atmospherics/unary/tank/nitrogen{ dir = 1 @@ -88606,6 +88607,17 @@ /obj/effect/spawner/random/fungus/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/abandonedservers) +"spg" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/turf_decal/tiles/department/security, +/obj/structure/sink/directional/east, +/obj/structure/mirror{ + pixel_x = 28 + }, +/turf/simulated/floor/plasteel, +/area/station/security/permabrig) "spk" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tiles/department/science/side, @@ -93748,7 +93760,24 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "tvN" = ( -/obj/effect/turf_decal/tiles/department/security/side, +/obj/structure/table, +/obj/item/screwdriver, +/obj/item/wrench, +/obj/item/storage/box/teargas{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/effect/turf_decal/tiles/department/security/corner{ + dir = 8 + }, +/obj/item/radio/intercom{ + name = "east bump"; + pixel_x = 28 + }, /turf/simulated/floor/plasteel/dark, /area/station/security/permabrig) "tvO" = ( @@ -96712,17 +96741,12 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/security/port) "udp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/effect/turf_decal/tiles/department/security, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/obj/machinery/camera{ - c_tag = "Prison Solitary Confinement 1"; - dir = 8; - network = list("Prison","SS13") - }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/light/small{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) @@ -98138,16 +98162,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/station/supply/sorting) -"utf" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/electricshock{ - pixel_x = -32 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/station/security/permabrig) "utp" = ( /obj/structure/rack, /obj/item/stack/sheet/metal/fifty, @@ -99035,6 +99049,14 @@ "uCo" = ( /turf/simulated/floor/plasteel/dark, /area/station/science/robotics) +"uCr" = ( +/obj/effect/turf_decal/tiles/department/security, +/obj/structure/toilet/directional/north, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/security/permabrig) "uCt" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, @@ -101121,8 +101143,10 @@ /turf/simulated/floor/plasteel/white, /area/station/medical/patients_rooms_secondary) "vbc" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/station/security/permabrig) "vbf" = ( @@ -108146,19 +108170,6 @@ /obj/effect/turf_decal/tiles/department/virology, /turf/simulated/floor/plasteel/white, /area/station/public/quantum/science) -"wAP" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Solitary Confinement 1" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/station/security/permabrig) "wAX" = ( /obj/item/desk_bell{ pixel_x = 7; @@ -109400,12 +109411,6 @@ }, /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) -"wNG" = ( -/obj/structure/holohoop{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/station/security/permabrig) "wNT" = ( /obj/structure/chair/wood{ dir = 4 @@ -114466,21 +114471,6 @@ }, /turf/simulated/floor/engine, /area/station/medical/chemistry) -"xTO" = ( -/obj/effect/spawner/window/reinforced/grilled, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Prison Gate"; - name = "Prison Lockdown Blast Doors"; - opacity = 0 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable, -/turf/simulated/floor/plating, -/area/station/security/permabrig) "xUa" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -133993,10 +133983,10 @@ cVP afd bUg tvN -oWP +lAU oWP pcm -fRS +afd dpu efS lqp @@ -134248,11 +134238,11 @@ mYJ afd afd afd -epy -qtU -pRX -gBX -drA +afd +afd +afd +afd +afd afd nsC yfn @@ -134502,15 +134492,15 @@ afY vdq cRx vdq -vdq -afd -afd -afd -afd -afd -afd +akf afd +kLP +iUb +pOi afd +rNK +rNK +gmC tpk qSQ tPt @@ -134757,10 +134747,10 @@ hGA mle aga vdq -siM -vdq -akf -afd +kNz +xZx +tiO +bnG alp aax lko @@ -135014,14 +135004,14 @@ agd agd vdq vdq -kNz -xZx -tiO -wAP -xZx +cRx +vdq +vNP +afd +iNf udp iXo -xTO +afd rNK rNK pXO @@ -135273,7 +135263,7 @@ xeC sJJ aFT vdq -vNP +vdq afd afd afd @@ -135528,14 +135518,14 @@ vdq uAd dqz vNP -xgg -xZx -tiO -cwr -xZx +cRx +vdq +qlI +afd +cWy efP -bjz -jHt +iXo +afd rNK rNK bAv @@ -135785,14 +135775,14 @@ uYa vdq vUM vdq -cRx -vNP -hxj -afd +xgg +xZx +tiO +jfu alp lmh lko -hMA +hrF rNK rNK pXO @@ -136046,9 +136036,9 @@ iZP jUh kKb afd -afd -afd -afd +uCr +spg +pOi afd lzH lzH @@ -136299,14 +136289,14 @@ aTz lEq epR epr -aja -jpl -rwv -rwv -pdt -rwv -utf -jHt +cRx +rHj +vdq +afd +afd +afd +afd +afd rNK rNK bAv @@ -136557,13 +136547,13 @@ nTq aTz aqL rSl -dLb -dLb +jpl +jpl vbc cVR fQH -rHj -quJ +bgk +jHt rNK rNK doX @@ -136814,11 +136804,11 @@ aTz aTz cQc pWr -rHj -dqz +dLb +qci mZg -rHj -rHj +hGS +hTB rHj hMA rNK @@ -137331,7 +137321,7 @@ tkn uYa rHj rHj -wNG +vdq tkn dqz jlP @@ -137586,9 +137576,9 @@ aCu vQq vQq aTz -jCz -gYe -aTz +rHj +vNP +rHj vNP vNP rHj @@ -137843,13 +137833,13 @@ bKJ aLt egp aTz -aTz -aTz -aTz -boP -boP -cKZ -bZt +rHj +rHj +puI +rHj +rHj +vNP +rHj fqh xax sXV @@ -138100,13 +138090,13 @@ uMc mop onT aTz +jCz +gYe aTz -aTz -aTz -qoz -qAK -mVr -arh +boP +boP +cKZ +bZt asu atc lJH @@ -138361,9 +138351,9 @@ aTz aTz aTz qoz -eAn -oEa -ark +qAK +mVr +arh fqh bOR atc @@ -138618,9 +138608,9 @@ aTz aTz aTz qoz -aTy +eAn +oEa ark -fAc fqh sGJ atd @@ -138874,10 +138864,10 @@ aTz aTz aTz aTz -lhq qoz -qoz -lhq +aTy +ark +fAc fqh ate uhf @@ -139131,10 +139121,10 @@ aTz aTz aTz aTz -aTz -aTz -aTz -aTz +lhq +lhq +lhq +lhq fqh atf vsZ @@ -139388,10 +139378,10 @@ afd afd afd afd -afd -afd -afd -afd +uWM +dPd +dPd +uWM fqh dpc uBq diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 0cab6300ef5..a4ff4ef5afc 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -38866,6 +38866,7 @@ pixel_y = 21 }, /obj/effect/turf_decal/tiles/department/security, +/obj/item/bedsheet/orange, /turf/simulated/floor/plasteel/dark, /area/station/security/permabrig) "cTD" = ( @@ -39881,6 +39882,10 @@ "cYw" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/turf_decal/tiles/department/security, +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/structure/sink/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/security/permabrig) "cYy" = ( @@ -47145,6 +47150,17 @@ }, /turf/simulated/floor/carpet/black, /area/station/service/chapel) +"dLE" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/turf_decal/tiles/department/security, +/obj/structure/sink/directional/south, +/obj/structure/mirror{ + pixel_y = -28 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/security/permabrig) "dLL" = ( /obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/tiles/neutral/corner{ @@ -54002,6 +54018,11 @@ dir = 8 }, /obj/effect/turf_decal/tiles/department/security, +/obj/machinery/camera{ + c_tag = "Prison Solitary 1"; + network = list("Prison","SS13"); + dir = 10 + }, /turf/simulated/floor/plasteel/dark, /area/station/security/permabrig) "fQI" = ( @@ -55879,16 +55900,12 @@ /turf/simulated/floor/plasteel/dark, /area/station/maintenance/port2) "gIW" = ( -/obj/machinery/camera{ - c_tag = "Prison Solitary 2"; - dir = 5; - network = list("Prison","SS13") - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/toilet/directional/west, /obj/effect/turf_decal/tiles/department/security, +/obj/structure/window/reinforced, +/obj/structure/toilet/directional/north, +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plasteel/dark, /area/station/security/permabrig) "gJT" = ( @@ -59512,6 +59529,18 @@ /obj/effect/turf_decal/tiles/department/security/side, /turf/simulated/floor/plasteel, /area/station/security/permabrig) +"itU" = ( +/obj/machinery/cryopod/right{ + dir = 8 + }, +/obj/effect/turf_decal/tiles/department/security, +/obj/machinery/camera{ + c_tag = "Prison Solitary 2"; + dir = 6; + network = list("Prison","SS13") + }, +/turf/simulated/floor/plasteel/dark, +/area/station/security/permabrig) "itX" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -72384,9 +72413,16 @@ /area/station/maintenance/fsmaint) "obm" = ( /obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, /obj/effect/turf_decal/tiles/department/security, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_x = 9; + pixel_y = 8 + }, +/obj/item/food/tofu, /turf/simulated/floor/plasteel/dark, /area/station/security/permabrig) "obL" = ( @@ -94591,14 +94627,14 @@ /turf/simulated/floor/plasteel/white, /area/station/science/genetics) "xdo" = ( -/obj/machinery/camera{ - c_tag = "Prison Solitary 1"; - network = list("Prison","SS13"); - dir = 4 - }, -/obj/machinery/light/small, -/obj/structure/toilet/directional/west, /obj/effect/turf_decal/tiles/department/security, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/toilet/directional/south, +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plasteel/dark, /area/station/security/permabrig) "xdN" = ( @@ -95448,6 +95484,7 @@ pixel_y = -25 }, /obj/effect/turf_decal/tiles/department/security, +/obj/item/bedsheet/orange, /turf/simulated/floor/plasteel/dark, /area/station/security/permabrig) "xwD" = ( @@ -149679,7 +149716,7 @@ lWb uOS vZQ vVm -lWb +dLE ygH aaa aaa @@ -149930,7 +149967,7 @@ mnT ecm mnT ygH -fQx +itU iUt xvY ygH