From aa0f2268a5e5b196ebeb19ecac00f1dc8213aec8 Mon Sep 17 00:00:00 2001 From: Zack Date: Mon, 5 Aug 2024 21:15:58 -0500 Subject: [PATCH] Adds a disposal chute to the command meeting room on delta station (#26016) * trash chute * some random disposal pipe * pipe * Fixed what S34NW suggested I hope * Ahh found it * Update deltastation.dmm * random pipe --- _maps/map_files/stations/deltastation.dmm | 164 ++++++++++++++++------ 1 file changed, 123 insertions(+), 41 deletions(-) diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 4348423afb9..45e8fc59931 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -15494,6 +15494,9 @@ name = "north bump"; pixel_y = 24 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/wood, /area/station/command/meeting_room) "aXI" = ( @@ -22425,28 +22428,6 @@ }, /turf/simulated/floor/plasteel/grimy, /area/station/service/library) -"bpT" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/station/hallway/primary/central/west) "bpU" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ @@ -25660,6 +25641,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -26870,6 +26852,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -26912,6 +26897,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bCn" = ( @@ -26942,6 +26930,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment/corner{ + dir = 2 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bCp" = ( @@ -27711,6 +27702,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, @@ -27842,6 +27836,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -27869,6 +27864,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bEa" = ( @@ -27888,6 +27884,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment/corner{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -28000,6 +27999,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -28535,15 +28535,20 @@ /area/station/command/bridge) "bFP" = ( /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "darkblue" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bFQ" = ( /obj/machinery/firealarm/directional/south, @@ -29914,6 +29919,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -29933,8 +29939,10 @@ /turf/simulated/floor/wood, /area/station/command/office/captain) "bJg" = ( -/obj/structure/table/wood, -/obj/item/paicard, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal, /turf/simulated/floor/wood, /area/station/command/meeting_room) "bJj" = ( @@ -32035,6 +32043,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -32161,6 +32170,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -32823,6 +32833,7 @@ }, /obj/item/storage/briefcase, /obj/item/storage/secure/briefcase, +/obj/item/paicard, /turf/simulated/floor/wood, /area/station/command/meeting_room) "bQG" = ( @@ -34364,6 +34375,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -36078,6 +36090,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -36419,6 +36432,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -38728,6 +38742,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -66217,6 +66232,29 @@ icon_state = "dark" }, /area/station/security/storage) +"eVz" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" + }, +/area/station/hallway/primary/central/west) "eVW" = ( /obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ @@ -69367,6 +69405,26 @@ icon_state = "whitepurple" }, /area/station/science/break_room) +"gNo" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault" + }, +/area/station/command/bridge) "gNA" = ( /obj/structure/window/reinforced{ dir = 8 @@ -76379,6 +76437,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -79721,6 +79780,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -83983,6 +84045,19 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/aft/north) +"ptz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment/corner{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/station/command/meeting_room) "pup" = ( /obj/machinery/atmospherics/portable/canister/oxygen, /turf/simulated/floor/plasteel, @@ -84672,6 +84747,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/station/command/meeting_room) "pMI" = ( @@ -85694,6 +85770,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -91449,6 +91526,7 @@ d2 = 4; icon_state = "1-4" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -91593,6 +91671,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -92306,9 +92387,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/structure/disposalpipe/segment/corner{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -92319,6 +92397,9 @@ d2 = 4; icon_state = "1-4" }, +/obj/structure/disposalpipe/junction/reversed{ + dir = 2 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -94320,6 +94401,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -134578,7 +134660,7 @@ bOW lbc caN chc -bpT +eVz bOW twX bOW @@ -135588,7 +135670,7 @@ dHG dHG bwf bAr -bCl +bFP byU bFR bHj @@ -135845,7 +135927,7 @@ abj aaa bwf bAs -bCB +gNo bAs bAs bHj @@ -136359,7 +136441,7 @@ abj aaa bwf bAt -bCl +bFP byU bFx bHk @@ -136616,7 +136698,7 @@ abj abj bwf sHI -bCl +bFP byU bFy bHk @@ -137132,9 +137214,9 @@ bwf aos bCn bDZ -bFP +bCL pMx -bQJ +ptz bKL bMS bOJ