diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index d0bc17a426..7e05043377 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -5389,7 +5389,9 @@ /turf/open/floor/plasteel, /area/security/brig) "ajX" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 5 + }, /turf/open/floor/plating, /area/engineering/atmos) "ajY" = ( @@ -5935,6 +5937,9 @@ /obj/item/chair, /obj/item/stack/ore/silver, /obj/item/stack/ore/iron, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, /turf/open/floor/plating, /area/engineering/atmos) "akN" = ( @@ -5948,6 +5953,8 @@ dir = 4 }, /obj/structure/lattice, +/obj/item/broken_bottle, +/obj/item/pickaxe, /turf/open/floor/plating/asteroid/airless, /area/asteroid/nearstation) "akP" = ( @@ -6356,6 +6363,9 @@ network = list("ss13","engine") }, /mob/living/simple_animal/parrot/Poly, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 10 + }, /turf/open/floor/plasteel/dark, /area/command/heads_quarters/ce) "alF" = ( @@ -7275,9 +7285,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/yellow, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/floor/plasteel, /area/command/heads_quarters/ce) "anw" = ( @@ -17486,7 +17494,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side, /area/engineering/main) "aGi" = ( /obj/structure/sign/warning/securearea, @@ -17518,7 +17526,7 @@ name = "Power Monitoring"; req_access_txt = "32" }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side, /area/engineering/main) "aGl" = ( /obj/machinery/door/firedoor, @@ -17562,7 +17570,7 @@ name = "Engineering Access"; req_access_txt = "10" }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side, /area/engineering/main) "aGo" = ( /obj/structure/sign/warning/fire, @@ -18063,15 +18071,6 @@ }, /turf/open/floor/plating, /area/medical/genetics) -"aHg" = ( -/obj/machinery/camera{ - c_tag = "Gravity Generator Room"; - dir = 6; - network = list("ss13","engine") - }, -/obj/effect/turf_decal/bot_white/left, -/turf/open/floor/plasteel/dark, -/area/engineering/gravity_generator) "aHh" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, @@ -18631,19 +18630,12 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit) -"aIb" = ( -/obj/structure/sign/warning/radiation{ - pixel_x = -32 - }, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, -/area/engineering/gravity_generator) "aIc" = ( /turf/open/floor/circuit/green, /area/engineering/gravity_generator) "aId" = ( -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, /area/engineering/gravity_generator) "aIe" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -19217,16 +19209,13 @@ }, /area/medical/genetics) "aJh" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/effect/turf_decal/bot_white/left, /turf/open/floor/plasteel/dark, /area/engineering/gravity_generator) "aJi" = ( /obj/machinery/gravity_generator/main/station, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, /area/engineering/gravity_generator) "aJj" = ( /obj/effect/spawner/structure/window/reinforced, @@ -19897,10 +19886,6 @@ /turf/open/floor/plating/asteroid/airless, /area/asteroid/nearstation) "aKp" = ( -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -23 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -19910,7 +19895,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/engineering/gravity_generator) "aKr" = ( /obj/machinery/power/solar{ @@ -20007,7 +19992,9 @@ name = "Engineering Access"; req_access_txt = "10" }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side{ + dir = 4 + }, /area/engineering/gravity_generator) "aKy" = ( /obj/structure/cable/white{ @@ -20110,7 +20097,9 @@ name = "Engineering Access"; req_access_txt = "10" }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side{ + dir = 8 + }, /area/engineering/main) "aKI" = ( /obj/structure/cable/white{ @@ -20604,7 +20593,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/engineering/gravity_generator) "aLF" = ( /obj/structure/table/reinforced, @@ -21194,7 +21183,7 @@ name = "Telecommunications"; req_access_txt = "61" }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side, /area/tcommsat/server) "aMM" = ( /obj/effect/spawner/structure/window/reinforced, @@ -31944,7 +31933,6 @@ /obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 4 }, @@ -32250,21 +32238,18 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "bhS" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/structure/sign/warning/vacuum/external{ + pixel_y = -32 }, -/obj/structure/disposaloutlet{ - dir = 4 +/obj/structure/closet/emcloset/anchored, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/science/xenobiology) +/turf/open/floor/plasteel, +/area/engineering/atmos) "bhX" = ( /obj/machinery/pool/filter{ pixel_y = 16 @@ -32981,7 +32966,7 @@ name = "Xenobiology Kill Room"; req_access_txt = "47" }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/telecomms, /area/science/xenobiology) "bjw" = ( /obj/machinery/atmospherics/pipe/manifold/general/hidden, @@ -34575,6 +34560,9 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, /turf/open/floor/plating{ icon_state = "platingdmg1" }, @@ -34697,8 +34685,12 @@ /turf/open/floor/plasteel, /area/service/hydroponics) "cpn" = ( -/turf/closed/wall, -/area/space/station_ruins) +/obj/machinery/camera{ + c_tag = "Gravity Generator Room"; + network = list("ss13","engine") + }, +/turf/open/floor/plasteel/dark, +/area/engineering/gravity_generator) "csX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ @@ -34747,6 +34739,40 @@ }, /turf/closed/wall/r_wall, /area/medical/virology) +"cLX" = ( +/obj/machinery/door/window/brigdoor{ + dir = 4; + name = "Creature Pen"; + req_access_txt = "47" + }, +/obj/machinery/door/poddoor/preopen{ + id = "xeno5"; + name = "Creature Cell #5" + }, +/obj/structure/cable/white{ + icon_state = "1-8" + }, +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark/side{ + dir = 4 + }, +/area/science/xenobiology) "cRz" = ( /obj/machinery/button/door{ id = "supplybridge"; @@ -35415,7 +35441,7 @@ /area/asteroid/nearstation) "fTp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall/r_wall/rust, +/turf/open/floor/plasteel/dark, /area/engineering/gravity_generator) "fWh" = ( /turf/open/floor/wood{ @@ -35525,7 +35551,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/turf/closed/wall/r_wall, +/obj/structure/sign/warning/radiation{ + pixel_x = -32 + }, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -25 + }, +/turf/open/floor/plasteel/dark, /area/engineering/gravity_generator) "guM" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, @@ -35805,8 +35838,8 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "hIF" = ( -/turf/closed/wall, -/area/space) +/turf/open/floor/plasteel, +/area/engineering/gravity_generator) "hNO" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 5 @@ -36087,10 +36120,6 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "iVy" = ( @@ -36332,10 +36361,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "jCi" = ( @@ -36682,6 +36707,13 @@ }, /turf/closed/wall/r_wall, /area/science/mixing) +"lbA" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) "lcW" = ( /turf/open/floor/wood, /area/maintenance/starboard/aft) @@ -37034,6 +37066,17 @@ "mQi" = ( /turf/closed/wall/rust, /area/maintenance/starboard/central) +"mRi" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) "mTv" = ( /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 1 @@ -37202,6 +37245,7 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/effect/turf_decal/caution, /turf/open/floor/plating, /area/engineering/atmos) "nIf" = ( @@ -37607,11 +37651,8 @@ /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) "psq" = ( -/obj/structure/sign/poster/random{ - pixel_y = 32 - }, /turf/open/floor/plasteel/dark, -/area/science/xenobiology) +/area/engineering/gravity_generator) "puc" = ( /obj/structure/bed, /turf/open/floor/wood, @@ -37802,12 +37843,12 @@ /turf/open/floor/plasteel, /area/hallway/primary/fore) "qdY" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/light{ + dir = 8 }, -/obj/structure/closet/emcloset/anchored, -/turf/open/floor/plating, -/area/engineering/atmos) +/turf/open/floor/plasteel, +/area/engineering/gravity_generator) "qeO" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -37857,13 +37898,13 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "qpG" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 5 +/obj/structure/closet/l3closet/scientist, +/obj/effect/turf_decal/stripes/line, +/obj/item/extinguisher/mini, +/turf/open/floor/plasteel/dark/side{ + dir = 1 }, -/turf/open/floor/plating{ - icon_state = "panelscorched" - }, -/area/engineering/atmos) +/area/science/xenobiology) "qsc" = ( /obj/machinery/air_sensor/atmos/air_tank, /turf/open/floor/engine/air, @@ -38038,6 +38079,12 @@ icon_state = "wood-broken5" }, /area/maintenance/starboard/aft) +"rpu" = ( +/obj/structure/sign/poster/random{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "rwH" = ( /turf/closed/wall/mineral/titanium, /area/asteroid/nearstation) @@ -38052,33 +38099,17 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "rCw" = ( -/obj/machinery/door/window/brigdoor{ - dir = 4; - name = "Creature Pen"; - req_access_txt = "47" - }, -/obj/machinery/door/poddoor/preopen{ - id = "xeno4"; - name = "Creature Cell #4" - }, -/obj/structure/cable/white{ - icon_state = "1-8" - }, -/obj/structure/cable/white{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/turf/open/floor/plasteel/dark, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/white, /area/science/xenobiology) "rEx" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -40819,13 +40850,36 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "uBJ" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/door/window/brigdoor{ + dir = 4; + name = "Creature Pen"; + req_access_txt = "47" + }, +/obj/machinery/door/poddoor/preopen{ + id = "xeno4"; + name = "Creature Cell #4" + }, +/obj/structure/cable/white{ + icon_state = "1-8" + }, +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/item/broken_bottle, -/obj/item/pickaxe, -/turf/open/floor/plating, -/area/engineering/atmos) +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark/side{ + dir = 4 + }, +/area/science/xenobiology) "uBW" = ( /obj/structure/cable{ icon_state = "0-8" @@ -41026,8 +41080,15 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "vsf" = ( -/obj/effect/decal/cleanable/blood/gibs/xeno, -/turf/open/floor/plasteel/dark, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/plasteel/white, /area/science/xenobiology) "vsL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -41276,8 +41337,8 @@ /area/command/bridge) "wiJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall, -/area/engineering/atmos) +/turf/closed/wall/r_wall, +/area/engineering/gravity_generator) "wkn" = ( /obj/machinery/hydroponics/soil, /obj/item/shovel/spade, @@ -41353,7 +41414,10 @@ /area/service/bar/atrium) "wDb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall/r_wall, +/obj/structure/sign/warning/radiation{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/dark, /area/engineering/gravity_generator) "wOe" = ( /obj/machinery/door/firedoor/heavy, @@ -41632,13 +41696,14 @@ /turf/closed/wall/r_wall, /area/engineering/atmos) "xKp" = ( -/obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/obj/structure/fans/tiny, -/turf/open/floor/plating, -/area/engineering/main) +/obj/structure/disposaloutlet{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "xMv" = ( /obj/structure/lattice, /obj/structure/fluff/broken_flooring{ @@ -41651,9 +41716,6 @@ /turf/closed/wall, /area/command/gateway) "xPz" = ( -/obj/structure/sign/warning/vacuum/external{ - pixel_y = -32 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 9 }, @@ -41750,36 +41812,17 @@ /turf/open/floor/plasteel, /area/science/mixing) "yeE" = ( -/obj/machinery/door/window/brigdoor{ - dir = 4; - name = "Creature Pen"; - req_access_txt = "47" - }, -/obj/machinery/door/poddoor/preopen{ - id = "xeno5"; - name = "Creature Cell #5" - }, -/obj/structure/cable/white{ - icon_state = "1-8" - }, -/obj/structure/cable/white{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/effect/turf_decal/tile/purple, +/obj/structure/cable/white{ + icon_state = "4-8" }, -/turf/open/floor/plasteel/dark, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, /area/science/xenobiology) "yeO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -41811,6 +41854,7 @@ /turf/open/floor/plasteel, /area/service/bar/atrium) "yhg" = ( +/obj/effect/turf_decal/sand/plating, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -66119,7 +66163,7 @@ aaa aaa aaa aaa -cpn +jFP jFP jFP jFP @@ -66376,7 +66420,7 @@ aaa aaa aaa aaa -hIF +aaa aaa jFP jFP @@ -66633,7 +66677,7 @@ aaa aaa aaa aaa -hIF +aaa aaa jFP jFP @@ -66890,7 +66934,7 @@ aaa aaa aaa aaa -hIF +aaa aaa aaa aaa @@ -68429,7 +68473,7 @@ dMl uhz gNH kas -aad +kas aad aad aad @@ -68685,13 +68729,13 @@ gSv xtL uhz nHD +bhS kas aad aad aad aad aad -aad bxd aad aac @@ -68942,13 +68986,13 @@ kiw nUk ezP xPz -kas -aad -aad -aad -aad -aad -aad +aGe +aGe +aGe +aGe +aGe +aGe +aGe bxd aad aad @@ -69202,8 +69246,8 @@ twh wiJ wDb fTp -wDb -wDb +qdY +fTp gre sIu bwY @@ -69456,10 +69500,10 @@ dgV fYx iIj ajX -qpG -sIu +aGe +cpn aHe -aIb +aId aJh aKp aLD @@ -69713,8 +69757,8 @@ orI xyo hNO bOy -uBJ aGe +hIF aId aIc aJi @@ -69970,9 +70014,9 @@ anx anx uok akM -qdY aGe -aHg +psq +aJh aId aHe pbT @@ -70226,8 +70270,8 @@ xIm rVj aAg akN -alI anu +alI aGe aGe sIu @@ -71783,7 +71827,7 @@ aPI bwV aRF aSP -xKp +aEt yhg aad bvo @@ -85686,7 +85730,7 @@ bgZ bhM ibv bgm -bgZ +bhg bhM sKZ aad @@ -86962,13 +87006,13 @@ baa aZl dfP bfP -bgo +qpG rCw -bhN +vsf ibv -bgo +lbA yeE -bhN +mRi nTi biZ bjs @@ -87219,13 +87263,13 @@ bem beO sOV bfP -bgm -bgm -bhS +bgo +uBJ +bhN ibv -bgm -bgm -bhS +bgo +cLX +bhN ibv bja bjt @@ -87476,13 +87520,13 @@ ben beP bfn bfP -vsf -bhg bgm +bgm +xKp ibv -psq -bgZ bgm +bgm +xKp xFw bjb bju @@ -87737,8 +87781,8 @@ bgm bhg bgm ibv -bgm -bhg +rpu +bgZ bgm bfP bjc