From 1278d03fbe23adbd79dda5447fbcc36a127d5a98 Mon Sep 17 00:00:00 2001 From: Little-119 Date: Thu, 19 Sep 2019 07:41:24 -0400 Subject: [PATCH 1/2] Fix unconnected disposal bin in the morgue --- maps/tether/tether-06-station2.dmm | 58 +++++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 4 deletions(-) diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index c882c8e26b7..5e121aba0b4 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -10899,6 +10899,10 @@ /obj/effect/floor_decal/techfloor{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "qa" = ( @@ -11329,6 +11333,9 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "qE" = ( @@ -11336,6 +11343,9 @@ /obj/effect/floor_decal/techfloor{ dir = 5 }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "qF" = ( @@ -12326,6 +12336,9 @@ pixel_x = -4; pixel_y = 26 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) "sk" = ( @@ -12336,6 +12349,10 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "sl" = ( @@ -12348,6 +12365,9 @@ /obj/effect/floor_decal/techfloor/corner{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "sm" = ( @@ -12361,6 +12381,9 @@ /obj/effect/floor_decal/techfloor/corner{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "sn" = ( @@ -12375,6 +12398,9 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "so" = ( @@ -12388,6 +12414,9 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "sp" = ( @@ -12530,6 +12559,10 @@ /obj/effect/floor_decal/techfloor/corner{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "sD" = ( @@ -12618,7 +12651,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, @@ -12631,6 +12663,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) "sL" = ( @@ -12663,6 +12699,9 @@ icon_state = "intact-scrubbers"; dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/morgue) "sN" = ( @@ -12682,6 +12721,10 @@ dir = 1 }, /obj/effect/floor_decal/techfloor, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "sO" = ( @@ -20973,6 +21016,13 @@ /obj/item/roller, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"KV" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/techfloor, +/area/medical/morgue) "Ld" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -33888,9 +33938,9 @@ ac ac uW pZ -rn -rn -rn +KV +KV +KV sC tj tv From 5be6d9399b9c63920bea1c8b8f5ad1be6404819a Mon Sep 17 00:00:00 2001 From: Little-119 Date: Thu, 19 Sep 2019 08:15:18 -0400 Subject: [PATCH 2/2] Adds additional disposal bins to the medbay --- maps/tether/tether-06-station2.dmm | 45 ++++++++++++++++++++++++++++-- maps/tether/tether-07-station3.dmm | 36 +++++++++++++++++++++--- 2 files changed, 74 insertions(+), 7 deletions(-) diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index 5e121aba0b4..a479f87bfc8 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -20683,6 +20683,18 @@ "Gw" = ( /turf/simulated/floor/tiled/dark, /area/security/brig) +"GF" = ( +/obj/effect/floor_decal/borderfloorwhite/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/surgery_hallway) "GG" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/table/steel, @@ -20937,6 +20949,20 @@ }, /turf/simulated/floor/tiled, /area/security/security_cell_hallway) +"JF" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/junction{ + icon_state = "pipe-j2"; + dir = 2 + }, +/turf/simulated/floor/tiled/white, +/area/medical/surgery_hallway) "JH" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -21698,6 +21724,19 @@ }, /turf/simulated/floor/tiled, /area/security/security_cell_hallway) +"QK" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal, +/turf/simulated/floor/tiled/white, +/area/medical/surgery_hallway) "QN" = ( /obj/structure/closet, /obj/item/clothing/shoes/boots/winter/medical, @@ -32819,7 +32858,7 @@ zg ts ts Aa -ts +JF Az ts Bd @@ -32961,7 +33000,7 @@ wd wD tS Ab -Al +GF AA rw Be @@ -33103,7 +33142,7 @@ zh xx xx Ac -Am +QK AA AM Bf diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index e69551d0a40..9e8d180b6ad 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -22503,6 +22503,10 @@ icon_state = "intact"; dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) "II" = ( @@ -22526,6 +22530,9 @@ dir = 10 }, /obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) "IJ" = ( @@ -22550,6 +22557,9 @@ icon_state = "intact"; dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) "IK" = ( @@ -22575,6 +22585,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "IL" = ( @@ -22594,6 +22607,9 @@ icon_state = "intact"; dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "IM" = ( @@ -22613,6 +22629,9 @@ icon_state = "intact"; dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "IN" = ( @@ -22623,11 +22642,11 @@ icon_state = "map-scrubbers"; dir = 4 }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ icon_state = "intact"; dir = 4 }, +/obj/structure/disposalpipe/junction, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "IO" = ( @@ -22923,6 +22942,10 @@ /obj/effect/floor_decal/corner/paleblue/border, /obj/effect/floor_decal/borderfloorwhite/corner2, /obj/effect/floor_decal/corner/paleblue/bordercorner2, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) "Jt" = ( @@ -23918,6 +23941,10 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 8 }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "Lf" = ( @@ -24658,15 +24685,16 @@ icon_state = "intact-scrubbers"; dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 }, +/obj/structure/disposalpipe/junction{ + icon_state = "pipe-j1"; + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "Mq" = (