From 698d6db42c3bcd35b14b97b519c14e3e61df7660 Mon Sep 17 00:00:00 2001 From: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Sun, 1 Sep 2024 09:07:22 +0100 Subject: [PATCH] The last disposals --- .../map_files/Deltastation/DeltaStation2.dmm | 142 +++++++++--------- 1 file changed, 74 insertions(+), 68 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index d0cd7fb545ff2..f61b319d1e4a0 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -23167,6 +23167,10 @@ /obj/item/radio/intercom{ pixel_x = 26 }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/open/floor/iron, /area/science/xenobiology) "cRW" = ( @@ -24343,7 +24347,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/machinery/disposal/bin, +/obj/structure/disposaloutlet, /turf/open/floor/iron, /area/science/xenobiology) "dav" = ( @@ -31794,9 +31798,11 @@ /turf/open/floor/iron, /area/security/checkpoint/customs/auxiliary) "eiw" = ( -/obj/structure/window/reinforced, -/obj/structure/lattice, -/obj/machinery/camera/directional/north, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/machinery/camera/directional/south, /turf/open/space, /area/space/nearstation) "eiz" = ( @@ -33228,6 +33234,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/checkpoint/medical) +"eCm" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/camera/directional/west, +/turf/open/space, +/area/space/nearstation) "eCn" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -35621,13 +35634,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"fqc" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 10 - }, -/turf/open/floor/iron, -/area/engine/atmos) "fqd" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ @@ -47330,9 +47336,17 @@ /turf/open/floor/catwalk_floor, /area/security/checkpoint/escape) "iZX" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/turf/closed/wall/r_wall, -/area/maintenance/disposal/incinerator) +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/camera/directional/east{ + c_tag = "AI Satellite - Port"; + name = "ai camera"; + network = list("minisat"); + start_active = 1 + }, +/turf/open/space, +/area/space/nearstation) "jaj" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/fullgrass, @@ -47641,12 +47655,20 @@ /turf/open/floor/iron, /area/engine/atmos) "jfy" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment{ +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/pool{ dir = 4 }, -/turf/open/floor/plating, -/area/science/nanite) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron, +/area/crew_quarters/fitness/recreation) "jfE" = ( /obj/machinery/airalarm/directional/east, /obj/machinery/iv_drip, @@ -72933,17 +72955,9 @@ /turf/open/floor/plating, /area/maintenance/port) "rjz" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/camera/directional/east{ - c_tag = "AI Satellite - Port"; - name = "ai camera"; - network = list("minisat"); - start_active = 1 - }, -/turf/open/space, -/area/space/nearstation) +/obj/machinery/power/apc/auto_name/directional/north, +/turf/closed/wall/r_wall, +/area/maintenance/disposal/incinerator) "rjB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -73441,6 +73455,13 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) +"rrk" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/science/nanite) "rrl" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -75194,8 +75215,10 @@ icon_state = "1-8" }, /obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron, /area/science/xenobiology) "rTH" = ( @@ -75433,8 +75456,8 @@ "rXz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/disposalpipe/sorting/mail/destination/xenobiology{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 6 }, /turf/open/floor/iron, /area/science/xenobiology) @@ -80715,13 +80738,12 @@ /turf/open/floor/iron/dark, /area/maintenance/department/medical/morgue) "tBX" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/simple/yellow/visible{ + dir = 10 }, -/obj/machinery/camera/directional/south, -/turf/open/space, -/area/space/nearstation) +/turf/open/floor/iron, +/area/engine/atmos) "tCb" = ( /obj/structure/window/reinforced{ dir = 8 @@ -86524,21 +86546,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/toilet/restrooms) -"vvX" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/pool{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron, -/area/crew_quarters/fitness/recreation) "vvZ" = ( /obj/structure/table/reinforced, /obj/item/storage/belt/utility, @@ -88329,10 +88336,9 @@ /turf/open/floor/iron/white, /area/medical/genetics) "vZk" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/camera/directional/west, +/obj/structure/window/reinforced, +/obj/structure/lattice, +/obj/machinery/camera/directional/north, /turf/open/space, /area/space/nearstation) "vZo" = ( @@ -100901,7 +100907,7 @@ bmD bpF bmD bpF -vZk +eCm bpF bmD bpF @@ -101660,7 +101666,7 @@ bmD bmD bpF bmD -vZk +eCm bpF bmD bmD @@ -102194,7 +102200,7 @@ bPC bkE sqE bNB -vZk +eCm bpF bmD bmD @@ -104002,7 +104008,7 @@ bkE vli suY lUu -tBX +eiw wiQ aaa aaa @@ -104479,7 +104485,7 @@ aaa aaa aaa wiQ -eiw +vZk dpf vFU xvN @@ -106309,7 +106315,7 @@ bNu bmH bpN bmH -rjz +iZX bpN bmH bmH @@ -106803,7 +106809,7 @@ bmH bmH bpN bmH -rjz +iZX bpN bmH bpN @@ -119127,7 +119133,7 @@ bdd hvQ hvQ hvQ -fqc +tBX bkL rZo bom @@ -119623,7 +119629,7 @@ nlZ nlZ vtt tde -iZX +rjz uIt gtJ aLm @@ -126902,7 +126908,7 @@ cMY dhU djK djK -jfy +rrk kkD dmF djF @@ -149502,7 +149508,7 @@ sNq fDm phy pMF -vvX +jfy sNq qFm uxo