From 3c6b2db665edba6aea07cd61b4f74d749cf7bead Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 17 Jun 2017 15:36:44 -0500 Subject: [PATCH] [Omega] Cleaned up unconnected atmos pipes (#1578) --- _maps/map_files/OmegaStation/OmegaStation.dmm | 146 ++++++------------ 1 file changed, 47 insertions(+), 99 deletions(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index f732a4dc79..97ab7dce12 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -22584,14 +22584,12 @@ tag = "icon-4-8"; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - tag = "icon-manifold (EAST)"; - icon_state = "manifold"; - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, /turf/open/floor/plasteel, /area/engine/gravity_generator) "aKy" = ( @@ -22682,11 +22680,6 @@ tag = "icon-1-4"; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - tag = "icon-intact (SOUTHEAST)"; - icon_state = "intact"; - dir = 6 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -22710,9 +22703,6 @@ tag = "icon-4-8"; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -22723,9 +22713,6 @@ tag = "icon-4-8"; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/open/floor/plasteel/yellow/side{ dir = 8 }, @@ -22739,9 +22726,6 @@ tag = "icon-4-8"; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/open/floor/plasteel/neutral, /area/engine/engineering) "aKK" = ( @@ -22750,9 +22734,11 @@ tag = "icon-4-8"; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/item/clothing/gloves/color/yellow, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, /turf/open/floor/plasteel/yellow, /area/engine/engineering) "aKL" = ( @@ -23066,14 +23052,10 @@ /turf/closed/wall, /area/crew_quarters/kitchen) "aLm" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - tag = "icon-manifold (WEST)"; - icon_state = "manifold"; - dir = 8 - }, /obj/structure/extinguisher_cabinet{ pixel_x = -24 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, @@ -23290,10 +23272,11 @@ /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/structure/cable/white, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + tag = "icon-manifold (NORTH)"; + icon_state = "manifold"; + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/engine/gravity_generator) "aLM" = ( @@ -23302,14 +23285,13 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - tag = "icon-manifold (EAST)"; - icon_state = "manifold"; - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9; + pixel_y = 0 + }, /turf/open/floor/plasteel, /area/engine/engineering) "aLN" = ( @@ -23393,7 +23375,6 @@ tag = "icon-1-2"; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -23831,7 +23812,7 @@ /turf/open/floor/plating, /area/tcommsat/server) "aMN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, /area/tcommsat/server) "aMO" = ( @@ -23843,7 +23824,6 @@ pixel_x = -32 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/camera{ c_tag = "Engineering Port"; dir = 4; @@ -24586,7 +24566,6 @@ pixel_x = -23; pixel_y = 0 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -24664,7 +24643,6 @@ }, /obj/structure/cable/white, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -24891,7 +24869,6 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -24974,7 +24951,6 @@ dir = 4; pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -25780,7 +25756,6 @@ pixel_x = -26 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -25825,19 +25800,17 @@ /obj/machinery/newscaster{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - tag = "icon-manifold (EAST)"; - icon_state = "manifold"; +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel, /area/engine/engineering) "aPO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 }, /turf/closed/wall/r_wall, /area/maintenance/port) @@ -26462,7 +26435,6 @@ /area/engine/engineering) "aQT" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -26814,12 +26786,12 @@ pixel_y = 0 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/engineering) "aRG" = ( @@ -26946,7 +26918,6 @@ pixel_x = 24 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/closet/secure_closet/engineering_personal, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -27435,9 +27406,6 @@ /area/tcommsat/server) "aSP" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/closet/wardrobe/engineering_yellow, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -27447,9 +27415,6 @@ "aSQ" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/open/floor/plasteel/caution, /area/engine/engineering) "aSR" = ( @@ -27458,9 +27423,6 @@ /obj/structure/sign/nosmoking_2{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/engineering) @@ -27468,9 +27430,6 @@ /obj/item/clothing/gloves/color/black, /obj/item/clothing/glasses/meson/engine, /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/engineering) @@ -27478,16 +27437,10 @@ /obj/structure/table/reinforced, /obj/item/weapon/storage/toolbox/mechanical, /obj/item/device/flashlight, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/engineering) "aSU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -27507,9 +27460,6 @@ pixel_y = -32 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -27521,9 +27471,6 @@ on = 1; target_temperature = 80 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -27536,9 +27483,6 @@ on = 1; target_temperature = 80 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -27555,9 +27499,6 @@ }, /obj/item/device/geiger_counter, /obj/item/device/geiger_counter, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/engineering) @@ -27566,19 +27507,11 @@ /obj/item/clothing/suit/radiation, /obj/item/clothing/head/radiation, /obj/item/clothing/glasses/meson, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/engineering) "aTa" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - tag = "icon-intact (NORTHWEST)"; - icon_state = "intact"; - dir = 9 - }, /obj/structure/closet/secure_closet/engineering_personal, /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -37645,7 +37578,6 @@ tag = "icon-1-2"; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/camera{ c_tag = "Engineering Starboard"; dir = 8; @@ -41248,6 +41180,22 @@ "bwU" = ( /turf/closed/wall/mineral/titanium, /area/shuttle/transport) +"bwV" = ( +/obj/structure/cable/white{ + tag = "icon-1-2"; + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engine/engineering) +"bwW" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/turf/closed/wall/r_wall, +/area/tcommsat/server) (1,1,1) = {" aaa @@ -70928,11 +70876,11 @@ aMN aMN aMN aMN -aMN -aMN -aMN -aMN -aSO +bwW +aMJ +aMJ +aMJ +aMJ aMJ aMJ aMJ @@ -71184,7 +71132,7 @@ aMO aNY aOz aPI -aJp +bwV aRF aSP aEt @@ -86855,7 +86803,7 @@ bsz aDZ aIY aDZ -aGY +aDZ arj arj anl @@ -87112,7 +87060,7 @@ bsA aHY aIZ blm -aLn +ahZ aMy aHY aDc