From 685a196adc05ee0786625b35261f0caed9e102ec Mon Sep 17 00:00:00 2001 From: ppi13 Date: Sun, 14 Jan 2024 14:01:57 +0100 Subject: [PATCH] Fixes disposals in security meta (#23346) Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> --- _maps/map_files/MetaStation/MetaStation.dmm | 167 +++++++++++--------- 1 file changed, 90 insertions(+), 77 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index b8adc1ddba7..75ab22a498f 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1271,6 +1271,10 @@ pixel_x = -24 }, /obj/structure/closet/crate/can, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "black" @@ -3425,6 +3429,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/security/brig) "avr" = ( @@ -5357,6 +5362,7 @@ name = "west bump"; pixel_x = -28 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/security/brig) "aCw" = ( @@ -6467,9 +6473,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/station/security/brig) "aGX" = ( @@ -32137,15 +32140,6 @@ icon_state = "green" }, /area/station/service/hydroponics) -"ceq" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 4; - icon_state = "pipe-j2s"; - name = "HoS Junction"; - sort_type_txt = "7" - }, -/turf/simulated/floor/plasteel, -/area/station/security/brig) "cer" = ( /obj/structure/window/reinforced{ dir = 8 @@ -46241,6 +46235,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/station/security/brig) +"djR" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel, +/area/station/security/brig) "djU" = ( /obj/structure/bed, /obj/item/clothing/suit/straight_jacket, @@ -47340,6 +47343,18 @@ /obj/machinery/atmospherics/binary/valve/open, /turf/simulated/floor/plating, /area/station/maintenance/xenobio_north) +"dNt" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plasteel, +/area/station/security/brig) "dNU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -48128,6 +48143,7 @@ name = "east bump"; pixel_x = 27 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/security/brig) "efd" = ( @@ -52883,9 +52899,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -53207,6 +53220,9 @@ }, /area/station/science/toxins/launch) "glS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "black" @@ -53732,9 +53748,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -58418,6 +58431,10 @@ /area/station/public/vacant_office) "iwm" = ( /obj/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -65920,6 +65937,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "black" @@ -66711,10 +66731,16 @@ name = "west bump"; pixel_x = -24 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/security/brig) "maV" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + icon_state = "pipe-j2s"; + name = "Security Junction"; + sort_type_txt = "8" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "black" @@ -68779,6 +68805,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -69709,10 +69736,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, /turf/simulated/floor/plasteel, /area/station/security/brig) "nlw" = ( @@ -70921,11 +70944,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/fore) -"nNq" = ( -/turf/simulated/floor/plasteel{ - icon_state = "redcorner" - }, -/area/station/security/brig) "nOA" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -71789,12 +71807,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/sortjunction{ - dir = 4; - icon_state = "pipe-j2s"; - name = "Security Junction"; - sort_type_txt = "8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -79776,6 +79788,7 @@ c_tag = "Brig - Hallway - Starboard"; dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/security/brig) "rIj" = ( @@ -85122,11 +85135,9 @@ /turf/simulated/floor/carpet, /area/station/service/library) "ugy" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 4; - icon_state = "pipe-j2s"; - name = "Security Junction"; - sort_type_txt = "8" +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, /turf/simulated/floor/plasteel, /area/station/security/brig) @@ -85351,6 +85362,7 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -85759,6 +85771,9 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -86012,6 +86027,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -86971,6 +86987,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/security/brig) "uYo" = ( @@ -88728,6 +88745,10 @@ pixel_y = 32 }, /obj/structure/chair/stool, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "black" @@ -89091,6 +89112,7 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/security/brig) "vWq" = ( @@ -89983,12 +90005,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/sortjunction{ + dir = 2; + icon_state = "pipe-j2s"; + name = "HoS Junction"; + sort_type_txt = "7" + }, /turf/simulated/floor/plasteel, /area/station/security/brig) "wtm" = ( @@ -90734,15 +90759,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/aft2) -"wKS" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/station/security/brig) "wLt" = ( /obj/structure/sign/biohazard, /turf/simulated/wall/r_wall, @@ -92111,10 +92127,6 @@ }, /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/machinery/power/apc{ dir = 4; name = "east bump"; @@ -92124,6 +92136,7 @@ d2 = 2; icon_state = "0-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/security/brig) "xoP" = ( @@ -92615,10 +92628,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/security/brig) "xAI" = ( @@ -93454,6 +93464,9 @@ name = "south bump"; pixel_y = -28 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/security/brig) "xVd" = ( @@ -122340,13 +122353,13 @@ amx amx amx amx -apP -liR +wRx +djR aCu maC -apP +oSi uYf -apP +oSi xAz ugy apP @@ -122591,21 +122604,21 @@ aSm aqd aSm alm -wRx oSi oSi oSi oSi oSi oSi -wKS -oSi -oSi -oSi -oSi -oSi +ugy +liR +apP +apP +apP +apP +apP nls -ceq +apP apP apP apP @@ -122849,11 +122862,11 @@ uQU uOh glS aGV -sQt -sQt -sQt -sQt -sQt +dNt +xkX +xkX +xkX +xkX mVB ule uFZ @@ -123363,7 +123376,7 @@ gRG oXw maV oiX -nNq +aFz iBR hlN eVZ