From 38f651626ae8bbc90b5142018251cf5dc0bb8178 Mon Sep 17 00:00:00 2001
From: Kano <89972582+kano-dot@users.noreply.github.com>
Date: Sat, 13 Sep 2025 20:27:50 +0300
Subject: [PATCH] Removes some rogue objects from Horizon (#21353)

Removes some objects in:

- Deck 3 port docks space, random lattices
- Deck 2 telescience, rogue platforms under the windows
- Deck 1 turbine room, duplicate pipe under combustion chamber blast
door

Replaces floor in:

- Bridge, one tile in front of conference room
- Intrepid, one tile under the grate

Additional changes:

- Moves cargo conveyor switch from under the railings to somewhere
visible
- Adjusts Intrepid pumps in starboard nacelle to make "Fuel to
Thrusters" pump stand atop for better visibility
- Puts a light fixture in front of commissary
---
 .../changelogs/kano-dot-horizon-map-fixes.yml |  7 ++
 maps/sccv_horizon/sccv_horizon.dmm            | 67 +++++++------------
 2 files changed, 31 insertions(+), 43 deletions(-)
 create mode 100644 html/changelogs/kano-dot-horizon-map-fixes.yml

diff --git a/html/changelogs/kano-dot-horizon-map-fixes.yml b/html/changelogs/kano-dot-horizon-map-fixes.yml
new file mode 100644
index 00000000000..76bc9d12bcd
--- /dev/null
+++ b/html/changelogs/kano-dot-horizon-map-fixes.yml
@@ -0,0 +1,7 @@
+
+author: Kano
+
+delete-after: True
+
+changes:
+  - bugfix: "Removed some rogue objects in the Horizon."
diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm
index 884e5ab5e3b..1d0949ea3fa 100644
--- a/maps/sccv_horizon/sccv_horizon.dmm
+++ b/maps/sccv_horizon/sccv_horizon.dmm
@@ -2334,11 +2334,6 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
-/obj/machinery/conveyor_switch/oneway{
-	id = "cargo_1";
-	pixel_x = 13;
-	pixel_y = 21
-	},
 /obj/structure/disposaloutlet{
 	dir = 4
 	},
@@ -12062,9 +12057,6 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 9
-	},
 /obj/machinery/light/small{
 	dir = 4
 	},
@@ -42712,7 +42704,6 @@
 	id = "turbineinterior";
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/visible/cyan,
 /obj/machinery/atmospherics/pipe/simple/visible/yellow,
 /turf/simulated/floor/reinforced/airless,
 /area/horizon/engineering/atmos/turbine)
@@ -56452,17 +56443,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/horizon/crew/washroom/deck_2)
-"hSc" = (
-/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
-/obj/structure/platform,
-/obj/machinery/door/blast/regular/open{
-	dir = 8;
-	fail_secure = 1;
-	id = "telesci_lockdown";
-	name = "Hazardous Containment Lockdown"
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/horizon/rnd/telesci)
 "hSe" = (
 /obj/effect/floor_decal/corner/beige/diagonal,
 /turf/simulated/floor/tiled/white,
@@ -70649,7 +70629,7 @@
 	c_tag = "Bridge - Starboard 1";
 	dir = 4
 	},
-/turf/simulated/floor/tiled/dark/full,
+/turf/simulated/floor/tiled,
 /area/horizon/command/bridge/controlroom)
 "jVw" = (
 /obj/structure/railing/mapped{
@@ -103054,16 +103034,16 @@
 /turf/simulated/floor/tiled,
 /area/horizon/security/brig)
 "oDm" = (
-/obj/effect/floor_decal/industrial/warning,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/effect/floor_decal/industrial/hatch_tiny/yellow,
-/obj/machinery/atmospherics/binary/pump/fuel{
-	name = "Fuel Tank to Thrusters"
-	},
 /obj/machinery/atmospherics/binary/pump{
 	name = "Air Reserve to Airlock Reserve";
 	dir = 4
 	},
+/obj/machinery/atmospherics/binary/pump/fuel{
+	name = "Fuel Tank to Thrusters"
+	},
+/obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/plating,
 /area/horizon/shuttle/intrepid/engineering)
 "oDn" = (
@@ -110744,10 +110724,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/rnd/xenobiology)
-"pKK" = (
-/obj/structure/lattice/catwalk,
-/turf/simulated/floor/reinforced/airless,
-/area/horizon/exterior)
 "pKO" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 6
@@ -141585,7 +141561,7 @@
 /obj/structure/lattice/catwalk/indoor/grate/dark,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/plating,
 /area/horizon/shuttle/intrepid/main_compartment)
 "ugk" = (
 /obj/structure/sign/vacuum{
@@ -148872,9 +148848,17 @@
 /turf/simulated/floor/tiled/dark,
 /area/horizon/engineering/atmos/turbine)
 "vgu" = (
-/obj/structure/lattice/catwalk,
-/turf/space,
-/area/horizon/exterior)
+/obj/effect/floor_decal/corner/brown{
+	dir = 10
+	},
+/obj/effect/floor_decal/industrial/warning,
+/obj/machinery/conveyor_switch/oneway{
+	id = "cargo_1";
+	pixel_x = -10;
+	pixel_y = -6
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/operations/loading)
 "vgw" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -159602,9 +159586,6 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 8
-	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/service/custodial/disposals/deck_1)
 "wDd" = (
@@ -194915,7 +194896,7 @@ yeo
 bDQ
 tNt
 htg
-rKg
+vgu
 lro
 jgx
 hiV
@@ -201367,7 +201348,7 @@ gTc
 dAf
 gWz
 oQF
-vgu
+mOM
 mOM
 eSV
 eSV
@@ -269964,7 +269945,7 @@ nNH
 hHL
 aTY
 iWE
-aTY
+bxX
 sGz
 odk
 lHG
@@ -277661,7 +277642,7 @@ vov
 hHC
 nbO
 pBT
-hSc
+iKq
 wBp
 qKs
 hKx
@@ -277918,7 +277899,7 @@ xsl
 wlD
 vbH
 kYP
-hSc
+iKq
 pCI
 oaL
 hKx
@@ -344197,7 +344178,7 @@ ykX
 cKu
 cKu
 cKu
-pKK
+cKu
 cKu
 cKu
 cKu
@@ -344454,7 +344435,7 @@ ykX
 eSV
 eSV
 cKu
-pKK
+cKu
 cKu
 cKu
 cKu