From dad2685b9c41322282adec50428db41163a6b608 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 21 Sep 2019 16:37:09 +1000 Subject: [PATCH] Fixes stuff in maints on Surface 2 --- maps/tether/tether-02-surface2.dmm | 203 ++++++++++++++++------------- 1 file changed, 112 insertions(+), 91 deletions(-) diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index d49916cab06..524283d7049 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -2109,9 +2109,9 @@ /obj/effect/floor_decal/rust, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/lower/mining) +/area/maintenance/lower/bar) "eO" = ( -/obj/item/clothing/head/surgery/green{ +/obj/effect/floor_decal/techfloor/orange{ dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -2121,7 +2121,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "eP" = ( -/obj/item/clothing/head/surgery/green{ +/obj/effect/floor_decal/techfloor/orange{ dir = 1 }, /obj/structure/catwalk, @@ -2129,7 +2129,7 @@ /area/maintenance/lower/bar) "eQ" = ( /obj/structure/catwalk, -/obj/item/clothing/head/surgery/green{ +/obj/effect/floor_decal/techfloor/orange{ dir = 1 }, /obj/structure/cable{ @@ -2141,7 +2141,7 @@ /area/maintenance/lower/bar) "eR" = ( /obj/structure/catwalk, -/obj/item/clothing/head/surgery/green{ +/obj/effect/floor_decal/techfloor/orange{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, @@ -2150,7 +2150,7 @@ /obj/structure/railing{ dir = 8 }, -/obj/item/clothing/head/surgery/green{ +/obj/effect/floor_decal/techfloor/orange{ dir = 5 }, /turf/simulated/floor/tiled/techfloor, @@ -2520,7 +2520,7 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/atrium_two) "fv" = ( -/obj/item/clothing/head/surgery/green{ +/obj/effect/floor_decal/techfloor/orange{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -2546,7 +2546,7 @@ /obj/structure/railing{ dir = 8 }, -/obj/item/clothing/head/surgery/green{ +/obj/effect/floor_decal/techfloor/orange{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, @@ -2825,7 +2825,7 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/atrium_two) "gb" = ( -/obj/item/clothing/head/surgery/green{ +/obj/effect/floor_decal/techfloor/orange{ dir = 8 }, /obj/structure/railing{ @@ -2935,7 +2935,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/clothing/head/surgery/green{ +/obj/effect/floor_decal/techfloor/orange{ dir = 10 }, /obj/structure/railing{ @@ -2944,31 +2944,31 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "go" = ( -/obj/item/clothing/head/surgery/green, +/obj/effect/floor_decal/techfloor/orange, /obj/structure/catwalk, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techmaint, /area/maintenance/lower/bar) "gp" = ( /obj/structure/catwalk, -/obj/item/clothing/head/surgery/green, +/obj/effect/floor_decal/techfloor/orange, /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techmaint, /area/maintenance/lower/bar) "gq" = ( /obj/structure/catwalk, -/obj/item/clothing/head/surgery/green, -/turf/simulated/floor/tiled/techfloor, +/obj/effect/floor_decal/techfloor/orange, +/turf/simulated/floor/tiled/techmaint, /area/maintenance/lower/bar) "gr" = ( /obj/structure/railing{ dir = 8 }, -/obj/item/clothing/head/surgery/green{ +/obj/effect/floor_decal/techfloor/orange{ dir = 6 }, /turf/simulated/floor/tiled/techfloor, @@ -3046,7 +3046,7 @@ /obj/structure/catwalk, /obj/structure/ladder/up, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techmaint, /area/maintenance/lower/bar) "gD" = ( /obj/structure/catwalk, @@ -3056,7 +3056,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techmaint, /area/maintenance/lower/bar) "gE" = ( /obj/structure/railing{ @@ -3203,16 +3203,7 @@ /area/maintenance/lower/bar) "gX" = ( /obj/structure/catwalk, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techmaint, /area/maintenance/lower/bar) "gY" = ( /obj/structure/catwalk, @@ -5517,13 +5508,18 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/atrium_two) "lL" = ( -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/north_staires_two) +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/bar) "lM" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -5764,9 +5760,10 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/atrium_two) "mc" = ( -/obj/item/device/radio/intercom, -/turf/simulated/wall, -/area/tether/surfacebase/north_staires_two) +/obj/structure/catwalk, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/bar) "md" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/common, @@ -5960,23 +5957,16 @@ /turf/simulated/floor/plating, /area/maintenance/lower/rnd) "mv" = ( -/obj/machinery/light/small{ +/obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/item/device/radio/intercom{ + pixel_y = -28 }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/turf/simulated/floor/tiled, +/area/tether/surfacebase/north_staires_two) "mw" = ( /obj/structure/cable{ icon_state = "4-8" @@ -16567,12 +16557,11 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "FB" = ( -/obj/structure/railing{ - dir = 8 +/obj/machinery/light/small{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/lower/south) +/area/maintenance/lower/rnd) "FC" = ( /turf/simulated/floor/wood, /area/maintenance/lower/atmos) @@ -17603,10 +17592,20 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "HH" = ( -/obj/structure/table/steel, -/obj/random/medical/lite, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/atmos) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) "HI" = ( /obj/structure/table/steel, /turf/simulated/floor/plating, @@ -21305,6 +21304,28 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) +"Om" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/alarm{ + dir = 8; + icon_state = "alarm0"; + pixel_x = 24 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) +"On" = ( +/obj/structure/table/steel, +/obj/random/medical/lite, +/obj/machinery/alarm{ + dir = 8; + icon_state = "alarm0"; + pixel_x = 24 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/atmos) "Op" = ( /obj/machinery/button/remote/blast_door{ id = "xenobiodiv8"; @@ -31540,7 +31561,7 @@ dY iz lJ dY -ii +jx ix iQ jh @@ -31692,7 +31713,7 @@ jy jy jy jy -dY +ii dY oy oV @@ -31822,10 +31843,10 @@ ge ge hc lx -lL -mc -ii mv +ge +FB +HH iS jj jy @@ -32158,7 +32179,7 @@ DS DS DS Hi -HH +On Ig IJ Eo @@ -35842,7 +35863,7 @@ rZ EJ EW Fi -FB +Om rZ FR zS @@ -36210,14 +36231,14 @@ cy ad ac ac -ad -dJ -df -ad +du +dL +ec +du eN -ac -ac -ac +ny +ny +ny dY en du @@ -36352,14 +36373,14 @@ cy ad ac ac -ad -dJ -df -ad +du +dL +ec +du eN eN -ac -ac +ny +ny dY dY du @@ -36494,16 +36515,16 @@ cA ad ac ac -ad -dJ -df -ad +du +dL +ec +du eN eN eN -ac -ac -ac +ny +ny +ny du gU du @@ -37073,7 +37094,7 @@ gc gp gD gD -gX +lL hj hA hS @@ -37213,9 +37234,9 @@ fw fw fw gq -ee -ee -gY +gX +gX +mc hk hB ef