diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 47be4799cd2..127f4594e24 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -3334,9 +3334,9 @@ }, /area/engine/gravitygenerator) "asT" = ( -/obj/structure/lattice, -/turf/space, -/area/space) +/obj/structure/sign/security, +/turf/simulated/wall/r_wall, +/area/security/processing) "asU" = ( /obj/structure/cable{ d2 = 4; @@ -4865,15 +4865,16 @@ /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "axQ" = ( -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, +/obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ d2 = 4; icon_state = "0-4" }, -/obj/effect/spawner/window/reinforced, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint) "axR" = ( @@ -4895,10 +4896,6 @@ /turf/simulated/floor/plating, /area/maintenance/fore) "axU" = ( -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -4908,6 +4905,7 @@ /obj/structure/sign/electricshock{ pixel_x = 32 }, +/obj/structure/cable/yellow, /turf/simulated/floor/plating, /area/maintenance/fpmaint) "axV" = ( @@ -7069,11 +7067,6 @@ name = "\improper Mining Office" }) "aFG" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -7085,25 +7078,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/crew_quarters/dorms) -"aFJ" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) "aFK" = ( @@ -7826,11 +7800,6 @@ name = "\improper Storage Wing" }) "aHV" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /obj/structure/extinguisher_cabinet{ name = "west bump"; pixel_x = -27 @@ -7858,14 +7827,6 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aHZ" = ( -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, /obj/machinery/light/small{ dir = 1 }, @@ -7874,6 +7835,10 @@ name = "north bump"; pixel_y = 24 }, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -7974,11 +7939,6 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "aIk" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/light{ dir = 8 }, @@ -8591,11 +8551,6 @@ name = "\improper Restrooms" }) "aJC" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -8895,10 +8850,6 @@ /turf/simulated/floor/plating, /area/hallway/primary/fore) "aKq" = ( -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, /obj/structure/cable/yellow{ d2 = 4; icon_state = "0-4" @@ -9116,6 +9067,11 @@ c_tag = "Dormitories - Aft"; dir = 4 }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -9134,6 +9090,11 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -9148,6 +9109,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -9160,10 +9126,15 @@ dir = 5 }, /obj/effect/landmark/start/clown, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /obj/structure/cable/yellow{ d1 = 1; - d2 = 4; - icon_state = "1-4" + d2 = 8; + icon_state = "1-8" }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -11337,6 +11308,11 @@ dir = 8; icon_state = "pipe-c" }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -14907,19 +14883,16 @@ /turf/simulated/wall/r_wall, /area/engine/chiefs_office) "ban" = ( -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" +/obj/effect/spawner/window/reinforced, +/obj/structure/sign/electricshock{ + pixel_x = -32 }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/effect/spawner/window/reinforced, -/obj/structure/sign/electricshock{ - pixel_x = -32 - }, +/obj/structure/cable/yellow, /turf/simulated/floor/plating, /area/maintenance/fpmaint) "bao" = ( @@ -30983,13 +30956,14 @@ d2 = 4; icon_state = "0-4" }, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, /obj/effect/spawner/window/reinforced/polarized{ id = "RD" }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/crew_quarters/hor) "bNP" = ( @@ -63258,11 +63232,9 @@ }, /area/engine/break_room) "ieA" = ( -/obj/structure/sign/electricshock{ - pixel_y = -32 - }, -/turf/space, -/area/space) +/obj/structure/sign/electricshock, +/turf/simulated/wall/r_wall, +/area/security/prisonlockers) "ieT" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -64643,11 +64615,6 @@ }, /area/medical/paramedic) "iKF" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/newscaster{ name = "west bump"; pixel_x = -32 @@ -67527,12 +67494,6 @@ }, /turf/simulated/floor/engine, /area/engine/engineering) -"knm" = ( -/obj/structure/sign/electricshock{ - pixel_x = 32 - }, -/turf/space, -/area/space) "knB" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -74309,11 +74270,9 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "nsJ" = ( -/obj/structure/sign/security{ - pixel_y = 32 - }, -/turf/space, -/area/space) +/obj/structure/sign/electricshock, +/turf/simulated/wall/r_wall, +/area/security/range) "ntO" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -74744,6 +74703,21 @@ icon_state = "red" }, /area/security/warden) +"nEw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plasteel, +/area/crew_quarters/dorms) "nEJ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -79810,6 +79784,18 @@ icon_state = "white" }, /area/toxins/lab) +"qpw" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/crew_quarters/dorms) "qpy" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -108592,7 +108578,7 @@ aaa cIl aaa aaa -asT +abq aaa aaa aaa @@ -117489,7 +117475,7 @@ pte ivD qIB abW -knm +aaa aaa aaa aOB @@ -117746,7 +117732,7 @@ tfl tfl tfl tfl -tfl +ieA amE ufj aky @@ -118532,8 +118518,8 @@ lGL dBT axN hvR -aHI -nsJ +asT +aaa nKT hOu xJy @@ -126220,8 +126206,8 @@ aaa aaa aaa aaa -ieA -esA +aaa +nsJ fcT esA fcT @@ -130357,7 +130343,7 @@ aFG aJE aIl aJD -aJE +aFI aJE aJE aCm @@ -131124,7 +131110,7 @@ awR cEe aCW aEo -aFI +qpw aGQ aJF fUI @@ -131381,7 +131367,7 @@ azj aBO hYV aEp -aFJ +nEw aGR aJG law