From 89736b1889c77dcbb52b984696d9dcfd669e07a4 Mon Sep 17 00:00:00 2001 From: fernerr <35879136+fernerr@users.noreply.github.com> Date: Sat, 25 Jul 2020 18:44:54 +0200 Subject: [PATCH] Fixes an issue with the CMO's disposal bin (#9458) --- .../Ferner-200725-bugfix_cmodisposal.yml | 4 + maps/aurora/aurora-4_mainlevel.dmm | 141 +++++++++--------- 2 files changed, 75 insertions(+), 70 deletions(-) create mode 100644 html/changelogs/Ferner-200725-bugfix_cmodisposal.yml diff --git a/html/changelogs/Ferner-200725-bugfix_cmodisposal.yml b/html/changelogs/Ferner-200725-bugfix_cmodisposal.yml new file mode 100644 index 00000000000..0b567bf06c9 --- /dev/null +++ b/html/changelogs/Ferner-200725-bugfix_cmodisposal.yml @@ -0,0 +1,4 @@ +author: Ferner +delete-after: True +changes: + - bugfix: "Fixed an issue with the CMO's disposal bin." diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 74c8c971eb7..6abe9217681 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -3335,9 +3335,9 @@ /area/security/brig) "agl" = ( /obj/item/device/radio/intercom{ - broadcasting = TRUE; + broadcasting = 1; frequency = 1449; - listening = FALSE; + listening = 0; pixel_x = 27 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -39510,6 +39510,10 @@ /obj/effect/floor_decal/corner_wide/paleblue{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "brb" = ( @@ -39520,11 +39524,15 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/effect/floor_decal/corner_wide/paleblue{ dir = 5 }, /obj/effect/floor_decal/sign/cmo, +/obj/structure/disposalpipe/sortjunction{ + dir = 8; + name = "CMO Office"; + sortType = "CMO Office" + }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "brc" = ( @@ -39532,12 +39540,18 @@ /obj/effect/floor_decal/corner_wide/paleblue{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "brd" = ( /obj/effect/floor_decal/corner_wide/paleblue{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "bre" = ( @@ -39888,10 +39902,6 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay) "brW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/effect/floor_decal/corner_wide/green{ dir = 5 }, @@ -39905,21 +39915,22 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, /obj/effect/floor_decal/corner_wide/green{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "brY" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, /obj/effect/floor_decal/corner_wide/green{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "brZ" = ( @@ -39965,20 +39976,11 @@ icon_state = "1-2" }, /obj/effect/floor_decal/corner/lime/diagonal, -/obj/structure/disposalpipe/sortjunction{ - dir = 4; - icon_state = "pipe-j2s"; - name = "CMO Office"; - sortType = "CMO Office" - }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "bsf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/lime/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "bsg" = ( @@ -39994,11 +39996,6 @@ icon_state = "2-4" }, /obj/effect/floor_decal/corner/lime/diagonal, -/obj/structure/disposalpipe/sortjunction{ - dir = 4; - name = "Quarantine"; - sortType = "Quarantine" - }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "bsh" = ( @@ -40008,9 +40005,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -40022,6 +40016,11 @@ icon_state = "1-8" }, /obj/effect/floor_decal/corner/lime/diagonal, +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + name = "Medical Bay"; + sortType = "Medical Bay" + }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "bsi" = ( @@ -40623,10 +40622,8 @@ icon_state = "4-8" }, /obj/effect/floor_decal/corner/lime/diagonal, -/obj/structure/disposalpipe/sortjunction{ - dir = 8; - name = "Quarantine"; - sortType = "Quarantine" +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) @@ -40644,30 +40641,9 @@ icon_state = "1-4" }, /obj/effect/floor_decal/corner/lime/diagonal, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/segment{ dir = 8; - name = "CMO Office"; - sortType = "CMO Office" - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay2) -"bto" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/structure/disposalpipe/sortjunction{ - dir = 8; - name = "Medical Bay"; - sortType = "Medical Bay" + icon_state = "pipe-c" }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) @@ -40690,7 +40666,7 @@ }, /obj/effect/floor_decal/corner/lime/diagonal, /obj/structure/disposalpipe/segment{ - dir = 2; + dir = 4; icon_state = "pipe-c" }, /turf/simulated/floor/tiled/white, @@ -40724,6 +40700,9 @@ icon_state = "1-8" }, /obj/effect/floor_decal/corner/lime/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "btu" = ( @@ -40737,6 +40716,9 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/floor_decal/corner/grey, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "btv" = ( @@ -40754,6 +40736,9 @@ /obj/effect/floor_decal/corner/grey{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "btw" = ( @@ -40775,7 +40760,11 @@ dir = 10 }, /obj/effect/floor_decal/sign/c2, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + name = "Quarantine"; + sortType = "Quarantine" + }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "btx" = ( @@ -60556,6 +60545,10 @@ /obj/effect/floor_decal/corner/grey{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "fMf" = ( @@ -60958,6 +60951,13 @@ temperature = 278 }, /area/crew_quarters/kitchen/freezer) +"gNO" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay2) "gOO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -61179,9 +61179,6 @@ /area/maintenance/research_port) "hoV" = ( /obj/effect/floor_decal/corner/lime/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "hpp" = ( @@ -61664,6 +61661,10 @@ /obj/effect/floor_decal/corner_wide/paleblue{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "itk" = ( @@ -106727,7 +106728,7 @@ box aTg bqS brY -bto +btq ivh gKs bwy @@ -107241,7 +107242,7 @@ boz bpO bqW bsc -btq +btm buw buw buw @@ -107498,7 +107499,7 @@ boA bmZ bqX bsc -btq +btm bux bvC bvC @@ -107755,7 +107756,7 @@ boB bpQ bqX bsc -btq +btm buv bvC bvC @@ -108012,7 +108013,7 @@ boC bpR bqY bsc -btq +btm buw bvC bvC @@ -108269,7 +108270,7 @@ bhZ bhZ bkr bsd -btq +btm bux bvC bvC @@ -108525,8 +108526,8 @@ bnb boD bpS bra -bsc -btq +gNO +btm buv bvC bvC