From 4f23613feb74322ac1066b3d3df6533e2e7acad5 Mon Sep 17 00:00:00 2001 From: Sergei Date: Sun, 23 Aug 2020 19:29:23 -0400 Subject: [PATCH] reverts tycoon2 changes --- _maps/map_files/Tycoon/Tycoon2.dmm | 237 +++++++++++++---------------- 1 file changed, 104 insertions(+), 133 deletions(-) diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index 27aaa6b1d3f..3b1ec67a177 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -6690,8 +6690,8 @@ /area/crew_quarters/heads/chief) "aqf" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 10; - icon_state = "pipe11-2" + icon_state = "pipe11-2"; + dir = 10 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -7386,8 +7386,8 @@ /area/engine/storage) "arP" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 6; - icon_state = "pipe11-2" + icon_state = "pipe11-2"; + dir = 6 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -7649,8 +7649,8 @@ /area/engine/atmos) "asU" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ - dir = 8; - icon_state = "manifold-2" + icon_state = "manifold-2"; + dir = 8 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -8158,8 +8158,8 @@ }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/atmospherics/pipe/simple/violet/visible/layer3{ - dir = 6; - icon_state = "pipe11-3" + icon_state = "pipe11-3"; + dir = 6 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -8541,8 +8541,8 @@ /area/lawoffice) "avo" = ( /obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 8; - icon_state = "dvalve_map-2" + icon_state = "dvalve_map-2"; + dir = 8 }, /turf/closed/wall/r_wall/ship, /area/maintenance/starboard/fore) @@ -8624,7 +8624,6 @@ }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/structure/lattice/catwalk, -/obj/machinery/light, /turf/open/space/basic, /area/engine/atmos) "avL" = ( @@ -8683,8 +8682,8 @@ /area/maintenance/starboard/fore) "awe" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2o{ - dir = 1; - icon_state = "filter_on_f" + icon_state = "filter_on_f"; + dir = 1 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -8743,9 +8742,6 @@ dir = 4 }, /obj/structure/lattice/catwalk, -/obj/machinery/light{ - dir = 4 - }, /turf/open/space/basic, /area/engine/atmos) "aws" = ( @@ -8813,8 +8809,8 @@ }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/atmospherics/pipe/simple/purple/visible/layer1{ - dir = 6; - icon_state = "pipe11-1" + icon_state = "pipe11-1"; + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/violet/visible/layer3, /obj/structure/lattice/catwalk, @@ -8909,8 +8905,8 @@ /area/nsv/weapons/fore) "awX" = ( /obj/machinery/atmospherics/pipe/manifold/purple/visible{ - dir = 8; - icon_state = "manifold-2" + icon_state = "manifold-2"; + dir = 8 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -8945,16 +8941,16 @@ /area/engine/atmos) "axg" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ - dir = 4; - icon_state = "manifold-2" + icon_state = "manifold-2"; + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/purple/visible/layer1{ - dir = 4; - icon_state = "pipe11-1" + icon_state = "pipe11-1"; + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/violet/visible/layer3{ - dir = 8; - icon_state = "pipe11-3" + icon_state = "pipe11-3"; + dir = 8 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -8962,12 +8958,12 @@ "axh" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/atmospherics/pipe/simple/purple/visible/layer1{ - dir = 9; - icon_state = "pipe11-1" + icon_state = "pipe11-1"; + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/violet/visible/layer3{ - dir = 9; - icon_state = "pipe11-3" + icon_state = "pipe11-3"; + dir = 9 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -9033,8 +9029,8 @@ /area/engine/atmos) "axB" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3{ - dir = 10; - icon_state = "pipe11-3" + icon_state = "pipe11-3"; + dir = 10 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -9148,52 +9144,52 @@ /area/engine/atmos) "ayb" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 8; - icon_state = "pipe11-2" + icon_state = "pipe11-2"; + dir = 8 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/engine/atmos) "ayc" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ - dir = 1; - icon_state = "manifold-2" + icon_state = "manifold-2"; + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/purple/visible/layer1{ - dir = 4; - icon_state = "pipe11-1" + icon_state = "pipe11-1"; + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/violet/visible/layer3{ - dir = 5; - icon_state = "pipe11-3" + icon_state = "pipe11-3"; + dir = 5 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/engine/atmos) "ayd" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ - dir = 1; - icon_state = "manifold-2" + icon_state = "manifold-2"; + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/purple/visible/layer1{ - dir = 5; - icon_state = "pipe11-1" + icon_state = "pipe11-1"; + dir = 5 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/engine/atmos) "aye" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ - dir = 1; - icon_state = "manifold-2" + icon_state = "manifold-2"; + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/purple/visible/layer1{ - dir = 4; - icon_state = "pipe11-1" + icon_state = "pipe11-1"; + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/violet/visible/layer3{ - dir = 8; - icon_state = "pipe11-3" + icon_state = "pipe11-3"; + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3, /obj/structure/lattice/catwalk, @@ -9201,12 +9197,12 @@ /area/engine/atmos) "ayf" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ - dir = 1; - icon_state = "manifold-2" + icon_state = "manifold-2"; + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/violet/visible/layer3{ - dir = 8; - icon_state = "pipe11-3" + icon_state = "pipe11-3"; + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/purple/visible/layer1, /obj/structure/lattice/catwalk, @@ -9220,32 +9216,32 @@ }, /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3{ - dir = 6; - icon_state = "pipe11-3" + icon_state = "pipe11-3"; + dir = 6 }, /turf/open/space/basic, /area/engine/atmos) "aym" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 6; - icon_state = "pipe11-2" + icon_state = "pipe11-2"; + dir = 6 }, /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3{ - dir = 8; - icon_state = "pipe11-3" + icon_state = "pipe11-3"; + dir = 8 }, /turf/open/space/basic, /area/engine/atmos) "ayn" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4; - icon_state = "pipe11-2" + icon_state = "pipe11-2"; + dir = 4 }, /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3{ - dir = 8; - icon_state = "pipe11-3" + icon_state = "pipe11-3"; + dir = 8 }, /turf/open/space/basic, /area/engine/atmos) @@ -9257,8 +9253,8 @@ }, /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3{ - dir = 8; - icon_state = "pipe11-3" + icon_state = "pipe11-3"; + dir = 8 }, /turf/open/space/basic, /area/engine/atmos) @@ -9286,8 +9282,8 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3{ - dir = 8; - icon_state = "pipe11-3" + icon_state = "pipe11-3"; + dir = 8 }, /turf/open/floor/plating/airless, /area/engine/atmos) @@ -9302,8 +9298,8 @@ /area/engine/gravity_generator) "ayz" = ( /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 8; - icon_state = "manifold-2" + icon_state = "manifold-2"; + dir = 8 }, /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3, @@ -9326,12 +9322,12 @@ /area/engine/atmos) "ayC" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer1{ - dir = 4; - icon_state = "pipe11-1" + icon_state = "pipe11-1"; + dir = 4 }, /obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/inverse{ - dir = 8; - icon_state = "mixer_on_f" + icon_state = "mixer_on_f"; + dir = 8 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -9339,20 +9335,20 @@ "ayD" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer1{ - dir = 10; - icon_state = "pipe11-1" + icon_state = "pipe11-1"; + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 8; - icon_state = "pipe11-2" + icon_state = "pipe11-2"; + dir = 8 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/engine/atmos) "ayE" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 8; - icon_state = "pipe11-2" + icon_state = "pipe11-2"; + dir = 8 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -9723,8 +9719,8 @@ /area/engine/atmos) "azu" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 6; - icon_state = "pipe11-2" + icon_state = "pipe11-2"; + dir = 6 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -9747,8 +9743,8 @@ /area/maintenance/starboard/fore) "azA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 6; - icon_state = "pipe11-2" + icon_state = "pipe11-2"; + dir = 6 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -9795,8 +9791,8 @@ }) "azF" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2{ - dir = 4; - icon_state = "filter_on_f" + icon_state = "filter_on_f"; + dir = 4 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -9811,8 +9807,8 @@ /area/engine/atmos) "azI" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/o2{ - dir = 4; - icon_state = "filter_on_f" + icon_state = "filter_on_f"; + dir = 4 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -43465,13 +43461,13 @@ }) "cSo" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 10; - icon_state = "pipe11-2" + icon_state = "pipe11-2"; + dir = 10 }, /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3{ - dir = 8; - icon_state = "pipe11-3" + icon_state = "pipe11-3"; + dir = 8 }, /turf/open/space/basic, /area/engine/atmos) @@ -43798,8 +43794,8 @@ /area/hallway/secondary/exit) "eso" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2{ - dir = 1; - icon_state = "filter_on_f" + icon_state = "filter_on_f"; + dir = 1 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -43985,14 +43981,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"fev" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/structure/lattice/catwalk, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/space/basic, -/area/engine/atmos) "fex" = ( /obj/structure/punching_bag, /obj/machinery/light_switch{ @@ -44054,8 +44042,8 @@ /area/science/mixing/chamber) "fBs" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/plasma{ - dir = 1; - icon_state = "filter_on_f" + icon_state = "filter_on_f"; + dir = 1 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -44211,13 +44199,6 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/engine/atmos) -"gDn" = ( -/obj/structure/lattice, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/space/basic, -/area/engine/atmos) "gFl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 8 @@ -45348,9 +45329,7 @@ /turf/open/floor/plating, /area/crew_quarters/heads/hor) "lJM" = ( -/obj/machinery/atmospherics/components/binary/magnetic_constrictor{ - dir = 1 - }, +/obj/machinery/atmospherics/components/binary/magnetic_constrictor, /turf/open/floor/plating/airless, /area/engine/atmos) "lKI" = ( @@ -46088,14 +46067,6 @@ /obj/machinery/newscaster, /turf/closed/wall/ship, /area/quartermaster/qm) -"pzY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/obj/structure/lattice/catwalk, -/obj/machinery/light, -/turf/open/space/basic, -/area/engine/atmos) "pBK" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -46993,8 +46964,8 @@ }, /obj/machinery/portable_atmospherics/canister, /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3{ - dir = 9; - icon_state = "pipe11-3" + icon_state = "pipe11-3"; + dir = 9 }, /turf/open/floor/plating/airless, /area/engine/atmos) @@ -47159,8 +47130,8 @@ /area/science/mixing/chamber) "uVV" = ( /obj/machinery/atmospherics/pipe/simple/violet/visible{ - dir = 10; - icon_state = "pipe11-2" + icon_state = "pipe11-2"; + dir = 10 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -47332,8 +47303,8 @@ "vHF" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 5; - icon_state = "pipe11-2" + icon_state = "pipe11-2"; + dir = 5 }, /turf/open/space/basic, /area/space/nearstation) @@ -92984,7 +92955,7 @@ apz apz apz apz -gDn +apz apz apz apz @@ -93762,7 +93733,7 @@ apz apz apz apz -pzY +apG asG bCt asH @@ -94774,7 +94745,7 @@ apz apz apz apz -gDn +apz apz apz apz @@ -96572,7 +96543,7 @@ aoW apJ aqg arR -fev +aqg arR aqg arR @@ -96586,7 +96557,7 @@ aqg arR aqg eso -fev +aqg aqg aqg azL