diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 05971616da..d0bc17a426 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -19153,14 +19153,14 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit) "aJb" = ( -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/brown{ dir = 8 }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/exit) "aJc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/brown{ dir = 8 }, /turf/open/floor/plasteel/white/corner, @@ -33802,7 +33802,7 @@ /obj/machinery/status_display{ pixel_y = -32 }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/brown{ dir = 8 }, /turf/open/floor/plasteel/white/corner, @@ -33825,7 +33825,7 @@ /obj/structure/sign/poster/official/random{ pixel_y = -32 }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/brown{ dir = 8 }, /turf/open/floor/plasteel/white/corner, @@ -33925,7 +33925,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/brown{ dir = 8 }, /turf/open/floor/plasteel/white/corner, @@ -34540,17 +34540,6 @@ /obj/structure/sign/nanotrasen, /turf/closed/wall, /area/security/checkpoint) -"byB" = ( -/obj/structure/cable/white{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/dark/side{ - dir = 1 - }, -/area/command/bridge) "bGL" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 5 @@ -34847,15 +34836,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"dge" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/cable/white{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/service/bar/atrium) "dgV" = ( /obj/structure/cable{ icon_state = "4-8" @@ -35186,15 +35166,6 @@ }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) -"eYN" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/plasteel/white/corner, -/area/hallway/secondary/entry) "eZd" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/effect/turf_decal/stripes/line{ @@ -35510,17 +35481,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/maintenance/port/aft) -"ghQ" = ( -/obj/structure/cable/white{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/dark/side{ - dir = 5 - }, -/area/command/bridge) "gia" = ( /obj/structure/table/reinforced, /obj/machinery/reagentgrinder{ @@ -35561,10 +35521,6 @@ "glC" = ( /turf/closed/wall/r_wall, /area/maintenance/starboard/aft) -"gnc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/service/bar/atrium) "gre" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -35694,12 +35650,21 @@ }, /turf/open/floor/carpet/green/airless, /area/maintenance/starboard/aft) +"gYv" = ( +/turf/open/floor/plasteel, +/area/commons/dorms) "gZk" = ( /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 10 }, /turf/open/floor/plating/asteroid/airless, /area/asteroid/nearstation) +"heH" = ( +/obj/structure/table/reinforced, +/turf/open/floor/plasteel/dark/side{ + dir = 1 + }, +/area/service/bar/atrium) "heQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/navbeacon{ @@ -35766,6 +35731,15 @@ }, /turf/closed/wall/r_wall/rust, /area/engineering/atmos) +"huj" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/service/bar/atrium) "hvC" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -35875,6 +35849,9 @@ /obj/structure/sign/warning/vacuum, /turf/closed/wall, /area/cargo/storage) +"hRi" = ( +/turf/open/floor/plasteel, +/area/service/bar/atrium) "hSE" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -35898,15 +35875,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/science/robotics/lab) -"hTR" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark/side{ - dir = 1 - }, -/area/engineering/atmos) "hUG" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -36067,12 +36035,10 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) -"iQP" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood{ - icon_state = "wood-broken" - }, -/area/maintenance/port/aft) +"iQs" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/dark/corner, +/area/service/hydroponics) "iSq" = ( /turf/open/floor/plating/asteroid/airless, /area/maintenance/starboard/aft) @@ -36216,6 +36182,15 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/engineering/atmos) +"jkQ" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/plasteel/white/corner, +/area/hallway/secondary/entry) "jlZ" = ( /obj/structure/closet/crate, /obj/item/stack/ore/silver, @@ -36278,11 +36253,6 @@ /obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior, /turf/open/floor/engine, /area/science/mixing) -"jsF" = ( -/turf/open/floor/plasteel/dark/side{ - dir = 6 - }, -/area/command/bridge) "jtZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -36329,6 +36299,15 @@ }, /turf/open/floor/plasteel, /area/engineering/atmos) +"jzq" = ( +/obj/machinery/atmospherics/pipe/simple/yellow/visible{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark/side{ + dir = 1 + }, +/area/engineering/atmos) "jBh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -36403,6 +36382,15 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/plating, /area/science/mixing) +"jJn" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/cryopod{ + dir = 8 + }, +/turf/open/floor/plasteel/dark/side{ + dir = 4 + }, +/area/commons/dorms) "jLF" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -36775,6 +36763,16 @@ dir = 1 }, /area/engineering/atmos) +"lwu" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/turf/open/floor/plasteel/white/corner, +/area/hallway/secondary/exit) "lxq" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -36823,17 +36821,6 @@ }, /turf/open/floor/plasteel, /area/cargo/storage) -"lDW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/plasteel/white/corner{ - dir = 1 - }, -/area/hallway/secondary/entry) "lEr" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -36878,6 +36865,12 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"lSQ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/maintenance/port/aft) "lTY" = ( /obj/structure/window/reinforced{ dir = 4 @@ -36965,12 +36958,6 @@ }, /turf/open/floor/plasteel, /area/engineering/atmos) -"mlb" = ( -/obj/structure/table/reinforced, -/turf/open/floor/plasteel/dark/side{ - dir = 1 - }, -/area/service/bar/atrium) "mnD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -37031,22 +37018,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port/fore) -"mGy" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/service/bar/atrium) "mJP" = ( /obj/machinery/igniter{ id = "Incinerator" @@ -37126,6 +37097,10 @@ "ndg" = ( /turf/open/floor/plasteel, /area/hallway/primary/fore) +"nfH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/service/bar/atrium) "nfS" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/open/floor/plating, @@ -37174,6 +37149,13 @@ }, /turf/open/pool, /area/maintenance/starboard/aft) +"nmv" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/service/bar/atrium) "nqr" = ( /obj/item/kirbyplants{ icon_state = "plant-22" @@ -37409,12 +37391,6 @@ }, /turf/open/floor/plasteel/dark/corner, /area/engineering/atmos) -"oDA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/service/bar/atrium) "oGc" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 6 @@ -37511,13 +37487,17 @@ }, /turf/open/floor/plasteel/dark, /area/command/gateway) -"pdl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable/white{ - icon_state = "1-2" +"pdQ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, -/turf/open/floor/plasteel, -/area/service/bar/atrium) +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark/side{ + dir = 8 + }, +/area/maintenance/port/aft) "pdX" = ( /obj/machinery/portable_atmospherics/canister, /obj/item/radio/intercom{ @@ -37532,6 +37512,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, /area/science/mixing) +"phb" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/dark/side{ + dir = 5 + }, +/area/command/bridge) "pix" = ( /turf/open/floor/wood{ icon_state = "wood-broken7" @@ -37937,6 +37928,12 @@ }, /turf/open/floor/plasteel, /area/engineering/atmos) +"qKS" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/service/bar/atrium) "qMr" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -37967,6 +37964,11 @@ /obj/machinery/photocopier, /turf/open/floor/wood, /area/service/lawoffice) +"qSs" = ( +/turf/open/floor/plasteel/dark/side{ + dir = 6 + }, +/area/command/bridge) "qTa" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -38163,9 +38165,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/command/gateway) -"slD" = ( -/turf/open/floor/plasteel, -/area/commons/dorms) "snF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -38692,7 +38691,7 @@ }, /area/hallway/primary/starboard) "sHB" = ( -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/brown{ dir = 8 }, /turf/open/floor/plasteel/white/corner{ @@ -38764,7 +38763,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/brown{ dir = 8 }, /turf/open/floor/plasteel/white/corner, @@ -38783,7 +38782,7 @@ c_tag = "Departures Hallway"; dir = 1 }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/brown{ dir = 8 }, /turf/open/floor/plasteel/white/corner, @@ -38805,10 +38804,10 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/turf_decal/tile/red{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/effect/turf_decal/tile/brown{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "sIB" = ( @@ -38969,7 +38968,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/brown{ dir = 8 }, /turf/open/floor/plasteel/cafeteria, @@ -40480,15 +40479,6 @@ }, /turf/open/floor/plasteel, /area/service/lawoffice) -"tno" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, -/obj/structure/cable/white{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/service/bar/atrium) "ttp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ @@ -40554,32 +40544,17 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science/mixing) -"tQd" = ( -/turf/open/floor/plasteel, -/area/service/bar/atrium) -"tUH" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/cryopod{ - dir = 8 - }, -/turf/open/floor/plasteel/dark/side{ +"tSA" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/area/commons/dorms) -"tVg" = ( -/obj/structure/chair/stool/bar, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/plasteel/white/corner{ dir = 1 }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/service/bar/atrium) +/area/hallway/secondary/entry) "tWh" = ( /turf/closed/wall, /area/commons/lounge) @@ -41190,6 +41165,12 @@ }, /turf/open/floor/plasteel/airless/solarpanel, /area/solars/port/aft) +"vPL" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/service/bar/atrium) "vPQ" = ( /obj/structure/table/wood, /obj/machinery/computer/libraryconsole, @@ -41282,16 +41263,21 @@ }, /turf/open/floor/engine, /area/engineering/main) +"wep" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/dark/side{ + dir = 1 + }, +/area/command/bridge) "wiJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall, /area/engineering/atmos) -"wkd" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/service/bar/atrium) "wkn" = ( /obj/machinery/hydroponics/soil, /obj/item/shovel/spade, @@ -41356,6 +41342,15 @@ }, /turf/open/floor/plasteel, /area/science/mixing) +"wBp" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/service/bar/atrium) "wDb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, @@ -41435,10 +41430,6 @@ dir = 8 }, /area/engineering/atmos) -"xcH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/dark/corner, -/area/service/hydroponics) "xdr" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -41573,6 +41564,20 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engineering/break_room) +"xxx" = ( +/obj/structure/chair/stool/bar, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/service/bar/atrium) "xyo" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/effect/decal/cleanable/dirt, @@ -41620,17 +41625,6 @@ /obj/structure/sign/departments/xenobio, /turf/closed/wall, /area/science/xenobiology) -"xFA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/cable/white{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/dark/side{ - dir = 8 - }, -/area/maintenance/port/aft) "xIm" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/cyan/visible, @@ -41695,6 +41689,22 @@ }, /turf/open/floor/plasteel, /area/command/gateway) +"xZz" = ( +/obj/item/kirbyplants{ + icon_state = "plant-22" + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/service/bar/atrium) "xZO" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/public/glass{ @@ -71489,7 +71499,7 @@ anx anx anx awC -hTR +jzq fFw fEt mnD @@ -74865,7 +74875,7 @@ bvo bvo aqo aMw -xFA +pdQ aON aPT aRd @@ -76676,7 +76686,7 @@ aKm aKm aKm aZC -iQP +lSQ aRm aZo aZp @@ -78178,10 +78188,10 @@ avW awQ axD aDD -slD +gYv aAE aBN -slD +gYv aDD aEK awQ @@ -78948,7 +78958,7 @@ auT avY awQ axG -tUH +jJn bxJ aDD aBQ @@ -81532,7 +81542,7 @@ aIL aJR aLa aMp -xcH +iQs aOi aPe aQg @@ -82798,7 +82808,7 @@ apS ara asd ati -mGy +xZz asg asg asg @@ -83056,22 +83066,22 @@ arb ase hpr asg -tQd -tQd +hRi +hRi bxG -tQd -oDA +hRi +qKS apV aoP -tQd -oDA -dge -tQd +hRi +qKS +huj +hRi awT -dge -oDA +huj +qKS bxL -tQd +hRi aLf aMt arb @@ -83311,8 +83321,8 @@ aoO apU arc asf -pdl -pdl +nmv +nmv avf awk awU @@ -83320,14 +83330,14 @@ axO ayJ azJ aAO -pdl +nmv ayJ aDO aEW awU aGN aHS -pdl +nmv aJW ygE aMu @@ -83545,7 +83555,7 @@ aaa aal aat aaF -byB +wep abd abp abE @@ -83568,17 +83578,17 @@ aoP apV uxJ asg -tQd +hRi auc avg awl awV aoP -oDA +qKS azK aAP aBZ -oDA +qKS aDP aEX aFO @@ -83586,7 +83596,7 @@ aGO aHT gPY dQC -tQd +hRi axP ard aOo @@ -83802,9 +83812,9 @@ aaa aal aau aaG -ghQ +phb abc -jsF +qSs abD aci adb @@ -83825,7 +83835,7 @@ aoQ apW are ash -gnc +nfH aud avh awm @@ -83833,17 +83843,17 @@ awW axQ ayK awW -tno -gnc +wBp +nfH ayK awW -gnc +nfH aFP aGP aud -gnc +nfH ayK -gnc +nfH aAQ aNz aOp @@ -83871,7 +83881,7 @@ bfK ugK bgU bhH -lDW +tSA bgU aaa aaa @@ -84084,19 +84094,19 @@ arf asi bvV asg -oDA +qKS apV -tQd +hRi aoP -wkd -tQd -dge +vPL +hRi +huj bxL -oDA -tQd -tQd -tQd -tQd +qKS +hRi +hRi +hRi +hRi asg asg ayL @@ -84127,7 +84137,7 @@ byo bfK ugK bgV -eYN +jkQ biw bgU aaa @@ -84340,7 +84350,7 @@ ayP ara asj atj -tVg +xxx avj awo aue @@ -84859,7 +84869,7 @@ avl awq awY axS -mlb +heH aue aAR aCc @@ -90779,9 +90789,9 @@ bsS sHC sId bsM -bsS +lwu sIR -bsS +lwu bsY axW aae