From 51851343f4ab049fa918e11795b129752091c4de Mon Sep 17 00:00:00 2001
From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Date: Wed, 1 Nov 2023 17:13:50 +0100
Subject: [PATCH] Fixes Chapel Office's Disposal (#17697)

---
 .../SleepyGemmy-chapel_disposal.yml           |  6 +++++
 maps/sccv_horizon/sccv_horizon-2_deck_2.dmm   | 25 +++++--------------
 2 files changed, 12 insertions(+), 19 deletions(-)
 create mode 100644 html/changelogs/SleepyGemmy-chapel_disposal.yml

diff --git a/html/changelogs/SleepyGemmy-chapel_disposal.yml b/html/changelogs/SleepyGemmy-chapel_disposal.yml
new file mode 100644
index 00000000000..6b8aa0d08b0
--- /dev/null
+++ b/html/changelogs/SleepyGemmy-chapel_disposal.yml
@@ -0,0 +1,6 @@
+author: SleepyGemmy
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixed the chapel office's disposal being unpiped."
diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
index 55c8806c2f7..40281ca2a14 100644
--- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
+++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
@@ -3139,6 +3139,7 @@
 	},
 /obj/machinery/firealarm/north,
 /obj/machinery/disposal/small/west,
+/obj/structure/disposalpipe/trunk,
 /turf/simulated/floor/wood,
 /area/chapel/office)
 "bsQ" = (
@@ -9288,9 +9289,6 @@
 /turf/simulated/floor/tiled,
 /area/hallway/engineering)
 "eyu" = (
-/obj/structure/disposalpipe/trunk{
-	dir = 1
-	},
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 6
 	},
@@ -22685,7 +22683,6 @@
 /obj/structure/bed/stool/chair/padded/black{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment,
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 4
 	},
@@ -23062,10 +23059,10 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/cable/green{
 	icon_state = "2-4"
 	},
+/obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_two/fore/starboard)
 "kYF" = (
@@ -26925,7 +26922,6 @@
 /obj/structure/cable/green{
 	icon_state = "1-8"
 	},
-/obj/structure/disposalpipe/segment,
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 4
 	},
@@ -28361,9 +28357,6 @@
 /turf/simulated/floor/tiled,
 /area/turret_protected/ai_upload)
 "nue" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -35432,10 +35425,6 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
-	},
 /obj/effect/floor_decal/spline/fancy/wood/corner,
 /turf/simulated/floor/wood,
 /area/chapel/office)
@@ -36304,9 +36293,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/effect/floor_decal/spline/fancy/wood,
 /turf/simulated/floor/wood,
 /area/chapel/office)
@@ -43091,15 +43077,16 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/wood,
 /area/chapel/office)
 "uFc" = (