From 4405d3ed3d9be004104dc27dc86f25f9fa51c817 Mon Sep 17 00:00:00 2001 From: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Date: Wed, 30 Apr 2025 01:44:47 +0200 Subject: [PATCH] Fixes a disposals loop on Catwalk's bridge (#90893) ## About The Pull Request - Closes #90885 ![image](https://github.com/user-attachments/assets/054e4441-11b9-463f-909a-b775398c48ec) ## Changelog :cl: fix: Fixed a disposals loop on Catwalk's bridge /:cl: --- .../CatwalkStation/CatwalkStation_2023.dmm | 156 ++++++++++-------- 1 file changed, 88 insertions(+), 68 deletions(-) diff --git a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm index 4bc8159821c..0b3e0b54c9c 100644 --- a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm +++ b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm @@ -1627,7 +1627,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/blue/filled/mid_joiner, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/secondary/command) "aBp" = ( @@ -2626,9 +2628,6 @@ }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/secondary/command) "aRa" = ( @@ -2752,6 +2751,17 @@ /obj/structure/window/spawner/directional/west, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"aTL" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/mid_joiner, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/hallway/secondary/command) "aTS" = ( /obj/structure/table, /obj/item/wrench{ @@ -4014,19 +4024,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) -"bnC" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/dark/smooth_large, -/area/station/hallway/secondary/command) "bnF" = ( /obj/structure/reagent_dispensers/wall/peppertank/directional/north, /obj/effect/turf_decal/stripes/end, @@ -5010,6 +5007,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/blue/filled/mid_joiner, /obj/effect/mapping_helpers/airlock/access/all/command/general, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/secondary/command) "bBV" = ( @@ -8336,7 +8336,6 @@ pixel_y = 8 }, /obj/effect/landmark/start/head_of_personnel, -/obj/structure/disposalpipe/segment, /turf/open/floor/carpet, /area/station/command/heads_quarters/hop) "czk" = ( @@ -10890,6 +10889,18 @@ /obj/item/binoculars, /turf/open/floor/plating/airless, /area/station/maintenance/starboard/lesser) +"dnR" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/mid_joiner, +/obj/machinery/camera/autoname/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/hallway/secondary/command) "dnW" = ( /obj/effect/spawner/random/structure/chair_maintenance, /turf/open/floor/plating, @@ -11911,6 +11922,20 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/plating, /area/station/commons/toilet/auxiliary) +"dEn" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/mid_joiner, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/hallway/secondary/command) "dEs" = ( /obj/structure/railing{ dir = 8 @@ -12688,6 +12713,7 @@ "dPG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/structure/disposalpipe/segment, /turf/open/floor/carpet, /area/station/command/heads_quarters/hop) "dPP" = ( @@ -13741,6 +13767,15 @@ /obj/effect/landmark/start/depsec/science, /turf/open/openspace, /area/station/security/checkpoint/science) +"ees" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, +/turf/open/floor/iron/large, +/area/station/hallway/primary/central) "eeA" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -17715,6 +17750,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/structure/disposalpipe/segment, /turf/open/floor/carpet, /area/station/command/heads_quarters/hop) "frP" = ( @@ -17917,6 +17953,20 @@ /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/iron/dark, /area/station/hallway/secondary/construction) +"fuy" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/mid_joiner, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/hallway/secondary/command) "fuI" = ( /obj/structure/closet/secure_closet/atmospherics, /obj/item/book/manual/wiki/atmospherics, @@ -22059,9 +22109,6 @@ dir = 1 }, /obj/machinery/airalarm/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/secondary/command) "gGl" = ( @@ -23766,8 +23813,8 @@ dir = 1 }, /obj/structure/cable, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 9 }, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/secondary/command) @@ -25488,9 +25535,6 @@ department = "Head of Personnel's Desk"; name = "Head of Personnel's Requests Console" }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /obj/effect/mapping_helpers/requests_console/announcement, /obj/effect/mapping_helpers/requests_console/assistance, /obj/effect/mapping_helpers/requests_console/information, @@ -39261,7 +39305,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, /obj/effect/spawner/random/engineering/tracking_beacon, /obj/effect/landmark/navigate_destination/bridge, /turf/open/floor/iron/dark/smooth_large, @@ -42939,19 +42982,6 @@ "mSd" = ( /turf/closed/wall, /area/station/commons/lounge) -"mSm" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/machinery/status_display/evac/directional/north, -/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/hallway/secondary/command) "mSq" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -51652,6 +51682,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/structure/disposalpipe/segment, /turf/open/floor/carpet, /area/station/command/heads_quarters/hop) "pzy" = ( @@ -56495,7 +56526,6 @@ /obj/machinery/photocopier, /obj/machinery/light_switch/directional/south, /obj/machinery/camera/autoname/directional/south, -/obj/structure/disposalpipe/segment, /turf/open/floor/carpet, /area/station/command/heads_quarters/hop) "qYi" = ( @@ -56850,6 +56880,9 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/secondary/command) "rdq" = ( @@ -59878,7 +59911,7 @@ /obj/machinery/computer/records/security, /obj/structure/cable, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 6 }, /turf/open/floor/carpet, /area/station/command/heads_quarters/hop) @@ -78755,7 +78788,6 @@ pixel_y = 4 }, /obj/structure/cable, -/obj/structure/disposalpipe/segment, /turf/open/floor/carpet, /area/station/command/heads_quarters/hop) "xKm" = ( @@ -80261,18 +80293,6 @@ }, /turf/open/openspace, /area/station/maintenance/port/aft) -"ygt" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ - dir = 1 - }, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/hallway/secondary/command) "ygy" = ( /obj/structure/cable, /turf/closed/wall/r_wall, @@ -111775,7 +111795,7 @@ cyX xKl qYd ltm -ygt +kRk kWR iWk vHo @@ -112289,7 +112309,7 @@ xSk vJz oJi vzB -bnC +qhq ojx ecw fwP @@ -112546,7 +112566,7 @@ wmy rmg ghm vzB -mSm +gDG lWc ecw lll @@ -113319,7 +113339,7 @@ qQd qQd fDb eIm -qae +fuy uoF fkp lKk @@ -113576,7 +113596,7 @@ hqh pZX gDG lkt -qae +fuy lll lll iis @@ -114090,7 +114110,7 @@ kPF mrO qcB eZA -qae +fuy fwP sjC iis @@ -114347,7 +114367,7 @@ vKL pZX jlB kWR -hnF +dnR aWV aWV aWV @@ -114604,7 +114624,7 @@ ckd pZX gyq wXk -hMd +aTL aWV bCC lZn @@ -114861,7 +114881,7 @@ hJm pZX jlB kWR -hMd +aTL aWV xNB qnt @@ -115375,7 +115395,7 @@ ckd pZX xms qzo -qae +fuy aWV bzS eAg @@ -115632,7 +115652,7 @@ nhG pZX rFL ioc -ecw +dEn aWV bIp mIq @@ -116146,7 +116166,7 @@ ijm fLr fLr fLr -fom +pzy fLr fLr wZy @@ -116403,7 +116423,7 @@ mlq cib cib cib -cib +ees cib cib cib