From 936bf30821d9be9d9be7f019a00fcac3e97ea058 Mon Sep 17 00:00:00 2001 From: Olive <49600480+zeskorion@users.noreply.github.com> Date: Wed, 26 Aug 2026 23:38:27 -0700 Subject: [PATCH] Cetus fixes 08/2026 (#12975) --- modular_chomp/maps/cetus/cetus-1.dmm | 429 +++++++++++++++++++++------ modular_chomp/maps/cetus/cetus-2.dmm | 239 ++++++++++++--- modular_chomp/maps/cetus/cetus-3.dmm | 145 ++++++--- 3 files changed, 641 insertions(+), 172 deletions(-) diff --git a/modular_chomp/maps/cetus/cetus-1.dmm b/modular_chomp/maps/cetus/cetus-1.dmm index 767d735f91..bc249703e6 100644 --- a/modular_chomp/maps/cetus/cetus-1.dmm +++ b/modular_chomp/maps/cetus/cetus-1.dmm @@ -32,6 +32,9 @@ /obj/structure/toilet{ dir = 1 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm7) "aah" = ( @@ -1390,6 +1393,20 @@ }, /turf/simulated/floor/lino, /area/crew_quarters/cetus/meteor/bar) +"acB" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/cetus/meteor/barrestrooms) "acC" = ( /obj/structure/sink{ dir = 4; @@ -1403,8 +1420,21 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm10) +"acD" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/cetus/meteor/barrestrooms) "acE" = ( /obj/structure/table/rack/shelf, /obj/random/soap{ @@ -1422,8 +1452,68 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm5) +"acF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/cetus/meteor/barrestrooms) +"acG" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/cetus/meteor/barrestrooms) +"acH" = ( +/obj/structure/table/standard, +/obj/structure/sink/countertop{ + pixel_y = 14 + }, +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/cetus/meteor/barrestrooms) +"acI" = ( +/obj/effect/landmark{ + name = "blobstart" + }, +/turf/simulated/floor/outdoors/rocks/cetus, +/area/maintenance/cetus/meteor/star) +"acJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/kafel_full, +/area/crew_quarters/cetus/meteor/restrooms) +"acK" = ( +/obj/effect/landmark{ + name = "blobstart" + }, +/turf/simulated/floor/outdoors/rocks/cetus, +/area/maintenance/cetus/meteor/jrfore) "acT" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 @@ -1700,8 +1790,6 @@ /obj/structure/closet{ name = "Prisoner's Locker" }, -/obj/random/tech_supply, -/obj/random/tech_supply, /obj/item/clothing/head/soft/orange, /turf/simulated/floor/tiled, /area/security/cetus/meteor/brig) @@ -3410,6 +3498,7 @@ /obj/machinery/door/airlock{ name = "Unit 2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/cetus/meteor/barrestrooms) "bfI" = ( @@ -5008,6 +5097,10 @@ brightness_range = 5; dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm6) "bXO" = ( @@ -5407,19 +5500,20 @@ /turf/simulated/floor/plating, /area/engineering/cetus/meteor/enginewaste) "ckd" = ( -/obj/machinery/disposal/wall/cleaner{ - name = "Resleeving lost & found bin"; - pixel_y = 35 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/disposal/wall/cleaner{ + name = "Resleeving lost & found bin"; + pixel_y = 35 + }, +/obj/structure/disposalpipe/trunk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm3) "ckl" = ( @@ -5573,7 +5667,11 @@ dir = 10 }, /obj/structure/disposalpipe/trunk{ - dir = 8 + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm6) @@ -5983,6 +6081,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 8 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm6) "cwI" = ( @@ -7514,6 +7615,9 @@ /obj/structure/toilet{ dir = 1 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm6) "dsV" = ( @@ -7555,6 +7659,9 @@ brightness_range = 5; dir = 8 }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm8) "dug" = ( @@ -7845,6 +7952,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm8) "dBB" = ( @@ -8979,6 +9090,9 @@ /obj/structure/toilet{ dir = 1 }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm8) "enx" = ( @@ -9463,6 +9577,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm4) "ezp" = ( @@ -10650,6 +10768,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 8 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm1) "fdT" = ( @@ -11211,6 +11332,9 @@ }, /obj/item/bikehorn/rubberducky/pink, /obj/machinery/light/small, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/cetus/meteor/barrestrooms) "fua" = ( @@ -12370,19 +12494,20 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/cetus/meteor/gravgen) "gee" = ( -/obj/machinery/disposal/wall/cleaner{ - name = "Resleeving lost & found bin"; - pixel_y = 35 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/disposal/wall/cleaner{ + name = "Resleeving lost & found bin"; + pixel_y = 35 + }, +/obj/structure/disposalpipe/trunk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm1) "gej" = ( @@ -13255,6 +13380,9 @@ /obj/structure/toilet{ dir = 1 }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm9) "gEz" = ( @@ -13454,18 +13582,19 @@ /turf/simulated/floor/plating, /area/maintenance/cetus/meteor/foremed) "gLL" = ( -/obj/machinery/disposal/wall/cleaner{ - name = "Resleeving lost & found bin"; - pixel_y = 35 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/machinery/disposal/wall/cleaner{ + name = "Resleeving lost & found bin"; + pixel_y = 35 + }, +/obj/structure/disposalpipe/trunk, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm10) @@ -13577,6 +13706,10 @@ brightness_range = 5; dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm7) "gQm" = ( @@ -13615,6 +13748,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm7) "gQO" = ( @@ -14535,6 +14672,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm5) "hom" = ( @@ -16548,9 +16689,8 @@ /turf/simulated/floor/tiled/techmaint, /area/rnd/cetus/meteor/toxins) "ihh" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/junction/yjunction{ + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cetus/meteor/barrestrooms) @@ -17143,6 +17283,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm2) "iys" = ( @@ -17828,6 +17972,7 @@ /obj/machinery/door/airlock{ name = "Unit 2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/cetus/meteor/restrooms) "iRx" = ( @@ -18545,6 +18690,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm6) "jlk" = ( @@ -19543,6 +19692,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm9) "jIK" = ( @@ -20339,6 +20492,10 @@ pixel_y = -25; dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/cetus/meteor/restrooms) "kah" = ( @@ -21601,6 +21758,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm8) "kFL" = ( @@ -22142,6 +22303,9 @@ dir = 1 }, /obj/machinery/light/small, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/cetus/meteor/barrestrooms) "kWu" = ( @@ -24831,6 +24995,9 @@ /obj/structure/toilet{ dir = 1 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm10) "mtM" = ( @@ -24906,9 +25073,6 @@ /turf/simulated/floor/carpet/green, /area/crew_quarters/cetus/meteor/stairwellf1) "mwo" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -24918,6 +25082,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/cetus/meteor/restrooms) "mwq" = ( @@ -25789,6 +25957,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm2) "mVe" = ( @@ -27006,6 +27178,10 @@ /obj/structure/window/basic{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm6) "nFR" = ( @@ -27458,6 +27634,10 @@ /obj/structure/window/basic{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm7) "nQy" = ( @@ -27467,6 +27647,9 @@ /obj/structure/toilet{ dir = 1 }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm4) "nQH" = ( @@ -27508,6 +27691,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm10) "nRC" = ( @@ -28202,18 +28389,22 @@ /turf/simulated/floor/wood, /area/maintenance/cetus/meteor/starsec) "oiH" = ( -/obj/machinery/disposal/wall/cleaner{ - name = "Resleeving lost & found bin"; - pixel_y = 35 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/machinery/disposal/wall/cleaner{ + name = "Resleeving lost & found bin"; + pixel_y = 35 + }, /obj/structure/disposalpipe/trunk{ - dir = 8 + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm9) @@ -28637,6 +28828,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm4) "otz" = ( @@ -28748,6 +28943,9 @@ /obj/structure/toilet{ dir = 1 }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm2) "ovd" = ( @@ -28936,6 +29134,9 @@ brightness_range = 5; dir = 8 }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm9) "oBH" = ( @@ -29441,6 +29642,9 @@ /obj/machinery/light/small/fluorescent{ dir = 4 }, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 8 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm5) "oNM" = ( @@ -29595,10 +29799,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/security/cetus/meteor/armory) "oSd" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 - }, /obj/structure/cable/green{ icon_state = "6-9" }, @@ -29829,6 +30029,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm3) "oZK" = ( @@ -30310,6 +30514,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 8 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm3) "pns" = ( @@ -30879,6 +31086,7 @@ /obj/machinery/door/airlock{ name = "Unit 3" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/cetus/meteor/barrestrooms) "pJh" = ( @@ -31378,6 +31586,7 @@ /obj/machinery/door/airlock{ name = "Unit 1" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/cetus/meteor/restrooms) "pSj" = ( @@ -32109,6 +32318,9 @@ /obj/structure/toilet{ dir = 1 }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm5) "qgO" = ( @@ -32531,7 +32743,11 @@ dir = 10 }, /obj/structure/disposalpipe/trunk{ - dir = 8 + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm8) @@ -33876,19 +34092,21 @@ name = "Resleeving lost & found bin"; pixel_y = 35 }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/trunk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm4) "qXD" = ( /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/disposalpipe/junction/yjunction, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/cetus/meteor/restrooms) "qXM" = ( @@ -33920,19 +34138,20 @@ /turf/simulated/floor/tiled/old_tile/white, /area/maintenance/cetus/stylist) "qYM" = ( -/obj/machinery/disposal/wall/cleaner{ - name = "Resleeving lost & found bin"; - pixel_y = 35 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/disposal/wall/cleaner{ + name = "Resleeving lost & found bin"; + pixel_y = 35 + }, +/obj/structure/disposalpipe/trunk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm2) "qZe" = ( @@ -33999,17 +34218,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/cetus/meteor/hallway2) -"raR" = ( -/obj/structure/table/steel, -/obj/item/radio/intercom{ - desc = "Talk... listen through this."; - name = "Station Intercom (Brig Radio)"; - wires = 7; - dir = 4; - pixel_y = 2 - }, -/turf/simulated/floor/tiled, -/area/security/cetus/meteor/brig) "rba" = ( /obj/machinery/firealarm{ dir = 1; @@ -34102,6 +34310,10 @@ dir = 1; pixel_y = -24 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/cetus/meteor/restrooms) "reH" = ( @@ -34502,6 +34714,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/cetus/meteor/restrooms) "rpn" = ( @@ -34655,6 +34868,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm3) "rrV" = ( @@ -34775,6 +34992,10 @@ /obj/structure/window/basic{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm10) "rvJ" = ( @@ -36028,6 +36249,9 @@ /obj/structure/toilet{ dir = 1 }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm3) "shc" = ( @@ -37857,6 +38081,7 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/cetus/meteor/restrooms) "tdH" = ( @@ -38067,8 +38292,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/structure/disposalpipe/trunk, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm7) @@ -38711,6 +38937,9 @@ /obj/structure/toilet{ dir = 1 }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm1) "tzk" = ( @@ -39130,19 +39359,20 @@ /turf/simulated/floor/plating, /area/maintenance/cetus/meteor/foremed) "tKL" = ( -/obj/machinery/disposal/wall/cleaner{ - name = "Resleeving lost & found bin"; - pixel_y = 35 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/disposal/wall/cleaner{ + name = "Resleeving lost & found bin"; + pixel_y = 35 + }, +/obj/structure/disposalpipe/trunk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm5) "tKM" = ( @@ -43942,6 +44172,10 @@ brightness_range = 5; dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm10) "waq" = ( @@ -44695,6 +44929,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 8 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm4) "wsR" = ( @@ -46205,6 +46442,10 @@ dir = 4; icon_state = "pipe-c" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/cetus/meteor/restrooms) "xaT" = ( @@ -46591,17 +46832,12 @@ /turf/simulated/floor/tiled/old_cargo, /area/crew_quarters/sleep/cetus/meteor/dorm10) "xlu" = ( -/obj/structure/table/standard, /obj/structure/sink/countertop{ pixel_y = 14 }, /obj/structure/mirror{ pixel_y = 32 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -46611,6 +46847,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/obj/structure/table/standard, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cetus/meteor/barrestrooms) "xlw" = ( @@ -48038,6 +48278,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm7) "xUy" = ( @@ -48170,6 +48414,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm1) "xXV" = ( @@ -48240,6 +48488,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm9) "yad" = ( @@ -48303,6 +48555,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 8 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm2) "yco" = ( @@ -48352,6 +48607,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/meteor/dorm1) "ydq" = ( @@ -63193,7 +63452,7 @@ pCK awK cHD pCK -awK +acK awK pCK qHL @@ -83652,7 +83911,7 @@ vcI hNy tdg pSa -clN +acJ mwo rex yhT @@ -86465,7 +86724,7 @@ orD mJU oOO xUy -raR +aaX iTy tEP iTy @@ -86533,8 +86792,8 @@ xHD oaZ dfp cpl -gZo -cGi +acF +peu bBI rAJ wdA @@ -86790,9 +87049,9 @@ aML aML aML dfp -cpl -gZo -cGi +acH +acG +acB bfo kWp bBI @@ -87050,7 +87309,7 @@ qpA dfp xlu ihh -cGi +acD bBI rAJ wdA @@ -87308,7 +87567,7 @@ aba dfp wDc kml -peu +acB pIW ftI bBI @@ -105075,7 +105334,7 @@ dba dba fXm fXm -fXm +acI fXm aaB abG diff --git a/modular_chomp/maps/cetus/cetus-2.dmm b/modular_chomp/maps/cetus/cetus-2.dmm index 7ee3e45d69..fcdab7515e 100644 --- a/modular_chomp/maps/cetus/cetus-2.dmm +++ b/modular_chomp/maps/cetus/cetus-2.dmm @@ -2097,6 +2097,38 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/crew_quarters/heads/sc/chief) +"adM" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/kafel_full, +/area/crew_quarters/cetus/dockrestrooms) +"adN" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/kafel_full, +/area/medical/medical_restroom) +"adO" = ( +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/Reception) +"adP" = ( +/obj/effect/wingrille_spawn/reinforced/polarized, +/obj/machinery/door/firedoor/glass, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/quartermaster/QM_Office) +"adQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/QM_Office) "adR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -2127,6 +2159,19 @@ }, /turf/simulated/floor/plating, /area/engineering/cetus/foresubstation) +"adS" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/rnd/research_restroom_sc) +"adT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/kafel_full, +/area/security/security_restroom) "adY" = ( /obj/structure/undies_wardrobe{ anchored = 1 @@ -3458,6 +3503,7 @@ "aBW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/sleep/cetus/quartermaster) "aCk" = ( @@ -5695,6 +5741,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/cetus/quartermaster) "bnH" = ( @@ -8021,6 +8071,7 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/white, /area/rnd/research_restroom_sc) "ceK" = ( @@ -8485,8 +8536,9 @@ dir = 4; pixel_x = -37 }, -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/cetus/jrrestrooms) @@ -9957,6 +10009,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/sleep/cetus/quartermaster) "cLA" = ( @@ -11961,6 +12014,9 @@ /obj/structure/bed/chair{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/quartermaster/Reception) "dqS" = ( @@ -13452,6 +13508,7 @@ /obj/machinery/status_display{ pixel_x = 32 }, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/cetus/dockrestrooms) "dWD" = ( @@ -15255,6 +15312,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/crew_quarters/sleep/cetus/quartermaster) "eCM" = ( @@ -15442,6 +15502,7 @@ /obj/machinery/door/airlock{ name = "Unit 1" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/kafel_full, /area/medical/medical_restroom) "eHA" = ( @@ -17479,6 +17540,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full/white/turfpack/station, /area/crew_quarters/sleep/cetus/quartermaster) "fss" = ( @@ -18920,14 +18984,13 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "fPf" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/alarm{ dir = 4; pixel_x = -23 }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full, /area/security/security_restroom) "fPm" = ( @@ -19606,6 +19669,7 @@ dir = 4; pixel_x = 26 }, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/quartermaster) "fZU" = ( @@ -22744,6 +22808,10 @@ /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/cetus/quartermaster) "hdW" = ( @@ -23490,6 +23558,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full, /area/medical/medical_restroom) "hqa" = ( @@ -25319,6 +25390,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/quartermaster/QM_Office) "hVZ" = ( @@ -29687,6 +29761,9 @@ /obj/machinery/door/airlock{ name = "Unit 1" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full, /area/security/security_restroom) "jyJ" = ( @@ -30152,6 +30229,10 @@ /obj/machinery/door/airlock{ name = "Unit 1" }, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/cetus/jrrestrooms) "jIx" = ( @@ -30452,6 +30533,7 @@ /obj/machinery/door/airlock{ name = "Unit 1" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/cetus/dockrestrooms) "jND" = ( @@ -31510,6 +31592,10 @@ /area/crew_quarters/cetus/atrium/primary) "khL" = ( /obj/machinery/washing_machine, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/security/security_restroom) "kii" = ( @@ -32983,14 +33069,14 @@ /turf/simulated/floor/grass, /area/rnd/Xenobotany_Lab) "kKk" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/cetus/dockrestrooms) "kLx" = ( @@ -35056,6 +35142,9 @@ /obj/effect/landmark/start{ name = "Medical Doctor" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full, /area/medical/medical_restroom) "lwI" = ( @@ -35645,6 +35734,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/cetus/jrrestrooms) "lIo" = ( @@ -38247,6 +38337,9 @@ /obj/effect/landmark/start{ name = "Quartermaster" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/quartermaster/QM_Office) "mxm" = ( @@ -38534,13 +38627,17 @@ /obj/structure/mirror{ pixel_x = -24 }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -22 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/machinery/disposal/wall/cleaner{ + dir = 1; + name = "Resleeving lost & found bin"; + pixel_y = -35 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/quartermaster) "mBA" = ( @@ -40132,6 +40229,9 @@ /obj/effect/landmark/start{ name = "Security Officer" }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/tiled/kafel_full, /area/security/security_restroom) "nhX" = ( @@ -40777,6 +40877,7 @@ /obj/machinery/door/airlock{ name = "Unit 1" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/rnd/research_restroom_sc) "nuw" = ( @@ -43102,6 +43203,9 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full, /area/engineering/engi_restroom) "olJ" = ( @@ -44247,16 +44351,15 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full, /area/medical/medical_restroom) "oEZ" = ( @@ -45574,7 +45677,7 @@ /obj/structure/mirror{ pixel_y = 32 }, -/obj/structure/disposalpipe/segment{ +/obj/structure/disposalpipe/junction{ dir = 4 }, /turf/simulated/floor/tiled/kafel_full, @@ -46655,6 +46758,10 @@ /obj/machinery/alarm{ pixel_y = 23 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/medical/medical_restroom) "prw" = ( @@ -47015,6 +47122,7 @@ /area/crew_quarters/cetus/Libraryf1) "pyd" = ( /obj/effect/decal/cleanable/vomit/old, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/kafel_full, /area/medical/medical_restroom) "pyl" = ( @@ -48160,6 +48268,7 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/vending/nifsoft_shop, /turf/simulated/floor/tiled/techmaint, /area/crew_quarters/cetus/atrium/secondaryf2) "pOw" = ( @@ -48434,6 +48543,9 @@ /obj/machinery/door/airlock{ name = "Unit 1" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full, /area/engineering/engi_restroom) "pRH" = ( @@ -48966,13 +49078,12 @@ /turf/simulated/open, /area/security/Brig) "qaT" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/rnd/research_restroom_sc) "qbj" = ( @@ -49429,6 +49540,9 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full, /area/engineering/engi_restroom) "qhV" = ( @@ -49666,17 +49780,20 @@ /turf/simulated/floor/wood, /area/crew_quarters/cetus/Libraryf1) "qlj" = ( -/obj/machinery/disposal/wall/cleaner{ - dir = 1; - name = "Resleeving lost & found bin"; - pixel_y = -35 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -22 + }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/sleep/cetus/quartermaster) "qlD" = ( @@ -50057,6 +50174,9 @@ dir = 1 }, /obj/machinery/light/small, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full, /area/medical/medical_restroom) "qtH" = ( @@ -50881,7 +51001,6 @@ /turf/simulated/floor/tiled/dark, /area/security/Brig) "qGA" = ( -/obj/effect/wingrille_spawn/reinforced, /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 8 @@ -53309,6 +53428,9 @@ }, /obj/item/bikehorn/rubberducky/pink, /obj/machinery/light/small, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full, /area/medical/medical_restroom) "rze" = ( @@ -53345,7 +53467,6 @@ /turf/simulated/floor/tiled, /area/engineering/Engineering_Workshop) "rAD" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/power/apc{ dir = 4; name = "east bump"; @@ -53362,6 +53483,7 @@ dir = 4; pixel_y = -12 }, +/obj/structure/disposalpipe/junction, /turf/simulated/floor/tiled/kafel_full, /area/engineering/engi_restroom) "rAG" = ( @@ -55982,6 +56104,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/cetus/quartermaster) "ssb" = ( @@ -56022,6 +56147,7 @@ /obj/structure/undies_wardrobe{ anchored = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/kafel_full, /area/security/security_restroom) "ssR" = ( @@ -57599,6 +57725,13 @@ name = "Resleevers" }, /obj/machinery/light/fluorescent, +/obj/machinery/disposal/wall{ + dir = 1; + pixel_y = -35 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/cetus/jrrestrooms) "sWH" = ( @@ -58042,6 +58175,9 @@ }, /obj/item/bikehorn/rubberducky/white, /obj/machinery/light/small/fluorescent, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/cetus/jrrestrooms) "tdq" = ( @@ -65941,6 +66077,10 @@ dir = 8; name = "security camera" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/quartermaster/QM_Office) "vOk" = ( @@ -67127,15 +67267,6 @@ pixel_x = 3; pixel_y = 6 }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/bordercorner{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 - }, /obj/structure/extinguisher_cabinet{ dir = 4; pixel_x = -28 @@ -67711,6 +67842,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full, /area/medical/medical_restroom) "wuT" = ( @@ -71763,6 +71897,10 @@ /turf/simulated/floor/tiled/white, /area/rnd/Research_Lab) "xPI" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/rnd/research_restroom_sc) "xPS" = ( @@ -72492,6 +72630,7 @@ /obj/machinery/door/airlock{ name = "Unit 2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/kafel_full, /area/medical/medical_restroom) "yej" = ( @@ -72800,6 +72939,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/quartermaster/QM_Office) "yls" = ( @@ -96505,7 +96648,7 @@ xxw hJz jFA prh -hdu +adN pyd eHq qtz @@ -97021,8 +97164,8 @@ xxw qRh jFA hpU -hdu -hdu +adN +adN yei rzb jFA @@ -101098,7 +101241,7 @@ yeT cPF ces nuu -ibw +adS xPI cPF gJH @@ -112522,7 +112665,7 @@ doT nRq dVX jNs -iAQ +adM iAQ dju nRq @@ -113205,7 +113348,7 @@ lNk hxB cKg cUO -cUO +adT cUO cUO dac @@ -127448,7 +127591,7 @@ oan pBn szL bzC -gnr +adO mgy aqZ qbt @@ -127964,7 +128107,7 @@ sNs xaa apT apT -rvl +adP rvl apT uht @@ -128222,7 +128365,7 @@ utd apT apT ccw -xuk +adQ xuk xVY vud diff --git a/modular_chomp/maps/cetus/cetus-3.dmm b/modular_chomp/maps/cetus/cetus-3.dmm index a707cbe429..18dfe991b9 100644 --- a/modular_chomp/maps/cetus/cetus-3.dmm +++ b/modular_chomp/maps/cetus/cetus-3.dmm @@ -623,6 +623,18 @@ }, /turf/simulated/wall, /area/maintenance/cetus/shallow/derelict/kitchen) +"abu" = ( +/obj/effect/landmark{ + name = "blobstart" + }, +/turf/simulated/floor/plating, +/area/maintenance/cetus/threeap) +"abv" = ( +/obj/effect/landmark{ + name = "blobstart" + }, +/turf/simulated/floor/outdoors/rocks/cetus, +/area/maintenance/cetus/shallow/fp) "acq" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1679,10 +1691,10 @@ /turf/simulated/floor/carpet/graycarpet, /area/hallway/primary/firstdeck/vaultlobby) "aIu" = ( -/obj/structure/toilet{ +/obj/machinery/light/small/fluorescent, +/obj/structure/toilet/teleplumbed{ dir = 1 }, -/obj/machinery/light/small/fluorescent, /turf/simulated/floor/tiled, /area/maintenance/cetus/shallow/flooded) "aJv" = ( @@ -2675,19 +2687,20 @@ /turf/simulated/floor/carpet/graycarpet, /area/bridge/Deck3_Corridor) "bra" = ( -/obj/machinery/disposal/wall/cleaner{ - name = "Resleeving lost & found bin"; - pixel_y = 35 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/disposal/wall/cleaner{ + name = "Resleeving lost & found bin"; + pixel_y = 35 + }, +/obj/structure/disposalpipe/trunk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full, /area/bridge/sleep/CMO_Quarters) "brf" = ( @@ -3589,6 +3602,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full, /area/bridge/sleep/HoP_Quarters) "bXU" = ( @@ -5043,6 +5059,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/bridge/sleep/CMO_Quarters) "cTI" = ( @@ -7779,10 +7799,6 @@ /turf/simulated/floor/plating, /area/engineering/cetus/jointsubstation) "eyc" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -7790,6 +7806,9 @@ icon_state = "4-8" }, /obj/machinery/light, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/heads/sc/restroom) "eyz" = ( @@ -8314,6 +8333,7 @@ brightness_range = 5; dir = 8 }, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/kafel_full, /area/bridge/sleep/HoP_Quarters) "eLl" = ( @@ -9286,6 +9306,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 8 + }, /turf/simulated/floor/tiled/kafel_full, /area/bridge/sleep/CMO_Quarters) "fpH" = ( @@ -11212,6 +11235,10 @@ /obj/structure/window/basic{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/bridge/sleep/CE_Quarters) "gzc" = ( @@ -11308,6 +11335,9 @@ /obj/machinery/alarm{ pixel_y = 22 }, +/obj/effect/landmark{ + name = "blobstart" + }, /turf/simulated/floor/wood, /area/maintenance/cetus/threeas) "gCJ" = ( @@ -11572,11 +11602,8 @@ /turf/simulated/floor/plating, /area/maintenance/cetus/d3docks) "gJq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/disposalpipe/junction/yjunction, /turf/simulated/floor/tiled/kafel_full, /area/bridge/sleep/Secretary_Quarters) "gJw" = ( @@ -12099,6 +12126,10 @@ pixel_x = 2; pixel_y = 18 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/bridge/sleep/CMO_Quarters) "gZi" = ( @@ -13345,15 +13376,15 @@ /turf/simulated/open, /area/maintenance/cetus/auxsupport) "hNI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full, /area/bridge/sleep/HoP_Quarters) "hOe" = ( @@ -13559,6 +13590,9 @@ /obj/structure/toilet{ dir = 1 }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full, /area/bridge/sleep/HoS_Quarters) "hSt" = ( @@ -15285,6 +15319,10 @@ pixel_x = -2; pixel_y = 16 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/bridge/sleep/CE_Quarters) "iUO" = ( @@ -16884,6 +16922,10 @@ /obj/structure/window/basic{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/bridge/sleep/HoP_Quarters) "jSP" = ( @@ -17229,13 +17271,13 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/structure/toilet/item, /obj/item/grenade/anti_photon/rubberducky/black, /obj/effect/step_trigger/teleporter/randomspawn{ teleport_z = 8; teleport_x = 183; teleport_y = 173 }, +/obj/structure/toilet/teleplumbed, /turf/simulated/floor/tiled/kafel_full, /area/maintenance/cetus/shallow/derelict/bathroom) "keW" = ( @@ -22825,6 +22867,9 @@ /obj/structure/toilet{ dir = 1 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full, /area/bridge/sleep/CE_Quarters) "nbB" = ( @@ -24694,6 +24739,10 @@ brightness_range = 5; dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/bridge/sleep/CE_Quarters) "oeu" = ( @@ -25026,6 +25075,9 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/tiled/kafel_full, /area/bridge/sleep/Secretary_Quarters) "oqv" = ( @@ -28459,6 +28511,9 @@ /obj/structure/toilet{ dir = 1 }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full, /area/bridge/sleep/CMO_Quarters) "qsC" = ( @@ -29109,6 +29164,7 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/heads/sc/restroom) "qOj" = ( @@ -29151,9 +29207,6 @@ pixel_x = -1; pixel_y = 17 }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /turf/simulated/floor/tiled/kafel_full, /area/bridge/sleep/Secretary_Quarters) "qOT" = ( @@ -31260,6 +31313,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled/kafel_full, /area/bridge/sleep/CE_Quarters) "rZz" = ( @@ -31565,10 +31622,10 @@ /turf/simulated/floor/plating, /area/maintenance/cetus/threeas) "siR" = ( -/obj/structure/toilet, /obj/machinery/light/small{ dir = 1 }, +/obj/structure/toilet/teleplumbed, /turf/simulated/floor/tiled/kafel_full, /area/maintenance/cetus/shallow/derelict/bathroom) "sjj" = ( @@ -33844,18 +33901,19 @@ }, /area/maintenance/cetus/shallow/flooded) "tBD" = ( -/obj/machinery/disposal/wall/cleaner{ - name = "Resleeving lost & found bin"; - pixel_y = 35 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/machinery/disposal/wall/cleaner{ + name = "Resleeving lost & found bin"; + pixel_y = 35 + }, +/obj/structure/disposalpipe/trunk, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/tiled/kafel_full, /area/bridge/sleep/CE_Quarters) @@ -33955,6 +34013,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/heads/sc/restroom) "tEW" = ( @@ -34502,16 +34561,15 @@ /turf/simulated/floor/carpet/graycarpet, /area/bridge/Deck3_Corridor) "tXN" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 8 + }, /turf/simulated/floor/tiled/kafel_full, /area/bridge/sleep/HoS_Quarters) "tXP" = ( @@ -35212,6 +35270,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/bridge/sleep/HoP_Quarters) "usm" = ( @@ -35336,6 +35398,7 @@ /obj/machinery/door/airlock{ name = "Unit 1" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/sc/restroom) "uve" = ( @@ -37862,7 +37925,7 @@ /turf/simulated/floor/tiled/old_tile, /area/maintenance/cetus/shallow/derelict/dock) "vUr" = ( -/obj/structure/toilet, +/obj/structure/toilet/teleplumbed, /turf/simulated/floor/tiled/kafel_full, /area/bridge/sleep/RD_Quarters) "vUt" = ( @@ -39846,7 +39909,7 @@ /turf/simulated/floor/reinforced/airmix, /area/engineering/Atmospherics_Chamber) "xca" = ( -/obj/structure/toilet{ +/obj/structure/toilet/teleplumbed{ dir = 1 }, /turf/simulated/floor/tiled/kafel_full, @@ -40193,6 +40256,10 @@ /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/heads/sc/restroom) "xmx" = ( @@ -68290,7 +68357,7 @@ uow beU dnY uaT -vwJ +abu beU vwJ vwJ @@ -69036,7 +69103,7 @@ otT qxB nGW tSn -eUl +abv chR rzI mkH