From ef8dd6651b67c6f80eb8b78bad196c37f67a1a48 Mon Sep 17 00:00:00 2001 From: Venuska1117 <89580971+Venuska1117@users.noreply.github.com> Date: Sat, 16 Mar 2024 13:00:05 +0100 Subject: [PATCH] Replace var edited "icon_state" for disposal pipes with existing subtypes (using UpdatePaths) (#24249) * Queue Rock is comming * Add updatepath for pipes. * Fixing conflicts. --- _maps/map_files/Delta/delta.dmm | 1097 ++++++------- _maps/map_files/MetaStation/MetaStation.dmm | 1338 +++++++--------- .../lavaland_biodome_clown_planet.dmm | 211 +-- .../lavaland_surface_althland_facility.dmm | 192 ++- .../LavaRuins/lavaland_surface_seed_vault.dmm | 10 +- .../SpaceRuins/abandoned_engi_sat.dmm | 15 +- .../RandomRuins/SpaceRuins/abandonedzoo.dmm | 10 +- .../RandomRuins/SpaceRuins/meatpackers.dmm | 20 +- .../RandomRuins/SpaceRuins/onehalf.dmm | 15 +- .../SpaceRuins/syndicatedruglab.dmm | 20 +- _maps/map_files/cyberiad/cyberiad.dmm | 1374 +++++++---------- tools/UpdatePaths/Scripts/24249_junction.txt | 4 + 12 files changed, 1794 insertions(+), 2512 deletions(-) create mode 100644 tools/UpdatePaths/Scripts/24249_junction.txt diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 263d0057163..9b7e943362f 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -294,9 +294,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel/white, /area/station/medical/virology) @@ -5089,9 +5088,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "awb" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -5321,9 +5319,8 @@ icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -5763,9 +5760,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -6935,9 +6931,8 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -7027,9 +7022,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/station/supply/storage) @@ -7295,9 +7289,8 @@ }, /area/station/public/toilet) "aBu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/service/janitor) @@ -8017,9 +8010,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -9838,9 +9830,8 @@ /turf/simulated/floor/plasteel/dark, /area/station/maintenance/incinerator) "aIu" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/dark, @@ -10029,9 +10020,8 @@ }, /area/station/public/toilet) "aIS" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/structure/cable{ d1 = 4; @@ -10630,9 +10620,8 @@ name = "north bump"; pixel_y = 28 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/station/supply/sorting) @@ -10673,9 +10662,8 @@ "aKC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel/white, /area/station/science/research) @@ -11182,9 +11170,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -11228,9 +11215,8 @@ }, /area/station/supply/office) "aMe" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -12639,9 +12625,8 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable{ d1 = 1; @@ -13483,9 +13468,8 @@ }, /area/station/security/permabrig) "aSu" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -14184,9 +14168,8 @@ /area/station/security/permasolitary) "aTS" = ( /obj/structure/lattice, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 @@ -14437,9 +14420,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable{ d1 = 4; @@ -14513,9 +14495,8 @@ }, /area/station/service/bar) "aUL" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-y" +/obj/structure/disposalpipe/junction/y{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -15166,9 +15147,8 @@ }, /area/station/hallway/primary/starboard/west) "aWm" = ( -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 1 }, /obj/structure/cable{ d1 = 1; @@ -15205,9 +15185,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -15285,9 +15264,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -15412,9 +15390,8 @@ }, /area/station/supply/qm) "aWF" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable{ d1 = 4; @@ -16185,9 +16162,8 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -16238,9 +16214,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "aYX" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -16423,9 +16398,8 @@ "aZp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/structure/cable{ d1 = 1; @@ -16715,9 +16689,8 @@ /area/station/service/bar) "baa" = ( /obj/structure/lattice/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 @@ -17071,9 +17044,8 @@ "baX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "brown" @@ -18236,9 +18208,8 @@ }, /area/station/service/kitchen) "bdS" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "redfull" @@ -18530,18 +18501,16 @@ }, /area/station/maintenance/fore) "beW" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "greenblue" }, /area/station/service/hydroponics) "beX" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ @@ -18790,9 +18759,8 @@ }, /area/station/hallway/primary/port/north) "bfF" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -19354,9 +19322,8 @@ /turf/simulated/floor/plasteel, /area/station/service/hydroponics) "bhz" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, @@ -19662,9 +19629,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -21556,9 +21522,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -22897,9 +22862,8 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -23019,9 +22983,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-y" +/obj/structure/disposalpipe/junction/y{ + dir = 8 }, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -23114,9 +23077,8 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/effect/landmark/lightsout, /turf/simulated/floor/plasteel{ @@ -23167,9 +23129,8 @@ /area/station/medical/medbay) "bqA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/structure/cable{ d1 = 1; @@ -23321,9 +23282,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable{ d1 = 2; @@ -23953,9 +23913,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/carpet/red, /area/station/command/office/hos) @@ -24257,9 +24216,8 @@ /turf/simulated/floor/plasteel, /area/station/service/hydroponics) "btE" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -24378,9 +24336,8 @@ }, /area/station/security/interrogation) "buf" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -24391,9 +24348,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -26124,9 +26080,8 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery/hollow, @@ -26138,9 +26093,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -27363,9 +27317,8 @@ /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "bCa" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, @@ -27793,9 +27746,8 @@ name = "west bump"; pixel_x = -28 }, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - icon_state = "pipe-j2s"; name = "Bar Junction"; sort_type_txt = "19" }, @@ -28146,9 +28098,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -28499,9 +28450,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) @@ -29469,9 +29419,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -29634,9 +29583,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -30027,21 +29975,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/security/detective) -"bHM" = ( -/obj/machinery/power/apc/directional/north, -/obj/structure/table/wood, -/obj/item/taperecorder, -/obj/item/restraints/handcuffs, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel/dark, -/area/station/security/detective) "bHN" = ( /obj/structure/filingcabinet/security, /obj/structure/disposalpipe/segment{ @@ -30588,9 +30521,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/wood, /area/station/command/office/captain) @@ -31001,9 +30933,8 @@ /area/station/command/office/ce) "bKe" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -31403,9 +31334,8 @@ }, /area/station/public/storage/tools/auxiliary) "bLk" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/structure/cable{ d1 = 1; @@ -33384,9 +33314,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/effect/turf_decal/delivery, /obj/structure/cable{ @@ -34438,9 +34367,8 @@ "bSU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/structure/cable{ d1 = 1; @@ -34527,9 +34455,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 1 }, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -34544,9 +34471,8 @@ }, /area/station/hallway/primary/starboard/east) "bTj" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -35028,9 +34954,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -36053,9 +35978,8 @@ "bXa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable{ d1 = 1; @@ -36165,9 +36089,8 @@ }, /area/station/hallway/primary/starboard/north) "bXp" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/firealarm{ dir = 4; @@ -36464,9 +36387,8 @@ /turf/space, /area/space/nearstation) "bYm" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -36739,9 +36661,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "darkred" @@ -36900,9 +36821,8 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "bZt" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -37386,9 +37306,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/wood, /area/station/legal/lawoffice) @@ -37446,9 +37365,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "darkred" @@ -37621,9 +37539,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable{ d1 = 4; @@ -37644,9 +37561,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable{ d1 = 1; @@ -38325,9 +38241,8 @@ "ccN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -39237,9 +39152,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel/white, /area/station/science/research) @@ -40346,9 +40260,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/wood, /area/station/command/office/ntrep) @@ -40384,9 +40297,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/wood, /area/station/command/office/blueshield) @@ -41128,9 +41040,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/carpet, /area/station/legal/lawoffice) @@ -41224,9 +41135,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -42137,9 +42047,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/wood, /area/station/command/office/hop) @@ -42619,9 +42528,8 @@ /turf/simulated/floor/plasteel/dark, /area/station/legal/courtroom) "coQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -43067,28 +42975,6 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/central) -"cpS" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/station/hallway/primary/central) "cpU" = ( /obj/machinery/power/apc/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -43161,9 +43047,8 @@ "cpY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/structure/cable{ d1 = 4; @@ -43207,9 +43092,8 @@ "cqd" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 4 }, /obj/structure/cable{ d1 = 4; @@ -43341,9 +43225,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 1 }, /obj/structure/cable{ d1 = 1; @@ -43785,9 +43668,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel/dark, /area/station/medical/surgery/observation) @@ -43924,9 +43806,8 @@ }, /area/station/public/locker) "csa" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -44802,9 +44683,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -44907,9 +44787,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/station/public/fitness) @@ -45592,9 +45471,8 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/library) "cwK" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel/dark, /area/station/service/library) @@ -47305,9 +47183,8 @@ /area/station/service/library) "cAX" = ( /obj/structure/filingcabinet, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel/dark, /area/station/service/library) @@ -47755,9 +47632,8 @@ "cCo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable{ d1 = 1; @@ -47769,9 +47645,8 @@ }, /area/station/engineering/control) "cCp" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" @@ -48331,9 +48206,8 @@ }, /area/station/maintenance/port) "cDZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -49441,9 +49315,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -49585,9 +49458,8 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ @@ -49680,9 +49552,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-y" +/obj/structure/disposalpipe/junction/y{ + dir = 4 }, /obj/structure/cable{ d1 = 4; @@ -49701,9 +49572,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/structure/cable{ d1 = 4; @@ -49869,9 +49739,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -50213,9 +50082,8 @@ /turf/simulated/floor/plasteel, /area/station/science/research) "cIY" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -50800,9 +50668,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -51060,9 +50927,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-y" +/obj/structure/disposalpipe/junction/y{ + dir = 4 }, /turf/simulated/floor/plasteel/white, /area/station/science/research) @@ -53541,9 +53407,8 @@ /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) "cVc" = ( -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-y" +/obj/structure/disposalpipe/junction/y{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft/south) @@ -55269,9 +55134,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -55354,9 +55218,8 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel/white, /area/station/medical/chemistry) @@ -56577,9 +56440,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel/white, /area/station/medical/chemistry) @@ -56942,9 +56804,8 @@ "dii" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel/white, /area/station/science/research) @@ -57079,9 +56940,8 @@ /turf/simulated/floor/plasteel/white, /area/station/medical/chemistry) "diC" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -60395,9 +60255,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -61068,9 +60927,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -61451,9 +61309,8 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-y" +/obj/structure/disposalpipe/junction/y{ + dir = 1 }, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) @@ -61473,9 +61330,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "dDz" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel/white, /area/station/medical/sleeper) @@ -61538,9 +61394,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -62292,9 +62147,8 @@ /turf/simulated/floor/plating, /area/station/hallway/secondary/exit) "dHQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft/south) @@ -62472,9 +62326,8 @@ /obj/structure/sink{ pixel_y = 24 }, -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-y" +/obj/structure/disposalpipe/junction/y{ + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -62526,9 +62379,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -62865,9 +62717,8 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel/grimy, /area/station/service/chapel) @@ -62894,9 +62745,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "dLE" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -64561,6 +64411,16 @@ /obj/item/crowbar/red, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/apmaint) +"dSB" = ( +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 8 + }, +/obj/machinery/atmospherics/portable/canister/air, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/exit) "dSD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -64675,9 +64535,8 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dST" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -64996,9 +64855,8 @@ /obj/structure/table/wood, /obj/item/folder, /obj/item/pen, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/carpet, /area/station/service/chapel/office) @@ -66492,9 +66350,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/station/supply/sorting) @@ -66727,9 +66584,8 @@ "eoO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel/white, /area/station/science/research) @@ -67518,9 +67374,8 @@ /turf/simulated/floor/plating, /area/station/hallway/primary/central) "eJp" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable{ d1 = 1; @@ -67894,9 +67749,8 @@ /turf/simulated/floor/plasteel/white, /area/station/science/explab) "eSX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -67992,9 +67846,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -68624,9 +68477,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable{ d1 = 4; @@ -68922,9 +68774,8 @@ /area/station/medical/virology) "fze" = ( /obj/structure/closet/l3closet/scientist, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel/white, @@ -69705,9 +69556,8 @@ "fTq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - icon_state = "pipe-j2s"; name = "Captain's Junction"; sort_type_txt = "18" }, @@ -70626,9 +70476,8 @@ }, /area/station/medical/morgue) "gDM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel/white, /area/station/medical/reception) @@ -71312,9 +71161,8 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -71626,9 +71474,8 @@ }, /area/station/security/prison/cell_block) "hiO" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/wood, /area/station/legal/lawoffice) @@ -71697,16 +71544,6 @@ }, /turf/simulated/floor/plating, /area/station/command/office/rd) -"hli" = ( -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 8 - }, -/obj/machinery/atmospherics/portable/canister/air, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/exit) "hly" = ( /obj/structure/table/wood, /turf/simulated/floor/plasteel/dark, @@ -71879,9 +71716,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel/white, /area/station/science/research) @@ -72432,9 +72268,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -73004,10 +72839,9 @@ /turf/simulated/floor/engine, /area/station/maintenance/incinerator) "ibg" = ( -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - sort_type_txt = "2"; - icon_state = "pipe-j2s" + sort_type_txt = "2" }, /obj/structure/cable{ d1 = 1; @@ -73653,9 +73487,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel/white, /area/station/medical/sleeper) @@ -73948,9 +73781,8 @@ /area/station/hallway/secondary/exit) "iGk" = ( /obj/structure/closet/secure_closet/medical2, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -74305,9 +74137,8 @@ }, /area/station/hallway/primary/starboard/west) "iRs" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -74458,10 +74289,6 @@ icon_state = "bar" }, /area/station/service/kitchen) -"iVe" = ( -/obj/effect/spawner/airlock, -/turf/simulated/wall, -/area/station/service/chapel/office) "iVg" = ( /obj/machinery/economy/atm{ pixel_x = -32 @@ -74820,9 +74647,8 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" @@ -74924,9 +74750,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/newscaster{ name = "north bump"; @@ -75002,9 +74827,8 @@ /turf/simulated/floor/wood, /area/station/service/clown) "jlw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -75458,9 +75282,8 @@ pixel_y = 32 }, /obj/structure/filingcabinet, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -75550,9 +75373,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 4; - icon_state = "pipe-j2s"; name = "Library Junction"; sort_type_txt = "16" }, @@ -75905,9 +75727,8 @@ /obj/machinery/conveyor{ id = "cargodisposals" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plating, /area/station/supply/sorting) @@ -75977,9 +75798,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -76242,9 +76062,8 @@ /area/station/security/prison/cell_block) "jZB" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable{ d1 = 2; @@ -76317,6 +76136,15 @@ icon_state = "whiteblue" }, /area/station/medical/storage) +"kdg" = ( +/obj/structure/sign/vacuum{ + pixel_x = -32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/exit) "kdm" = ( /obj/machinery/power/apc/critical/directional/north, /obj/machinery/firealarm{ @@ -76417,15 +76245,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/medical/morgue) -"kfC" = ( -/obj/structure/sign/vacuum{ - pixel_x = -32 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/exit) "kfT" = ( /obj/structure/cable{ d2 = 4; @@ -76473,9 +76292,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -76965,9 +76783,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/structure/cable{ d1 = 1; @@ -77015,9 +76832,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - icon_state = "pipe-j2s"; name = "Morgue"; sort_type_txt = "25" }, @@ -77229,9 +77045,8 @@ }, /area/station/public/locker) "kGv" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -78189,9 +78004,8 @@ }, /area/station/hallway/primary/central/east) "lnl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable{ d1 = 1; @@ -78325,9 +78139,8 @@ }, /area/station/hallway/secondary/entry/south) "lpX" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -78804,9 +78617,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - icon_state = "pipe-j2s"; name = "Genetics"; sort_type_txt = "23" }, @@ -79288,9 +79100,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -79528,6 +79339,20 @@ icon_state = "darkred" }, /area/station/security/main) +"mef" = ( +/obj/machinery/power/apc/directional/north, +/obj/structure/table/wood, +/obj/item/taperecorder, +/obj/item/restraints/handcuffs, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/disposalpipe/segment/corner{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/security/detective) "mek" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -79632,9 +79457,8 @@ /area/station/medical/virology) "mga" = ( /obj/effect/landmark/start/shaft_miner, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) @@ -82729,9 +82553,8 @@ icon_state = "2-4" }, /obj/effect/turf_decal/delivery, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -83785,9 +83608,8 @@ /area/station/science/break_room) "oyV" = ( /obj/machinery/atmospherics/unary/outlet_injector/on, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plating/airless, /area/station/maintenance/incinerator) @@ -84258,9 +84080,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/west) "oMI" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) @@ -84636,9 +84457,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - icon_state = "pipe-j2s"; name = "Kitchen Junction"; sort_type_txt = "20" }, @@ -84723,9 +84543,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" @@ -85634,9 +85453,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -86325,9 +86143,8 @@ /area/station/public/toilet/lockerroom) "pWq" = ( /obj/structure/closet/emcloset, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel/white, @@ -86699,9 +86516,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -87130,9 +86946,8 @@ /turf/simulated/floor/plasteel, /area/station/science/research) "qAH" = ( -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - icon_state = "pipe-j2s"; name = "Research Junction"; sort_type_txt = "12" }, @@ -87164,9 +86979,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -87199,9 +87013,8 @@ }, /area/station/maintenance/fsmaint) "qCU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -87392,9 +87205,8 @@ icon_state = "2-8" }, /obj/machinery/hologram/holopad, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -87638,9 +87450,8 @@ /turf/simulated/floor/plasteel/white, /area/station/medical/virology) "qTJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel/white, /area/station/science/genetics) @@ -87963,9 +87774,8 @@ /turf/space, /area/space/nearstation) "raK" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -88510,9 +88320,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 1 }, /turf/simulated/floor/plasteel/white, /area/station/science/research) @@ -88835,9 +88644,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 4; - icon_state = "pipe-j2s"; name = "HoP Junction"; sort_type_txt = "15" }, @@ -89215,9 +89023,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" @@ -89578,9 +89385,8 @@ /turf/simulated/floor/plasteel, /area/station/service/hydroponics) "rXm" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -89879,11 +89685,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; name = "Chemistry"; - sort_type_txt = "11"; - icon_state = "pipe-j2s" + sort_type_txt = "11" }, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) @@ -90168,9 +89973,8 @@ /turf/simulated/floor/plating, /area/station/science/robotics/showroom) "sjA" = ( -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - icon_state = "pipe-j2s"; name = "Hydroponics Junction"; sort_type_txt = "21" }, @@ -90458,9 +90262,8 @@ }, /area/station/maintenance/apmaint) "spz" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -90703,9 +90506,8 @@ /obj/machinery/conveyor{ id = "cargodisposals" }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-y" +/obj/structure/disposalpipe/junction/y{ + dir = 1 }, /turf/simulated/floor/plating, /area/station/supply/sorting) @@ -90800,9 +90602,8 @@ }, /area/station/security/prison/cell_block) "syt" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -90892,9 +90693,8 @@ }, /area/station/medical/virology) "sAl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -91176,9 +90976,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -91772,9 +91571,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel/white, /area/station/science/research) @@ -92103,21 +91901,6 @@ }, /turf/simulated/floor/plasteel, /area/station/science/research) -"tjT" = ( -/obj/item/radio/intercom{ - name = "west bump"; - pixel_x = -28 - }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/exit) "tkb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -92258,9 +92041,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -92798,9 +92580,8 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/public/storage/art) @@ -92886,9 +92667,8 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -92916,9 +92696,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, @@ -93161,6 +92940,21 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/security/prison/cell_block) +"tSp" = ( +/obj/item/radio/intercom{ + name = "west bump"; + pixel_x = -28 + }, +/obj/machinery/newscaster{ + dir = 1; + name = "south bump"; + pixel_y = -28 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/exit) "tSt" = ( /obj/structure/table, /obj/item/reagent_containers/drinks/drinkingglass{ @@ -93255,9 +93049,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable{ d1 = 1; @@ -93413,9 +93206,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -93588,9 +93380,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 1 }, /turf/simulated/floor/plasteel/dark, /area/station/medical/surgery/observation) @@ -93807,6 +93598,10 @@ icon_state = "darkred" }, /area/station/security/processing) +"uil" = ( +/obj/effect/spawner/airlock, +/turf/simulated/wall, +/area/station/service/chapel/office) "uit" = ( /obj/machinery/atmospherics/unary/vent_pump{ dir = 4; @@ -94640,9 +94435,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable{ d1 = 1; @@ -95049,9 +94843,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/carpet/purple, /area/station/medical/psych) @@ -95585,9 +95378,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/alarm{ dir = 8; @@ -96837,6 +96629,27 @@ /obj/machinery/economy/vending/cart, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) +"wbm" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment/corner{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/station/hallway/primary/central) "wbZ" = ( /obj/machinery/atmospherics/unary/portables_connector, /turf/simulated/floor/plasteel{ @@ -97867,9 +97680,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 8 }, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) @@ -97897,9 +97709,8 @@ }, /obj/machinery/door/window, /obj/effect/turf_decal/delivery/hollow, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/structure/cable{ d1 = 2; @@ -99195,9 +99006,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -99325,9 +99135,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -99440,9 +99249,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" @@ -99749,9 +99557,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel/dark, /area/station/command/office/cmo) @@ -137505,7 +137312,7 @@ dIx dIx dIx dIx -iVe +uil abj aaa aaa @@ -137944,7 +137751,7 @@ clO cru cns uEq -cpS +wbm crx iDv cvy @@ -138016,7 +137823,7 @@ dPM dkq dSs dSP -hli +dSB dIH dIH dIH @@ -138274,8 +138081,8 @@ dKo dXJ dKo dUj -kfC -tjT +kdg +tSp dIH abj aaa @@ -148461,7 +148268,7 @@ gUe aaa aaa bLn -bHM +mef bJy bNr bNr diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 2ad80edf542..dcb957cffa3 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -146,9 +146,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -1233,9 +1232,8 @@ pixel_x = -24 }, /obj/structure/closet/crate/can, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -1750,9 +1748,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -2441,9 +2438,8 @@ /turf/simulated/floor/wood, /area/station/maintenance/starboard) "ars" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/conveyor/east{ id = "garbage" @@ -2868,9 +2864,8 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -3000,9 +2995,8 @@ }, /area/station/security/permabrig) "atR" = ( -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 2 }, /obj/structure/cable/yellow{ d1 = 1; @@ -4023,9 +4017,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -4512,9 +4505,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -5091,9 +5083,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable/yellow{ d1 = 2; @@ -5396,9 +5387,8 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "aDd" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/structure/cable/yellow{ d1 = 2; @@ -6677,9 +6667,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/effect/turf_decal/stripes/corner, /obj/machinery/hologram/holopad, @@ -7378,9 +7367,8 @@ /turf/simulated/floor/engine, /area/station/engineering/control) "aKd" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -7700,9 +7688,8 @@ /turf/simulated/floor/carpet, /area/station/legal/courtroom) "aLf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -8195,9 +8182,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aMr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable/yellow{ d1 = 1; @@ -9076,9 +9062,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -9317,9 +9302,8 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "aPM" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9614,9 +9598,8 @@ "aQL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable/yellow{ d1 = 1; @@ -9711,9 +9694,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -12296,9 +12278,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -13134,9 +13115,8 @@ "bbj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/structure/cable/yellow{ d1 = 1; @@ -13573,21 +13553,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/control) -"bcr" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/medmaint) "bcs" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, @@ -14967,9 +14932,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/carpet/red, /area/station/command/office/hos) @@ -15009,9 +14973,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "bfJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -15815,9 +15778,8 @@ }, /area/station/engineering/tech_storage) "bhK" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/structure/closet/jcloset, /obj/effect/decal/cleanable/dirt, @@ -16169,9 +16131,8 @@ dir = 4 }, /obj/machinery/space_heater, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plating, /area/station/maintenance/port2) @@ -16245,9 +16206,8 @@ }, /area/station/engineering/atmos) "biK" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -16326,9 +16286,8 @@ "biZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -16414,9 +16373,8 @@ /obj/machinery/ai_status_display{ pixel_y = 32 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/carpet, /area/station/command/office/captain/bedroom) @@ -17680,9 +17638,8 @@ name = "west bump"; pixel_x = -24 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -17812,9 +17769,8 @@ name = "east bump"; pixel_x = 28 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -18611,9 +18567,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/ne) @@ -21213,9 +21168,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 8 }, /obj/structure/cable/yellow{ d1 = 2; @@ -21366,9 +21320,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/structure/cable/yellow{ @@ -21661,9 +21614,8 @@ /turf/simulated/floor/wood, /area/station/service/bar) "bwG" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/newscaster{ dir = 8; @@ -22722,9 +22674,8 @@ }, /area/station/hallway/primary/port/west) "bzE" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -22840,9 +22791,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/carpet, /area/station/command/office/hop) @@ -23711,9 +23661,8 @@ /obj/structure/chair/comfy/brown{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/carpet, /area/station/command/office/captain) @@ -23963,9 +23912,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -24289,9 +24237,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "bDV" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -25780,9 +25727,8 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/effect/landmark/lightsout, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable/yellow{ d1 = 4; @@ -27566,9 +27512,8 @@ /area/station/science/robotics/chargebay) "bQi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable/yellow{ d1 = 1; @@ -31307,9 +31252,8 @@ req_access_txt = "66" }, /obj/effect/turf_decal/stripes/corner, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" @@ -31343,9 +31287,8 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/alarm{ dir = 1; @@ -31792,19 +31735,10 @@ icon_state = "whiteblue" }, /area/station/medical/paramedic) -"cem" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/effect/spawner/random_spawners/oil_maybe, -/turf/simulated/floor/plating, -/area/station/maintenance/fsmaint) "cen" = ( /obj/effect/turf_decal/delivery, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -32314,9 +32248,8 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -32515,9 +32448,8 @@ name = "west bump"; pixel_x = -24 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -32576,9 +32508,8 @@ }, /area/station/hallway/primary/central/se) "cgQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -33424,17 +33355,15 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-y" +/obj/structure/disposalpipe/junction/y{ + dir = 2 }, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft/north) "cjM" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "whitehall" @@ -33930,9 +33859,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -36915,9 +36843,8 @@ icon_state = "1-4" }, /obj/effect/landmark/damageturf, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -37196,9 +37123,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-y" +/obj/structure/disposalpipe/junction/y{ + dir = 8 }, /obj/structure/cable/yellow{ d1 = 1; @@ -37949,9 +37875,8 @@ /turf/simulated/floor/engine, /area/station/command/office/rd) "cBM" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/structure/cable/yellow{ d1 = 1; @@ -38463,9 +38388,8 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -38522,9 +38446,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -38655,20 +38578,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) -"cEi" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/aft) "cEj" = ( /obj/structure/table/wood, /obj/item/reagent_containers/glass/beaker{ @@ -40139,9 +40048,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "cJl" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable/yellow{ d1 = 1; @@ -40254,9 +40162,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -40954,9 +40861,8 @@ name = "Robotics Requests Console"; pixel_x = -30 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -41254,9 +41160,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable/yellow{ d1 = 1; @@ -41431,9 +41336,8 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/light/small{ dir = 8 @@ -42417,15 +42321,6 @@ /obj/effect/spawner/random_spawners/fungus_maybe, /turf/simulated/wall, /area/station/maintenance/port) -"cRW" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/three, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/medmaint) "cSa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -43441,9 +43336,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable/yellow{ d1 = 1; @@ -43481,9 +43375,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -43546,9 +43439,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -43716,9 +43608,8 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-y" +/obj/structure/disposalpipe/junction/y{ + dir = 2 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -45124,9 +45015,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "deI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/requests_console{ department = "Chapel"; @@ -45530,9 +45420,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/structure/cable/yellow{ d1 = 1; @@ -46921,9 +46810,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/security/brig) @@ -48042,9 +47930,8 @@ /turf/simulated/floor/plating, /area/station/engineering/atmos/distribution) "eoJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -48288,9 +48175,8 @@ /turf/simulated/wall/r_wall, /area/station/security/range) "esJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable/yellow{ d1 = 1; @@ -48507,16 +48393,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft) -"eyu" = ( -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" - }, -/obj/structure/sign/securearea{ - pixel_y = 32 - }, -/turf/simulated/floor/plating, -/area/station/maintenance/aft) "eyP" = ( /obj/machinery/door_control{ id = "Secure Gate"; @@ -48852,9 +48728,8 @@ }, /area/station/security/storage) "eEy" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/station/supply/storage) @@ -48896,9 +48771,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 8 }, /obj/structure/cable/yellow{ d1 = 2; @@ -49008,9 +48882,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/structure/cable/yellow{ d1 = 4; @@ -49057,9 +48930,8 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos/distribution) "eJG" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -50693,9 +50565,8 @@ }, /area/station/legal/magistrate) "fsh" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -51552,9 +51423,8 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - icon_state = "pipe-j2s"; name = "Kitchen Junction"; sort_type_txt = "20" }, @@ -52551,9 +52421,8 @@ }, /area/station/security/permabrig) "gei" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -52942,9 +52811,8 @@ name = "Prison Intercom (General)"; pixel_y = 25 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -53072,9 +52940,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "gqj" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -54945,9 +54812,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard) "hfC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -55003,6 +54869,24 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/station/security/prison/cell_block/A) +"hgm" = ( +/obj/structure/disposalpipe/junction/y{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/aft) "hgp" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -55606,9 +55490,8 @@ }, /area/station/command/office/rd) "hsq" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable/yellow{ d1 = 1; @@ -56579,9 +56462,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/effect/turf_decal/stripes/line, /obj/machinery/economy/vending/wallmed{ @@ -56611,9 +56493,8 @@ /area/station/maintenance/starboard2) "hNa" = ( /obj/structure/lattice/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/space, /area/space/nearstation) @@ -56955,6 +56836,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) +"hTM" = ( +/obj/structure/disposalpipe/segment/corner{ + dir = 8 + }, +/obj/effect/spawner/random_spawners/oil_maybe, +/turf/simulated/floor/plating, +/area/station/maintenance/fsmaint) "hTS" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -56996,9 +56884,8 @@ }, /area/station/science/toxins/launch) "hVX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable/yellow{ d1 = 2; @@ -57189,9 +57076,8 @@ }, /area/station/hallway/secondary/garden) "hZy" = ( -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - icon_state = "pipe-j2s"; name = "Disposals Junction"; sort_type_txt = "1" }, @@ -57353,9 +57239,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "icW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable/yellow{ d1 = 4; @@ -57377,9 +57262,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/engimaint) "idr" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -57581,9 +57465,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "ihW" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -57940,9 +57823,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "redcorner" @@ -58255,9 +58137,8 @@ /area/station/public/vacant_office) "iwm" = ( /obj/machinery/light, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -58501,9 +58382,8 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) @@ -59259,6 +59139,15 @@ "iRu" = ( /turf/simulated/wall/r_wall, /area/station/engineering/atmos/distribution) +"iRP" = ( +/obj/structure/disposalpipe/junction/reversed{ + dir = 8 + }, +/obj/structure/sign/securearea{ + pixel_y = 32 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/aft) "iRV" = ( /obj/machinery/door/airlock/external/glass{ id_tag = "arrivalsmaint_door_ext"; @@ -59447,25 +59336,6 @@ }, /turf/simulated/floor/wood, /area/station/legal/courtroom) -"iUx" = ( -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-y" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/aft) "iUC" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -61213,9 +61083,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable/yellow{ d1 = 4; @@ -61349,9 +61218,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -61455,9 +61323,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -61872,6 +61739,25 @@ }, /turf/simulated/floor/plasteel, /area/station/supply/office) +"jZi" = ( +/obj/effect/spawner/lootdrop{ + loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); + name = "trash spawner" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ + dir = 8 + }, +/obj/structure/disposalpipe/segment/corner{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plasteel, +/area/station/maintenance/fsmaint) "jZz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -61998,9 +61884,8 @@ c_tag = "Science Hallway - Research"; network = list("Research","SS13") }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -62992,6 +62877,30 @@ /obj/item/kirbyplants/plant21, /turf/simulated/floor/plasteel, /area/station/supply/storage) +"kBz" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment/corner{ + dir = 2 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "redcorner" + }, +/area/station/security/brig) "kCc" = ( /obj/machinery/door/window/brigdoor{ dir = 8; @@ -63035,9 +62944,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/structure/cable/yellow{ d1 = 1; @@ -63440,9 +63348,8 @@ /turf/simulated/floor/plating, /area/station/command/office/cmo) "kJT" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable/yellow{ d1 = 4; @@ -63722,9 +63629,8 @@ "kPv" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable/yellow{ d1 = 4; @@ -64138,9 +64044,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable/yellow{ d1 = 4; @@ -64464,9 +64369,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) @@ -65150,9 +65054,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - icon_state = "pipe-j2s"; name = "CMO's Junction"; sort_type_txt = "10" }, @@ -65222,9 +65125,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -65724,25 +65626,6 @@ icon_state = "white" }, /area/station/science/toxins/mixing) -"lEx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/atmos/control) "lEM" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance, @@ -65933,9 +65816,8 @@ }, /area/station/science/toxins/mixing) "lHQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable/yellow{ d1 = 1; @@ -66283,9 +66165,8 @@ }, /area/station/hallway/primary/central/north) "lOv" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/structure/cable/yellow{ d1 = 2; @@ -66306,9 +66187,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - icon_state = "pipe-j2s"; name = "Hydroponics Junction"; sort_type_txt = "21" }, @@ -66485,26 +66365,6 @@ icon_state = "showroomfloor" }, /area/station/medical/coldroom) -"lRH" = ( -/obj/effect/spawner/lootdrop{ - loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); - name = "trash spawner" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plasteel, -/area/station/maintenance/fsmaint) "lRK" = ( /obj/machinery/light/small, /turf/simulated/floor/catwalk, @@ -66851,9 +66711,8 @@ /turf/simulated/floor/plasteel, /area/station/security/brig) "maV" = ( -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 4; - icon_state = "pipe-j2s"; name = "Security Junction"; sort_type_txt = "8" }, @@ -66944,9 +66803,8 @@ }, /area/station/medical/morgue) "mcp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable/yellow{ d1 = 2; @@ -67197,16 +67055,6 @@ icon_state = "whiteblue" }, /area/station/security/permabrig) -"mgu" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "darkgrey" - }, -/area/station/science/toxins/launch) "mgZ" = ( /obj/machinery/atmospherics/air_sensor{ autolink_id = "air_sensor"; @@ -67656,9 +67504,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -67726,6 +67573,24 @@ /obj/effect/spawner/random_spawners/cobweb_right_rare, /turf/simulated/floor/plating, /area/station/maintenance/aft2) +"mtJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 9; + level = 2 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/disposalpipe/segment/corner{ + dir = 8 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/fsmaint) "mtV" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -68704,6 +68569,16 @@ icon_state = "greenblue" }, /area/station/service/hydroponics) +"mQW" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "darkgrey" + }, +/area/station/science/toxins/launch) "mRj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -69685,9 +69560,8 @@ }, /area/station/service/kitchen) "nig" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/station/supply/office) @@ -69754,9 +69628,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft/north) "niX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/wood, /area/station/medical/psych) @@ -70028,9 +69901,8 @@ /turf/space, /area/space/nearstation) "nqw" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -70481,9 +70353,8 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) @@ -70890,32 +70761,6 @@ icon_state = "red" }, /area/station/security/main) -"nIs" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 8; - icon_state = "pipe-j2s"; - name = "Chapel"; - sort_type_txt = "17" - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/aft) "nIG" = ( /obj/machinery/light_switch{ dir = 8; @@ -71002,9 +70847,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/station/supply/storage) @@ -71272,9 +71116,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/port2) "nTK" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable/yellow{ d1 = 1; @@ -71979,6 +71822,19 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, /area/station/security/brig) +"oiY" = ( +/obj/structure/disposalpipe/segment/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/aft) "oje" = ( /obj/structure/reagent_dispensers/watertank/high, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -72503,9 +72359,8 @@ }, /area/station/security/permabrig) "oBO" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -73542,9 +73397,8 @@ "oWt" = ( /obj/machinery/atmospherics/pipe/manifold/visible/purple, /obj/machinery/atmospherics/meter, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -73674,9 +73528,8 @@ /area/station/medical/paramedic) "oYa" = ( /obj/structure/lattice/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/space, /area/space/nearstation) @@ -73706,6 +73559,20 @@ /obj/effect/mapping_helpers/airlock/access/any/service/crematorium, /turf/simulated/floor/plating, /area/station/maintenance/aft) +"pad" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/disposalpipe/junction/reversed{ + dir = 8 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/medmaint) "pah" = ( /obj/effect/turf_decal/woodsiding{ dir = 8 @@ -73849,9 +73716,8 @@ /obj/structure/chair/comfy/black{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, @@ -74271,9 +74137,8 @@ /turf/space, /area/space/nearstation) "plq" = ( -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-y" +/obj/structure/disposalpipe/junction/y{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -74724,9 +74589,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/west) "pxr" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -74955,9 +74819,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -75052,9 +74915,8 @@ }, /area/station/science/misc_lab) "pEN" = ( -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - icon_state = "pipe-j2s"; name = "RD Junction"; sort_type_txt = "13" }, @@ -75123,9 +74985,8 @@ }, /area/station/medical/medbay) "pFG" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -75971,9 +75832,8 @@ "pVO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 8 }, /obj/structure/cable/yellow{ d1 = 1; @@ -76120,9 +75980,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-y" +/obj/structure/disposalpipe/junction/y{ + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -76160,9 +76019,8 @@ /turf/simulated/floor/plasteel, /area/station/security/permabrig) "qaq" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable/yellow{ d1 = 4; @@ -76190,9 +76048,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable/yellow{ d1 = 2; @@ -76923,9 +76780,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -77045,9 +76901,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - icon_state = "pipe-j2s"; name = "Bar Junction"; sort_type_txt = "19" }, @@ -77223,9 +77078,8 @@ }, /area/station/command/office/cmo) "qvd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable/yellow{ d1 = 2; @@ -77728,9 +77582,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -77884,9 +77737,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft2) "qLe" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -77943,6 +77795,24 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/disposal) +"qMe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment/corner{ + dir = 1 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/atmos/control) "qMg" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on{ dir = 1 @@ -78339,9 +78209,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/wood, /area/station/public/mrchangs) @@ -78608,9 +78477,8 @@ }, /area/station/hallway/secondary/garden) "rbg" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "darkgreycheck" @@ -79204,9 +79072,8 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "rpg" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -79688,9 +79555,8 @@ /turf/simulated/floor/plasteel, /area/station/security/permabrig) "rye" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) @@ -79824,9 +79690,8 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/cafeteria) "rAm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -80796,9 +80661,8 @@ /area/station/security/permabrig) "rWf" = ( /obj/structure/closet/emcloset, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -80851,9 +80715,8 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/fsmaint) "rXj" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -81060,9 +80923,8 @@ /turf/simulated/wall/r_wall, /area/station/public/mrchangs) "sdj" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/structure/cable/yellow{ d1 = 1; @@ -81247,9 +81109,8 @@ name = "south bump"; pixel_y = -24 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "redcorner" @@ -81267,9 +81128,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable/yellow{ d1 = 1; @@ -81515,9 +81375,8 @@ /turf/simulated/floor/plating, /area/station/engineering/atmos) "snq" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -82691,9 +82550,8 @@ id = "ROBO"; pixel_x = -24 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -82759,9 +82617,8 @@ /area/station/hallway/primary/central/north) "sPr" = ( /obj/machinery/photocopier, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -82799,9 +82656,8 @@ /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "sQh" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -82959,6 +82815,28 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/port/west) +"sVh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment/corner{ + dir = 2 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/atmos/control) "sVy" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -83020,9 +82898,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -84104,9 +83981,8 @@ /turf/simulated/floor/carpet, /area/station/command/office/captain/bedroom) "ttI" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/structure/cable/yellow{ d1 = 2; @@ -84503,9 +84379,8 @@ "tFb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -84521,9 +84396,8 @@ /turf/space, /area/space/nearstation) "tGt" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -84806,9 +84680,8 @@ /turf/simulated/floor/plasteel, /area/station/supply/office) "tOF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" @@ -84994,6 +84867,14 @@ icon_state = "greenblue" }, /area/station/service/hydroponics) +"tTK" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/maintenance/three, +/obj/structure/disposalpipe/segment/corner{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/medmaint) "tUt" = ( /obj/item/wrench, /turf/simulated/floor/catwalk, @@ -85631,9 +85512,8 @@ /turf/simulated/floor/carpet, /area/station/service/library) "ugy" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/station/security/brig) @@ -86187,9 +86067,8 @@ }, /area/station/supply/office) "uxc" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ @@ -86886,9 +86765,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/north) "uNf" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/structure/cable/yellow{ d1 = 1; @@ -87388,9 +87266,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable/yellow{ d1 = 2; @@ -87457,9 +87334,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -87481,9 +87357,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/effect/landmark/start/security_officer, /turf/simulated/floor/plasteel{ @@ -87756,25 +87631,6 @@ icon_state = "brown" }, /area/station/hallway/primary/central/nw) -"vcW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9; - level = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/fsmaint) "vde" = ( /obj/machinery/navbeacon{ codes_txt = "delivery"; @@ -88149,17 +88005,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "vml" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/iv_drip, /turf/simulated/floor/plasteel{ @@ -88275,9 +88129,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/structure/cable/yellow{ d1 = 1; @@ -88479,9 +88332,8 @@ /obj/machinery/light_construct/small{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable/yellow{ d1 = 1; @@ -88491,9 +88343,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "vsR" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -88561,9 +88412,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/structure/cable/yellow{ d1 = 1; @@ -88593,9 +88443,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, @@ -89028,9 +88877,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plating, /area/station/maintenance/medmaint) @@ -89259,9 +89107,8 @@ pixel_y = 32 }, /obj/structure/chair/stool, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -89567,9 +89414,8 @@ /area/station/science/xenobiology) "vVr" = ( /obj/machinery/light, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -89990,9 +89836,8 @@ /turf/simulated/floor/plasteel, /area/station/science/toxins/mixing) "weC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -90021,9 +89866,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -90278,9 +90122,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/security/brig) @@ -90340,9 +90183,8 @@ loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "trash spawner" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -90428,6 +90270,31 @@ icon_state = "white" }, /area/station/security/permabrig) +"wor" = ( +/obj/structure/disposalpipe/sortjunction/reversed{ + dir = 8; + name = "Chapel"; + sort_type_txt = "17" + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/aft) "wos" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -90574,9 +90441,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - icon_state = "pipe-j2s"; name = "HoS Junction"; sort_type_txt = "7" }, @@ -91350,9 +91216,8 @@ }, /area/station/hallway/secondary/bridge) "wNA" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -91374,31 +91239,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) -"wNP" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "redcorner" - }, -/area/station/security/brig) "wOi" = ( /obj/machinery/light{ dir = 4 @@ -91438,9 +91278,8 @@ /turf/simulated/floor/carpet, /area/station/service/library) "wPm" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -91581,9 +91420,8 @@ }, /area/station/medical/chemistry) "wRx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/security/brig) @@ -91661,9 +91499,8 @@ }, /area/station/medical/chemistry) "wTo" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 1 @@ -92271,9 +92108,8 @@ /area/station/engineering/hardsuitstorage) "xfm" = ( /obj/structure/lattice/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/space, /area/space/nearstation) @@ -92589,9 +92425,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" @@ -92685,9 +92520,8 @@ }, /area/station/command/bridge) "xno" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -92902,29 +92736,6 @@ }, /turf/simulated/floor/carpet, /area/station/security/detective) -"xte" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/atmos/control) "xtp" = ( /obj/structure/cable/yellow{ d2 = 2; @@ -93143,9 +92954,8 @@ }, /area/station/legal/courtroom) "xxL" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -94241,9 +94051,8 @@ }, /area/station/engineering/break_room) "xYT" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/structure/cable/yellow{ d1 = 1; @@ -94397,9 +94206,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 4; - icon_state = "pipe-j2s"; name = "Library Junction"; sort_type_txt = "16" }, @@ -94478,9 +94286,8 @@ name = "south bump"; pixel_y = -30 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -94816,9 +94623,8 @@ }, /area/station/supply/office) "ylO" = ( -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - icon_state = "pipe-j2s"; name = "Atmospherics Junction"; sort_type_txt = "6" }, @@ -112749,7 +112555,7 @@ qvd ciP ciP ciP -cEi +oiY cLO bZU bZU @@ -113006,7 +112812,7 @@ nTK bZU ccB bZU -eyu +iRP mao deH cPA @@ -116353,7 +116159,7 @@ cGe tgu bZU chy -nIs +wor cPv cWm cxQ @@ -117638,7 +117444,7 @@ cxK pUx fOk daf -iUx +hgm eJG bZU del @@ -120106,7 +119912,7 @@ xaI ccc tKi djP -wNP +kBz fJm hKP iuW @@ -121469,11 +121275,11 @@ cvU pUg cvU cLd -bcr +pad pEO cAf ifN -cRW +tTK cMb cMb cMb @@ -128950,7 +128756,7 @@ wtQ jQZ eGn iXy -mgu +mQW tQW czx naq @@ -133230,7 +133036,7 @@ aqO ivP ycF fXy -cem +hTM apL aLl fmm @@ -135020,9 +134826,9 @@ lEo qvN iBO aUx -lRH +jZi jJr -vcW +mtJ aBZ aBZ bIf @@ -135060,7 +134866,7 @@ vbB hpR mFU rCq -lEx +qMe kEy gDW vYQ @@ -136602,7 +136408,7 @@ eht ceF kSA bil -xte +sVh lVy bhv bnU diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm index a5ca3c480c0..d360977a55c 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm @@ -3,30 +3,26 @@ /turf/template_noop, /area/template_noop) "ab" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/wall/r_wall, /area/ruin/powered/clownplanet) "ac" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/wall/r_wall, /area/ruin/powered/clownplanet) "ad" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plating, /area/ruin/powered/clownplanet) "ae" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plating, /area/ruin/powered/clownplanet) @@ -75,9 +71,8 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) @@ -129,9 +124,8 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) @@ -172,9 +166,8 @@ /area/ruin/powered/clownplanet) "ao" = ( /obj/structure/window/reinforced, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plating, /area/ruin/powered/clownplanet) @@ -189,9 +182,8 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) @@ -253,23 +245,6 @@ }, /turf/simulated/floor/plating, /area/ruin/powered/clownplanet) -"av" = ( -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/lubed, -/area/ruin/powered/clownplanet) "aw" = ( /obj/machinery/light/small{ dir = 1 @@ -284,9 +259,8 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) @@ -302,9 +276,8 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) @@ -320,19 +293,11 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) -"aA" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/wall/r_wall, -/area/ruin/powered/clownplanet) "aB" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -365,9 +330,8 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) @@ -390,9 +354,8 @@ /turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "aE" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plating, /area/ruin/powered/clownplanet) @@ -427,9 +390,8 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) @@ -448,9 +410,8 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) @@ -549,9 +510,8 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) @@ -608,9 +568,8 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) @@ -630,9 +589,8 @@ /turf/simulated/floor/plating, /area/ruin/powered/clownplanet) "aV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -640,9 +598,8 @@ }, /area/ruin/powered/clownplanet) "aW" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -711,9 +668,8 @@ /turf/simulated/floor/light, /area/ruin/powered/clownplanet) "bd" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -724,9 +680,8 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -760,9 +715,8 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/ruin/powered/clownplanet) @@ -778,16 +732,14 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "bk" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plating, /area/ruin/powered/clownplanet) @@ -803,16 +755,14 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "bm" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -905,9 +855,8 @@ /area/ruin/powered/clownplanet) "bu" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plating, /area/ruin/powered/clownplanet) @@ -937,9 +886,8 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/ruin/powered/clownplanet) @@ -1149,9 +1097,8 @@ /turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "sL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/light, /area/ruin/powered/clownplanet) @@ -1171,9 +1118,8 @@ /turf/simulated/wall/r_wall, /area/ruin/powered/clownplanet) "HG" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/light, /area/ruin/powered/clownplanet) @@ -1245,9 +1191,8 @@ /turf/simulated/floor/noslip/lavaland, /area/ruin/powered/clownplanet) "VH" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/wall/r_wall, /area/ruin/powered/clownplanet) @@ -1406,9 +1351,9 @@ ye ye ye ab -aA +EG ab -aA +EG ye cc cc @@ -1443,7 +1388,7 @@ VH aH ay aS -aA +EG ye cc cc @@ -1476,7 +1421,7 @@ ah af aI af -av +qo aL ye cc @@ -1509,7 +1454,7 @@ ap am ah af -aA +EG aL aL cc @@ -1539,7 +1484,7 @@ ye ye ae af -av +qo am aL aX @@ -1607,7 +1552,7 @@ ye ac ag af -av +qo aL am aL @@ -1718,7 +1663,7 @@ aL aL bi ch -aA +EG cc cc cc @@ -1787,7 +1732,7 @@ ay as an aC -av +qo cc dK bQ @@ -1811,16 +1756,16 @@ cc ye cu ah -aA +EG ah -av +qo ah af af au bk aC -av +qo bj ch bN @@ -1851,7 +1796,7 @@ aL an aO af -av +qo bl bo ay @@ -1886,9 +1831,9 @@ WZ WZ qo aC -av +qo bp -aA +EG bv cc bL @@ -1957,7 +1902,7 @@ bb bm aL bu -aA +EG bB bB cc diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm index aee4b089937..7aa7ddc15bc 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm @@ -44,6 +44,22 @@ nitrogen = 14 }, /area/ruin/unpowered/althland_processing) +"aJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/ore{ + pixel_y = -9; + pixel_x = -6 + }, +/obj/effect/landmark/burnturf, +/obj/structure/disposalpipe/segment/corner{ + dir = 1 + }, +/turf/simulated/floor{ + temperature = 500; + oxygen = 8; + nitrogen = 14 + }, +/area/ruin/unpowered/althland_processing) "aM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -145,9 +161,8 @@ /area/ruin/unpowered/althland_processing) "dh" = ( /obj/effect/mapping_helpers/no_lava, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) @@ -293,23 +308,12 @@ nitrogen = 14 }, /area/ruin/unpowered/althland_processing) -"gC" = ( +"gw" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery/white/partial, -/obj/machinery/light_construct/small{ +/obj/structure/disposalpipe/segment/corner{ dir = 8 }, -/obj/effect/decal/cleanable/glass, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/mineral/processing_unit_console{ - pixel_y = -2; - pixel_x = -29 - }, /turf/simulated/floor/plasteel{ temperature = 500; oxygen = 8; @@ -515,10 +519,9 @@ nitrogen = 14 }, /area/ruin/unpowered/althland_processing) -"ms" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +"mv" = ( +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor{ temperature = 500; @@ -784,6 +787,16 @@ nitrogen = 14 }, /area/ruin/unpowered/althland_processing) +"tH" = ( +/obj/structure/disposalpipe/segment/corner{ + dir = 8 + }, +/turf/simulated/floor{ + temperature = 500; + oxygen = 8; + nitrogen = 14 + }, +/area/ruin/unpowered/althland_processing) "tS" = ( /obj/effect/mapping_helpers/no_lava, /obj/effect/mapping_helpers/no_lava, @@ -958,23 +971,6 @@ nitrogen = 14 }, /area/ruin/unpowered/althland_processing) -"zq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/stack/ore{ - pixel_y = -9; - pixel_x = -6 - }, -/obj/effect/landmark/burnturf, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor{ - temperature = 500; - oxygen = 8; - nitrogen = 14 - }, -/area/ruin/unpowered/althland_processing) "zv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -1259,6 +1255,20 @@ }, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"Es" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/ore/plasma, +/obj/structure/disposalpipe/segment/corner{ + dir = 2 + }, +/obj/effect/landmark/burnturf, +/turf/simulated/floor{ + temperature = 500; + oxygen = 8; + nitrogen = 14 + }, +/area/ruin/unpowered/althland_processing) "Fa" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -1284,6 +1294,28 @@ nitrogen = 14 }, /area/ruin/unpowered/althland_processing) +"FW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery/white/partial, +/obj/machinery/light_construct/small{ + dir = 8 + }, +/obj/effect/decal/cleanable/glass, +/obj/structure/disposalpipe/segment/corner{ + dir = 4 + }, +/obj/machinery/mineral/processing_unit_console{ + pixel_y = -2; + pixel_x = -29 + }, +/turf/simulated/floor/plasteel{ + temperature = 500; + oxygen = 8; + nitrogen = 14 + }, +/area/ruin/unpowered/althland_processing) "FX" = ( /obj/structure/disposalpipe/broken{ dir = 4 @@ -1332,17 +1364,6 @@ nitrogen = 14 }, /area/ruin/unpowered/althland_processing) -"Gz" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor{ - temperature = 500; - oxygen = 8; - nitrogen = 14 - }, -/area/ruin/unpowered/althland_processing) "GF" = ( /obj/effect/mapping_helpers/no_lava, /obj/effect/decal/cleanable/glass, @@ -1359,27 +1380,11 @@ /area/ruin/unpowered/althland_processing) "Hj" = ( /obj/effect/mapping_helpers/no_lava, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) -"Hp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/item/stack/ore/plasma, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/effect/landmark/burnturf, -/turf/simulated/floor{ - temperature = 500; - oxygen = 8; - nitrogen = 14 - }, -/area/ruin/unpowered/althland_processing) "Hs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/baseturf_helper/lava/mapping_lava, @@ -1588,6 +1593,17 @@ nitrogen = 14 }, /area/lavaland/surface/outdoors) +"Mu" = ( +/obj/structure/disposalpipe/segment/corner{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel{ + temperature = 500; + oxygen = 8; + nitrogen = 14 + }, +/area/ruin/unpowered/althland_processing) "Mw" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -1623,18 +1639,6 @@ nitrogen = 14 }, /area/lavaland/surface/outdoors) -"Nu" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - temperature = 500; - oxygen = 8; - nitrogen = 14 - }, -/area/ruin/unpowered/althland_processing) "Og" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -1826,19 +1830,6 @@ nitrogen = 14 }, /area/ruin/unpowered/althland_processing) -"UU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - temperature = 500; - oxygen = 8; - nitrogen = 14 - }, -/area/ruin/unpowered/althland_processing) "Vj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -2088,9 +2079,8 @@ "ZB" = ( /obj/effect/mapping_helpers/no_lava, /obj/effect/mapping_helpers/no_lava, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) @@ -2350,7 +2340,7 @@ ZB hc Pn fv -zq +aJ ui ab ab @@ -2421,8 +2411,8 @@ ab af ui Ec -gC -UU +FW +gw ui ab ab @@ -2509,7 +2499,7 @@ bT af TX rw -ms +mv ui bT ab @@ -2581,7 +2571,7 @@ ui vf Yt uC -Gz +tH ui bT bT @@ -2781,7 +2771,7 @@ cb ab Au WQ -Hp +Es fd ui ab @@ -3004,7 +2994,7 @@ ui Dp fY hY -Nu +Mu ui af af diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm index dcf482c025d..96f5eb542f8 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm @@ -301,9 +301,8 @@ /turf/simulated/floor/plasteel/freezer, /area/ruin/powered/seedvault) "DZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel/freezer, /area/ruin/powered/seedvault) @@ -380,9 +379,8 @@ /turf/simulated/floor/plasteel/freezer, /area/ruin/powered/seedvault) "OL" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel/freezer, /area/ruin/powered/seedvault) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm index 9c6403deaf1..d528e42a619 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm @@ -79,9 +79,8 @@ }, /area/ruin/space/abandoned_engi_sat) "cK" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/effect/spawner/random_spawners/wall_rusted_probably, /turf/simulated/wall, @@ -243,9 +242,8 @@ /turf/simulated/floor/carpet/airless, /area/ruin/space/abandoned_engi_sat) "hE" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/template_noop, /area/template_noop) @@ -927,9 +925,8 @@ }, /area/ruin/space/abandoned_engi_sat) "De" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/effect/spawner/random_spawners/wall_rusted_always, /turf/simulated/wall/r_wall, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm index 610d51e3c23..4a808d0dbe3 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm @@ -645,17 +645,15 @@ /turf/simulated/floor/plating, /area/ruin/space/unpowered) "by" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/wall/r_wall, /area/ruin/space/unpowered) "bz" = ( /obj/machinery/space_heater, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/light{ dir = 8 diff --git a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm index b91380534d3..6a22394fcae 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm @@ -1214,9 +1214,8 @@ }, /area/ruin/unpowered/BMPship/Midship) "dZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -1365,9 +1364,8 @@ }, /area/ruin/unpowered/BMPship/Midship) "es" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -1640,9 +1638,8 @@ /turf/simulated/floor/plating, /area/ruin/unpowered/BMPship/Midship) "fh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -1718,9 +1715,8 @@ /turf/simulated/floor/plating, /area/ruin/unpowered/BMPship/Midship) "fs" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "bar" diff --git a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm index 41eef9d8d15..89dd8083a44 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm @@ -578,9 +578,8 @@ /turf/simulated/floor/plasteel, /area/ruin/space/onehalf/drone_bay) "br" = ( -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-y" +/obj/structure/disposalpipe/junction/y{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/ruin/space/onehalf/drone_bay) @@ -677,9 +676,8 @@ /turf/simulated/floor/plasteel, /area/ruin/space/onehalf/drone_bay) "bF" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/ruin/space/onehalf/drone_bay) @@ -862,9 +860,8 @@ /turf/simulated/floor/plating, /area/ruin/space/onehalf/abandonedbridge) "cp" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/structure/table, /obj/item/paper_bin, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm index 90f121818c8..83a335cc9b1 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm @@ -30,9 +30,8 @@ /turf/simulated/floor/plating, /area/ruin/space/syndicate_druglab) "gU" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/pod/dark, /area/ruin/space/syndicate_druglab) @@ -180,9 +179,8 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plating, /area/ruin/space/syndicate_druglab) @@ -315,9 +313,8 @@ /area/ruin/space/syndicate_druglab) "II" = ( /obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plating, /area/ruin/space/syndicate_druglab) @@ -336,9 +333,8 @@ /area/ruin/space/syndicate_druglab) "LQ" = ( /obj/effect/turf_decal/stripes/corner, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plating, /area/ruin/space/syndicate_druglab) diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 23d8a8d4b22..73f571166df 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -1285,9 +1285,8 @@ }, /area/station/security/brig) "agN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -1433,9 +1432,8 @@ }, /area/station/security/main) "ahj" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -2093,9 +2091,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -2414,9 +2411,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "darkredcorners" @@ -2480,9 +2476,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/extinguisher_cabinet{ name = "south bump"; @@ -3972,9 +3967,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/security/storage) @@ -3984,9 +3978,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/station/security/storage) @@ -4569,22 +4562,6 @@ icon_state = "dark" }, /area/station/command/office/hos) -"apX" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/station/command/office/hos) "apY" = ( /obj/structure/bed, /obj/machinery/light/small{ @@ -6601,9 +6578,8 @@ /turf/simulated/floor/plasteel, /area/station/security/lobby) "awb" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable{ d1 = 1; @@ -6985,9 +6961,8 @@ }, /area/station/security/brig) "axx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -9112,9 +9087,8 @@ pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -9415,9 +9389,8 @@ /turf/simulated/floor/carpet, /area/station/security/detective) "aEq" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -9476,9 +9449,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -9771,9 +9743,8 @@ /area/station/legal/magistrate) "aFr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -10187,9 +10158,8 @@ /obj/machinery/camera{ c_tag = "Brig Detective's Office" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -10215,9 +10185,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -10980,9 +10949,8 @@ /turf/simulated/floor/carpet, /area/station/legal/courtroom) "aJj" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -11281,9 +11249,8 @@ /turf/simulated/floor/wood, /area/station/service/clown) "aKo" = ( -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore) @@ -12473,18 +12440,16 @@ }, /area/station/hallway/primary/fore) "aNM" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, /area/station/legal/courtroom/gallery) "aNN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/legal/courtroom/gallery) @@ -13213,9 +13178,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -13227,9 +13191,7 @@ name = "north bump"; pixel_y = 28 }, -/obj/structure/disposalpipe/junction{ - icon_state = "pipe-y" - }, +/obj/structure/disposalpipe/junction/y, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -13402,9 +13364,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aQQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable{ d1 = 4; @@ -13638,9 +13599,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aRs" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable{ d1 = 4; @@ -14045,9 +14005,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "arrival" @@ -14076,9 +14035,8 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/public/dorms) @@ -14151,9 +14109,8 @@ }, /area/station/hallway/primary/fore) "aSV" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) @@ -14409,9 +14366,8 @@ /turf/simulated/floor/wood, /area/station/public/dorms) "aTH" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) @@ -15492,9 +15448,8 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -15676,9 +15631,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -16099,9 +16053,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aYd" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -16255,9 +16208,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable{ d1 = 2; @@ -16389,9 +16341,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -17026,9 +16977,8 @@ }, /area/station/hallway/primary/fore) "baJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -17057,9 +17007,8 @@ /turf/simulated/floor/wood, /area/station/service/bar) "baS" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -17107,9 +17056,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 4 }, /obj/structure/cable{ d1 = 1; @@ -17382,9 +17330,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bbU" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/structure/cable{ d1 = 4; @@ -17433,9 +17380,8 @@ }, /area/station/public/dorms) "bcg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -17454,16 +17400,14 @@ /area/station/service/library) "bci" = ( /obj/structure/chair/office/dark, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/wood, /area/station/service/library) "bcj" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/wood, /area/station/service/library) @@ -17532,9 +17476,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -18430,16 +18373,14 @@ /turf/simulated/floor/wood, /area/station/service/bar) "beJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "beM" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/effect/landmark/spawner/nukedisc_respawn, /turf/simulated/floor/plating, @@ -18496,9 +18437,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/station/public/dorms) @@ -18722,9 +18662,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -18933,9 +18872,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -19842,9 +19780,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -19860,9 +19797,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -20157,9 +20093,8 @@ }, /area/station/service/kitchen) "biV" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/structure/cable{ d1 = 1; @@ -20191,9 +20126,8 @@ }, /area/station/public/dorms) "biY" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/structure/cable{ d1 = 2; @@ -20277,9 +20211,8 @@ /turf/simulated/floor/wood, /area/station/service/bar) "bjk" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -20321,9 +20254,8 @@ }, /area/station/service/chapel) "bjt" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -20510,9 +20442,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -20608,9 +20539,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/port/east) "bkh" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/port/west) @@ -20619,9 +20549,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/port/west) "bkj" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -22515,9 +22444,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -22535,9 +22463,8 @@ /turf/simulated/floor/plating, /area/station/public/storage/emergency/port) "bpj" = ( -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-y" +/obj/structure/disposalpipe/junction/y{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/port/east) @@ -22739,9 +22666,8 @@ /turf/simulated/floor/grass, /area/station/service/hydroponics) "bpI" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -22815,9 +22741,8 @@ /turf/simulated/floor/carpet, /area/station/public/mrchangs) "bpS" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -23057,9 +22982,8 @@ /turf/simulated/floor/plating, /area/station/public/storage/emergency/port) "bqB" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable{ d1 = 1; @@ -23962,9 +23886,8 @@ /turf/simulated/floor/wood, /area/station/service/library) "btm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/chair/wood/wings, /turf/simulated/floor/wood, @@ -24014,9 +23937,8 @@ /turf/simulated/floor/wood, /area/station/service/bar) "btx" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/chair/wood/wings{ dir = 4 @@ -24138,9 +24060,8 @@ }, /area/station/service/kitchen) "btN" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -24578,9 +24499,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/carpet, /area/station/service/library) @@ -24865,9 +24785,8 @@ /turf/simulated/wall/r_wall, /area/station/turret_protected/ai_upload) "bvZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable{ d1 = 4; @@ -24907,9 +24826,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -24977,9 +24895,8 @@ }, /area/station/service/kitchen) "bwp" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -25153,9 +25070,8 @@ /area/station/hallway/secondary/entry/south) "bwZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/structure/cable{ d1 = 4; @@ -25760,9 +25676,8 @@ pixel_x = 4; pixel_y = 3 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -27132,9 +27047,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, @@ -27703,9 +27617,8 @@ /turf/simulated/floor/plasteel, /area/station/public/storage/tools/auxiliary) "bGU" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -27864,9 +27777,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) @@ -27915,9 +27827,8 @@ /area/station/medical/paramedic) "bHM" = ( /obj/effect/turf_decal/delivery/red, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plating, /area/station/medical/morgue) @@ -28189,9 +28100,8 @@ /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "bII" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -28614,9 +28524,8 @@ }, /area/station/medical/reception) "bKc" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/chair/stool{ dir = 8 @@ -29031,9 +28940,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 1 @@ -29151,9 +29059,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/structure/cable{ d1 = 1; @@ -29604,9 +29511,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/supply/office) @@ -29670,9 +29576,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable{ d1 = 1; @@ -29988,9 +29893,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "blue" @@ -30205,9 +30109,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/station/supply/storage) @@ -30254,9 +30157,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/station/supply/office) @@ -31182,9 +31084,8 @@ /turf/simulated/floor/plasteel, /area/station/supply/office) "bTG" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -31560,9 +31461,8 @@ "bVo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-y" +/obj/structure/disposalpipe/junction/y{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -31600,9 +31500,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "bVA" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/light_switch{ dir = 4; @@ -31824,9 +31723,8 @@ }, /area/station/medical/sleeper) "bWn" = ( -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 8 }, /obj/structure/cable{ d1 = 2; @@ -31918,9 +31816,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -32049,9 +31946,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable{ d1 = 2; @@ -32092,9 +31988,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable{ d1 = 4; @@ -32213,9 +32108,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -32873,9 +32767,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/structure/cable{ d1 = 4; @@ -32904,9 +32797,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -32919,9 +32811,8 @@ /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "bZW" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -33182,9 +33073,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -33244,9 +33134,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" @@ -33382,9 +33271,8 @@ }, /area/station/supply/miningdock) "cbN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -33545,9 +33433,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -33555,9 +33442,8 @@ }, /area/station/medical/medbay2) "ccg" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -33900,9 +33786,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -34143,9 +34028,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/firealarm{ dir = 1; @@ -34184,9 +34068,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -34221,9 +34104,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/south) "cez" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -34736,9 +34618,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 1 }, /obj/structure/cable{ d1 = 1; @@ -35604,9 +35485,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/south) "cjk" = ( -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/south) @@ -35635,9 +35515,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) @@ -35670,9 +35549,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) @@ -36505,9 +36383,8 @@ /area/station/maintenance/aft) "cmA" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -36805,9 +36682,8 @@ "cnQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -37557,9 +37433,8 @@ dir = 1; pixel_x = -8 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/light_switch{ dir = 1; @@ -37744,9 +37619,8 @@ }, /area/station/medical/surgery/observation) "cry" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "blue" @@ -38295,9 +38169,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "darkbluefull" @@ -38320,9 +38193,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-y" +/obj/structure/disposalpipe/junction/y{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "darkbluefull" @@ -38610,9 +38482,8 @@ layer = 4; pixel_x = -32 }, -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -38674,9 +38545,8 @@ }, /area/station/medical/surgery/observation) "cuk" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -38714,9 +38584,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "bluefull" @@ -39643,9 +39512,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) @@ -40236,9 +40104,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -40302,9 +40169,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -40390,9 +40256,8 @@ }, /area/station/medical/surgery/observation) "czP" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/wall/r_wall, /area/station/maintenance/incinerator) @@ -40454,9 +40319,8 @@ }, /area/station/medical/surgery/observation) "czZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "blue" @@ -40573,9 +40437,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -41020,9 +40883,8 @@ "cBD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/structure/cable{ d1 = 1; @@ -41474,9 +41336,8 @@ name = "west bump"; pixel_x = -28 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -42011,9 +41872,8 @@ }, /area/station/hallway/primary/aft/south) "cFt" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -42059,9 +41919,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" @@ -43036,9 +42895,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -43065,9 +42923,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -43091,9 +42948,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel, @@ -43367,9 +43223,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "cJO" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/effect/spawner/random_spawners/oil_maybe, /turf/simulated/floor/plating, @@ -44980,9 +44835,8 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable{ d1 = 2; @@ -45547,9 +45401,8 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -46108,9 +45961,8 @@ }, /area/station/engineering/atmos) "cTi" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/structure/cable{ d1 = 4; @@ -46550,9 +46402,8 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "cUA" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -46737,9 +46588,8 @@ /turf/simulated/floor/engine, /area/station/engineering/control) "cVs" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable{ d1 = 2; @@ -47015,9 +46865,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -48329,9 +48178,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -48500,9 +48348,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/maintenance/aft) @@ -48674,9 +48521,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/cable{ @@ -48946,9 +48792,8 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "ddB" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) @@ -49077,9 +48922,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) @@ -50554,9 +50398,8 @@ /turf/simulated/floor/plating, /area/station/engineering/secure_storage) "djt" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ @@ -50582,9 +50425,8 @@ c_tag = "Hydroponics Pasture" }, /obj/machinery/hydroponics/soil, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/grass, /area/station/service/hydroponics) @@ -53137,9 +52979,8 @@ /area/station/engineering/atmos) "dsP" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -53665,9 +53506,8 @@ }, /area/station/science/robotics) "dDR" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -54094,9 +53934,7 @@ }, /area/station/hallway/primary/aft/south) "dMD" = ( -/obj/structure/disposalpipe/junction{ - icon_state = "pipe-y" - }, +/obj/structure/disposalpipe/junction/y, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "dMJ" = ( @@ -54230,9 +54068,8 @@ /turf/simulated/floor/engine, /area/station/science/xenobiology) "dRb" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/alarm{ dir = 1; @@ -54357,9 +54194,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -55427,9 +55263,8 @@ }, /area/station/public/sleep) "eog" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/public/dorms) @@ -55624,9 +55459,8 @@ /area/station/engineering/control) "esK" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plating, /area/station/maintenance/disposal) @@ -55777,9 +55611,8 @@ icon_state = "1-8" }, /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) @@ -56183,9 +56016,8 @@ /obj/item/storage/box/gloves{ pixel_y = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -56602,17 +56434,15 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "eSn" = ( /obj/structure/table, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 8 }, /obj/structure/cable{ d1 = 4; @@ -56680,6 +56510,21 @@ icon_state = "white" }, /area/station/maintenance/aft) +"eVU" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment/corner{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/command/office/hos) "eWc" = ( /obj/structure/cable{ d1 = 1; @@ -57194,9 +57039,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - icon_state = "pipe-j2s"; name = "Med. CMO"; sort_type_txt = "10" }, @@ -57982,9 +57826,8 @@ }, /area/station/service/hydroponics) "fyL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable{ d1 = 2; @@ -58270,9 +58113,8 @@ /area/station/science/toxins/launch) "fDM" = ( /obj/effect/spawner/random_spawners/cobweb_right_rare, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 @@ -58552,9 +58394,8 @@ }, /area/station/science/toxins/mixing) "fMi" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -58838,9 +58679,8 @@ }, /area/station/science/hallway) "fTS" = ( -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/station/supply/lobby) @@ -59144,9 +58984,8 @@ /obj/structure/railing{ dir = 8 }, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - icon_state = "pipe-j2s"; name = "Eng Chief Engineer's Office"; sort_type_txt = "5" }, @@ -59279,25 +59118,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/aft2) -"gfh" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/command/bridge) "gfi" = ( /obj/structure/cable{ d1 = 2; @@ -59648,9 +59468,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -60696,9 +60515,8 @@ /turf/simulated/floor/plasteel, /area/station/public/dorms) "gOB" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/structure/cable{ d1 = 1; @@ -60928,9 +60746,8 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -61676,9 +61493,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -62520,11 +62336,10 @@ /area/station/science/genetics) "hIR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; name = "Sorting Office"; - sort_type_txt = "2"; - icon_state = "pipe-j2s" + sort_type_txt = "2" }, /turf/simulated/floor/plasteel, /area/station/supply/sorting) @@ -62667,9 +62482,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -62856,11 +62670,10 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; name = "QM Office"; - sort_type_txt = "3"; - icon_state = "pipe-j2s" + sort_type_txt = "3" }, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) @@ -62896,31 +62709,6 @@ }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) -"hRP" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "blue" - }, -/area/station/command/bridge) "hSA" = ( /obj/structure/cable{ d1 = 1; @@ -62946,9 +62734,8 @@ }, /area/station/medical/medbay) "hTA" = ( -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 8 }, /obj/structure/cable{ d1 = 1; @@ -63220,9 +63007,8 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/port) "ibl" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/structure/cable{ d1 = 4; @@ -64754,9 +64540,8 @@ /turf/simulated/floor/grass/jungle/no_creep, /area/station/command/bridge) "iRC" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -65137,9 +64922,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "barber" @@ -65151,9 +64935,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - icon_state = "pipe-j2s"; name = "Sci Robotics"; sort_type_txt = "14" }, @@ -65440,6 +65223,25 @@ icon_state = "whitecorner" }, /area/station/maintenance/aft) +"jiQ" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/command/bridge) "jje" = ( /turf/simulated/wall, /area/station/hallway/secondary/entry/south) @@ -66669,9 +66471,8 @@ /turf/simulated/floor/plasteel, /area/station/public/dorms) "jPY" = ( -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - icon_state = "pipe-j2s"; name = "Engineering Main"; sort_type_txt = "4" }, @@ -67285,9 +67086,8 @@ /turf/simulated/floor/carpet, /area/station/command/office/captain/bedroom) "kfn" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -67606,9 +67406,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -67625,9 +67424,8 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -67635,9 +67433,8 @@ /obj/structure/chair{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) @@ -67744,22 +67541,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) -"kpz" = ( -/obj/machinery/power/apc/directional/east, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurple" - }, -/area/station/science/genetics) "kpR" = ( /obj/structure/rack, /obj/item/wrench, @@ -67919,9 +67700,8 @@ /turf/simulated/floor/grass/jungle/no_creep, /area/station/command/bridge) "ktW" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -68747,9 +68527,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - icon_state = "pipe-j2s"; name = "Sci R&D"; sort_type_txt = "12" }, @@ -69183,9 +68962,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - icon_state = "pipe-j2s"; name = "Sci Robotics"; sort_type_txt = "14" }, @@ -69538,9 +69316,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -69684,9 +69461,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -69806,6 +69582,31 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) +"lpq" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "blue" + }, +/area/station/command/bridge) "lpu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -70500,9 +70301,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/science/hallway) @@ -71289,9 +71089,8 @@ "mar" = ( /obj/structure/grille/broken, /obj/effect/decal/cleanable/generic, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/structure/cable{ d1 = 1; @@ -71723,9 +71522,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/effect/landmark/start/scientist, /turf/simulated/floor/plasteel{ @@ -71746,9 +71544,8 @@ }, /area/station/security/processing) "mkt" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -71949,9 +71746,8 @@ name = "east bump"; pixel_x = 24 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/table, /turf/simulated/floor/plasteel{ @@ -72191,9 +71987,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "mxP" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -72868,9 +72663,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "mNS" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -73076,9 +72870,8 @@ }, /area/station/hallway/secondary/exit) "mSN" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/structure/cable{ d1 = 1; @@ -73356,9 +73149,8 @@ "ncf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -73465,9 +73257,8 @@ /turf/simulated/floor/noslip, /area/station/engineering/control) "ngD" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -73616,9 +73407,8 @@ /area/station/supply/storage) "noP" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) @@ -74324,6 +74114,21 @@ icon_state = "white" }, /area/station/medical/patients_rooms_secondary) +"nFr" = ( +/obj/machinery/power/apc/directional/east, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/disposalpipe/segment/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurple" + }, +/area/station/science/genetics) "nFG" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -74974,9 +74779,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/engine{ icon_state = "rampbottom"; @@ -75484,9 +75288,8 @@ "oiL" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 4 }, /obj/machinery/alarm{ dir = 1; @@ -75536,9 +75339,8 @@ /obj/structure/railing{ dir = 8 }, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - icon_state = "pipe-j2s"; name = "Eng Atmospherics"; sort_type_txt = "6" }, @@ -76140,9 +75942,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/storage) "ouM" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft/south) @@ -76163,9 +75964,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -76425,9 +76225,8 @@ /turf/simulated/floor/engine/o2, /area/station/engineering/atmos) "oCj" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/structure/cable{ d1 = 1; @@ -76885,9 +76684,8 @@ dir = 4; id = "packageSort2" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plating, /area/station/supply/sorting) @@ -77023,9 +76821,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/station/public/dorms) @@ -77139,9 +76936,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -77573,9 +77369,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/structure/cable{ d1 = 1; @@ -78414,9 +78209,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -78454,9 +78248,8 @@ }, /area/station/hallway/secondary/exit) "pBj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -79445,9 +79238,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/public/dorms) @@ -79638,9 +79430,8 @@ }, /area/station/hallway/secondary/entry/north) "qhL" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/structure/cable{ d1 = 1; @@ -80213,9 +80004,8 @@ dir = 8 }, /obj/machinery/economy/vending/cola, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -80307,9 +80097,8 @@ "qus" = ( /obj/structure/table, /obj/item/toy/figure/crew/cargotech, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/station/supply/sorting) @@ -80666,9 +80455,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -80951,9 +80739,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -81006,9 +80793,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/station/science/toxins/mixing) @@ -81614,9 +81400,8 @@ dir = 1; id = "packageSort1" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plating, /area/station/supply/sorting) @@ -81886,9 +81671,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -82399,9 +82183,8 @@ /area/station/maintenance/apmaint) "rrh" = ( /obj/machinery/light/small, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -82813,9 +82596,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - icon_state = "pipe-j2s"; name = "Library"; sort_type_txt = "16" }, @@ -83191,9 +82973,8 @@ /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/meter, /turf/simulated/floor/plasteel{ @@ -83481,9 +83262,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -83961,9 +83741,8 @@ }, /area/station/maintenance/apmaint) "sjK" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/south) @@ -84416,9 +84195,8 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/port) "svS" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" @@ -84669,9 +84447,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -85183,9 +84960,8 @@ dir = 5 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/station/maintenance/disposal) @@ -85295,9 +85071,8 @@ /turf/simulated/wall, /area/station/medical/coldroom) "sUy" = ( -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 8 }, /obj/structure/cable{ d1 = 4; @@ -85444,9 +85219,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/cable{ d1 = 2; @@ -85558,9 +85332,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - icon_state = "pipe-j2s"; name = "Sci RD Office 1"; sort_type_txt = "13" }, @@ -85570,9 +85343,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -86766,9 +86538,8 @@ "tJA" = ( /obj/structure/table, /obj/item/reagent_containers/glass/beaker/large, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" @@ -86941,9 +86712,8 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/wood, /area/station/medical/psych) @@ -87705,9 +87475,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "udW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /obj/structure/girder, /turf/simulated/floor/plating, @@ -87881,9 +87650,8 @@ }, /area/station/engineering/hardsuitstorage) "ukw" = ( -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - icon_state = "pipe-j2s"; name = "Genetics"; sort_type_txt = "23" }, @@ -87908,9 +87676,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/nw) @@ -88119,9 +87886,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -88189,9 +87955,8 @@ /area/station/engineering/smes) "urU" = ( /obj/effect/spawner/lootdrop/maintenance, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) @@ -88379,9 +88144,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" @@ -88823,9 +88587,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" @@ -88839,9 +88602,8 @@ /turf/simulated/floor/wood, /area/station/security/permabrig) "uLU" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -89589,9 +89351,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/sortjunction/reversed{ dir = 4; - icon_state = "pipe-j2s"; name = "Chapel"; sort_type_txt = "17" }, @@ -91272,9 +91033,8 @@ /area/station/public/storage/tools/auxiliary) "vXu" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/station/maintenance/assembly_line) @@ -91365,9 +91125,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft/south) @@ -91474,9 +91233,8 @@ /turf/simulated/floor/plasteel, /area/station/command/bridge) "wbT" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/station/supply/sorting) @@ -91699,9 +91457,8 @@ dir = 1 }, /obj/effect/spawner/lootdrop/maintenance, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -91819,9 +91576,8 @@ /area/station/maintenance/port) "wlJ" = ( /obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 8 }, /obj/machinery/door/airlock/security/glass{ id_tag = "BrigRight"; @@ -92145,9 +91901,8 @@ }, /area/station/security/prison/cell_block/A) "wuf" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -92433,9 +92188,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "wCs" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) @@ -92812,9 +92566,8 @@ /area/station/engineering/tech_storage) "wLp" = ( /obj/machinery/light, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -94548,9 +94301,8 @@ /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "xHA" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 5 @@ -95119,9 +94871,8 @@ /area/station/medical/surgery/primary) "xTR" = ( /obj/effect/landmark/start/shaft_miner, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, @@ -95298,9 +95049,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "xWq" = ( -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) @@ -95362,9 +95112,8 @@ /obj/structure/railing{ dir = 8 }, -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction/reversed{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -95553,9 +95302,8 @@ }, /area/station/security/permabrig) "ycb" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment/corner{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -123419,13 +123167,13 @@ bmc bmc kmo fvb -gfh +jiQ xil nPG tNG rFW lwI -hRP +lpq qQd gWO xxI @@ -131852,7 +131600,7 @@ amu and aeW aoT -apX +eVU lBq ari aiZ @@ -141188,7 +140936,7 @@ cbd npb oGB uqy -kpz +nFr bIA bWg aaa diff --git a/tools/UpdatePaths/Scripts/24249_junction.txt b/tools/UpdatePaths/Scripts/24249_junction.txt new file mode 100644 index 00000000000..9229039d878 --- /dev/null +++ b/tools/UpdatePaths/Scripts/24249_junction.txt @@ -0,0 +1,4 @@ +/obj/structure/disposalpipe/segment{icon_state="pipe-c"} : /obj/structure/disposalpipe/segment/corner{@OLD;icon_state=@SKIP} +/obj/structure/disposalpipe/junction{icon_state="pipe-j2"} : /obj/structure/disposalpipe/junction/reversed{@OLD;icon_state=@SKIP} +/obj/structure/disposalpipe/junction{icon_state="pipe-y"} : /obj/structure/disposalpipe/junction/y{@OLD;icon_state=@SKIP} +/obj/structure/disposalpipe/sortjunction{icon_state="pipe-j2s"} : /obj/structure/disposalpipe/sortjunction/reversed{@OLD;icon_state=@SKIP} \ No newline at end of file