From ded0faf90f59cb0b23282549b9acebb20b5d51ee Mon Sep 17 00:00:00 2001
From: FabianK3 <21039694+FabianK3@users.noreply.github.com>
Date: Fri, 8 Nov 2024 11:31:14 +0100
Subject: [PATCH] Engineering lobby piping fix (#20145)

### Introduction
With the re-merge (#20143) of the engineering lobby the piping aft of
the lobby broke due to merge-conflicts.

### What changed?
- Fixed the piping.
---
 ...fabiank3-fix-engineering-lobby-remerge.yml |  6 ++++
 maps/sccv_horizon/sccv_horizon.dmm            | 28 ++++++++++---------
 2 files changed, 21 insertions(+), 13 deletions(-)
 create mode 100644 html/changelogs/fabiank3-fix-engineering-lobby-remerge.yml

diff --git a/html/changelogs/fabiank3-fix-engineering-lobby-remerge.yml b/html/changelogs/fabiank3-fix-engineering-lobby-remerge.yml
new file mode 100644
index 00000000000..8c3f44f34d8
--- /dev/null
+++ b/html/changelogs/fabiank3-fix-engineering-lobby-remerge.yml
@@ -0,0 +1,6 @@
+author: FabianK3
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixes ill-placed piping near the engineering lobby due to previous merge-conflicts."
diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm
index 06f0aa773c9..05393dfea5f 100644
--- a/maps/sccv_horizon/sccv_horizon.dmm
+++ b/maps/sccv_horizon/sccv_horizon.dmm
@@ -39514,9 +39514,6 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
-	},
 /turf/simulated/floor/tiled,
 /area/hallway/engineering)
 "fLZ" = (
@@ -42010,6 +42007,9 @@
 /obj/effect/floor_decal/corner_wide/yellow{
 	dir = 6
 	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/engineering)
 "gfk" = (
@@ -48388,9 +48388,7 @@
 	dir = 8;
 	icon_state = "pipe-c"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
-	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/plating,
 /area/hallway/engineering)
@@ -50555,9 +50553,10 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/engineering)
 "hst" = (
@@ -52606,6 +52605,9 @@
 /obj/effect/floor_decal/corner_wide/yellow/full{
 	dir = 4
 	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/engineering)
 "hHY" = (
@@ -99345,11 +99347,13 @@
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/effect/floor_decal/corner_wide/yellow{
 	dir = 10
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/engineering)
 "oCY" = (
@@ -119273,9 +119277,6 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 8
-	},
 /turf/simulated/floor/tiled,
 /area/hallway/engineering)
 "rwv" = (
@@ -124899,7 +124900,8 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/full,
+/obj/structure/lattice/catwalk/indoor/grate,
+/turf/simulated/floor/plating,
 /area/hallway/engineering)
 "sri" = (
 /obj/structure/cable/green{