diff --git a/html/changelogs/Bat-RemapBugfixes.yml b/html/changelogs/Bat-RemapBugfixes.yml
new file mode 100644
index 00000000000..fcf14930757
--- /dev/null
+++ b/html/changelogs/Bat-RemapBugfixes.yml
@@ -0,0 +1,23 @@
+# Your name.
+author: Batrachophrenoboocosmomachia
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Updates lights in several areas to look better with the new lighting system (based on test merge)."
+  - bugfix: "Replaces flooring with plating beneath a grate in D1 maints."
+  - bugfix: "Updates area assignment in D3 maints."
+  - bugfix: "Moves gas canisters out of the way of the door in D1 combustion turbine maints (whoops!)"
+  - bugfix: "More tightly restricted access on server hall maints door (also names it correctly.)"
+  - bugfix: "Gives machine shop a bit better window coverage."
+  - bugfix: "Changes location of a door in D3 Civilian Substation."
+  - bugfix: "Replaces missing recharger in Sec."
+  - bugfix: "Untangled a few crossed air vents/pumps."
+  - bugfix: "Fixed a disposals link when routing parcels from certain locations to others."
+  - bugfix: "Fixed dirty wiring vars."
diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm
index a224e160129..f3dd931b05a 100644
--- a/maps/sccv_horizon/sccv_horizon.dmm
+++ b/maps/sccv_horizon/sccv_horizon.dmm
@@ -5420,12 +5420,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/horizon/rnd/xenobiology/xenoflora)
 "aIT" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/green{
-	dir = 1;
-	icon_state = "2-4"
+	icon_state = "1-8"
 	},
 /obj/random/dirt_75,
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_2/main/starboard)
 "aIU" = (
@@ -9624,6 +9623,14 @@
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/security/warden)
+"bkN" = (
+/obj/structure/lattice/catwalk/indoor/grate/dark,
+/obj/random/dirt_75,
+/obj/machinery/light/small/emergency{
+	dir = 1
+	},
+/turf/simulated/floor,
+/area/horizon/maintenance/deck_3/security/port)
 "bkO" = (
 /obj/effect/floor_decal/corner/dark_blue{
 	dir = 5
@@ -10436,16 +10443,16 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/airlock/maintenance{
-	dir = 1;
-	name = "Hydroponics Maintenance";
-	req_access = list(35)
-	},
 /obj/machinery/door/firedoor,
 /obj/structure/disposalpipe/segment,
 /obj/effect/floor_decal/industrial/hatch_door/yellow{
 	dir = 8
 	},
+/obj/machinery/door/airlock/maintenance{
+	dir = 1;
+	name = "Hydroponics Maintenance";
+	req_access = list(35)
+	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/service/hydroponics)
 "bpF" = (
@@ -10888,6 +10895,9 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/structure/sign/fire{
+	pixel_x = -32
+	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/operations/machinist)
 "bsT" = (
@@ -10957,10 +10967,11 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/command/heads/hos)
 "bti" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 5
-	},
 /obj/machinery/portable_atmospherics/canister/empty,
+/obj/effect/floor_decal/industrial/outline/grey,
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_1/auxatmos)
 "btm" = (
@@ -12595,12 +12606,6 @@
 	},
 /turf/unsimulated/floor,
 /area/antag/burglar)
-"bGd" = (
-/obj/structure/window/shuttle/scc_space_ship,
-/obj/structure/grille,
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
-/area/template_noop)
 "bGg" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -14067,6 +14072,14 @@
 	},
 /turf/simulated/floor/plating,
 /area/horizon/engineering/atmos)
+"bQF" = (
+/obj/effect/floor_decal/corner/red/diagonal,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/maintenance/deck_3/security/port)
 "bQG" = (
 /obj/machinery/door/airlock/centcom{
 	name = "Advanced Interrogation";
@@ -14812,6 +14825,9 @@
 /obj/structure/cable/green{
 	icon_state = "1-8"
 	},
+/obj/machinery/light/floor{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/engineering/hallway/aft)
 "bVK" = (
@@ -20555,6 +20571,15 @@
 /obj/structure/closet/secure_closet/personal/patient,
 /turf/simulated/floor/tiled/white,
 /area/horizon/medical/ward/isolation)
+"cLg" = (
+/obj/structure/sign/drop{
+	desc = "A warning sign which reads 'DANGER: FALLING HAZARD' and 'THIS EQUIPMENT STARTS AND STOPS AUTOMATICALLY'.";
+	name = "\improper DANGER: FALLING HAZARD sign";
+	pixel_x = 32;
+	pixel_y = -32
+	},
+/turf/simulated/wall,
+/area/horizon/stairwell/port/deck_2)
 "cLi" = (
 /obj/structure/flora/ausbushes/sparsegrass,
 /obj/structure/flora/ausbushes/leafybush,
@@ -20799,15 +20824,15 @@
 /turf/simulated/floor/plating,
 /area/horizon/hallway/primary/deck_2/fore)
 "cNv" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 4
-	},
 /obj/effect/floor_decal/corner/dark_green{
 	dir = 10
 	},
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/primary/deck_1/central)
 "cNA" = (
@@ -21409,6 +21434,9 @@
 	dir = 4
 	},
 /obj/random/junk,
+/obj/structure/lattice/catwalk/indoor/grate/damaged{
+	color = "#4c535b"
+	},
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_1/main/interstitial)
 "cRW" = (
@@ -22477,15 +22505,11 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "2-4"
-	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/structure/lattice/catwalk/indoor/grate/damaged{
-	color = "#4c535b"
+/obj/structure/cable/green{
+	icon_state = "1-8"
 	},
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_1/main/interstitial)
@@ -22685,6 +22709,14 @@
 	pixel_y = 25;
 	req_one_access = list(11,24)
 	},
+/obj/machinery/button/remote/blast_door{
+	dir = 4;
+	id = "engineering_storage_d2";
+	name = "Engineering Hard Storage";
+	pixel_x = 21;
+	pixel_y = 34;
+	req_one_access = list(11,24)
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/engineering/hallway/interior)
 "cZR" = (
@@ -23131,11 +23163,17 @@
 	},
 /turf/simulated/floor/shuttle/dark_blue,
 /area/shuttle/transport1)
+"dcM" = (
+/obj/effect/floor_decal/corner/red/diagonal,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/maintenance/deck_3/security/port)
 "dcO" = (
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/disposalpipe/segment,
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -23397,8 +23435,6 @@
 	dir = 6
 	},
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled/dark,
@@ -26265,13 +26301,12 @@
 /turf/simulated/floor/tiled,
 /area/horizon/security/hallway)
 "dvP" = (
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "2-4"
-	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/engineering/hallway/interior)
 "dvV" = (
@@ -27764,7 +27799,7 @@
 "dFg" = (
 /obj/structure/foamedmetal,
 /turf/simulated/floor,
-/area/space)
+/area/horizon/maintenance/deck_3/cafe)
 "dFh" = (
 /obj/effect/floor_decal/spline/fancy/wood,
 /turf/simulated/floor/wood/maple,
@@ -28486,7 +28521,7 @@
 	icon_state = "0-4"
 	},
 /obj/structure/cable/green{
-	icon_state = "2-4"
+	icon_state = "1-4"
 	},
 /turf/simulated/floor,
 /area/horizon/maintenance/substation/civ_d3)
@@ -30186,9 +30221,6 @@
 /obj/structure/lattice/catwalk/indoor,
 /turf/simulated/open/airless,
 /area/horizon/exterior)
-"dXm" = (
-/turf/simulated/wall,
-/area/space)
 "dXp" = (
 /obj/machinery/portable_atmospherics/canister/air,
 /obj/machinery/atmospherics/portables_connector{
@@ -30327,6 +30359,16 @@
 	icon_state = "wood"
 	},
 /area/centcom/legion/hangar5)
+"dYd" = (
+/obj/structure/lattice/catwalk/indoor/grate/dark,
+/obj/structure/cable/green{
+	icon_state = "2-8"
+	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
+/turf/simulated/floor,
+/area/horizon/maintenance/deck_3/aft/port)
 "dYh" = (
 /turf/simulated/wall/shuttle/scc,
 /area/horizon/shuttle/escape_pod/pod2)
@@ -32126,6 +32168,7 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/generic,
+/obj/machinery/light/small/emergency,
 /turf/simulated/floor/carpet/rubber,
 /area/horizon/maintenance/deck_1/workshop)
 "ejJ" = (
@@ -33649,10 +33692,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/railing/mapped{
-	dir = 8
+	dir = 1
 	},
 /obj/structure/railing/mapped{
-	dir = 1
+	dir = 8
 	},
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_2/wing/starboard/near)
@@ -34431,9 +34474,6 @@
 /obj/item/hullbeacon/red,
 /turf/simulated/floor/reinforced/airless,
 /area/horizon/engineering/reactor/indra/mainchamber)
-"eAC" = (
-/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
-/area/template_noop)
 "eAP" = (
 /obj/structure/cable/green{
 	icon_state = "1-4"
@@ -34759,8 +34799,6 @@
 /area/horizon/security/brig)
 "eDy" = (
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
@@ -35995,7 +36033,12 @@
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 4
 	},
-/obj/machinery/portable_atmospherics/canister/empty,
+/obj/effect/floor_decal/industrial/warning{
+	dir = 9
+	},
+/obj/structure/closet/crate,
+/obj/random/loot,
+/obj/random/loot,
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_1/auxatmos)
 "eMw" = (
@@ -36466,8 +36509,8 @@
 	},
 /area/centcom/control)
 "eQL" = (
-/obj/effect/floor_decal/industrial/outline/grey,
 /obj/machinery/portable_atmospherics/canister/empty,
+/obj/effect/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_1/auxatmos)
 "eQO" = (
@@ -36866,6 +36909,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/lattice/catwalk/indoor/grate/dark,
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor,
 /area/horizon/maintenance/deck_3/security/port)
 "eSO" = (
@@ -38424,15 +38468,15 @@
 /turf/simulated/floor/lino,
 /area/merchant_station)
 "feh" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
 /obj/effect/floor_decal/corner/dark_green{
 	dir = 10
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/primary/deck_1/central)
 "fej" = (
@@ -39034,7 +39078,6 @@
 	c_tag = "Engineering - Deck 3 - Civilian Substation";
 	dir = 1
 	},
-/obj/machinery/light/small/emergency,
 /turf/simulated/floor,
 /area/horizon/maintenance/substation/civ_d3)
 "fie" = (
@@ -39881,11 +39924,6 @@
 /turf/simulated/floor/carpet/rubber,
 /area/horizon/tcommsat/chamber)
 "foL" = (
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/effect/floor_decal/spline/plain/purple{
 	dir = 8
 	},
@@ -39900,6 +39938,9 @@
 /obj/effect/floor_decal/spline/plain/purple{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/service/hydroponics)
 "foN" = (
@@ -46643,11 +46684,10 @@
 	dir = 6
 	},
 /obj/structure/cable/green{
-	dir = 1;
-	icon_state = "2-4"
+	icon_state = "1-2"
 	},
 /obj/structure/cable/green{
-	icon_state = "1-2"
+	icon_state = "1-8"
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/operations/warehouse)
@@ -51191,17 +51231,15 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/plating,
 /area/horizon/hangar/intrepid/interstitial)
@@ -54557,7 +54595,6 @@
 	dir = 8
 	},
 /obj/effect/floor_decal/corner/green/diagonal,
-/obj/machinery/alarm/south,
 /turf/simulated/floor/tiled/white,
 /area/horizon/security/washroom)
 "hoZ" = (
@@ -57603,6 +57640,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/primary/deck_3/central)
+"hIG" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/full,
+/area/horizon/hallway/primary/deck_2/central)
 "hIS" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 4
@@ -58822,6 +58865,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
+/obj/machinery/light/floor{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/operations/machinist)
 "hQq" = (
@@ -62225,6 +62271,7 @@
 /obj/structure/sign/nosmoking_1{
 	pixel_y = -32
 	},
+/obj/machinery/light/spot,
 /turf/simulated/floor/tiled/dark,
 /area/horizon/engineering/atmos)
 "ipt" = (
@@ -64536,8 +64583,8 @@
 /area/horizon/hallway/primary/deck_2/central)
 "iEL" = (
 /obj/structure/trash_pile,
-/obj/effect/floor_decal/industrial/outline/grey,
 /obj/machinery/alarm/north,
+/obj/effect/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_1/auxatmos)
 "iEN" = (
@@ -66275,9 +66322,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/horizon/command/bridge/aibunker)
 "iRo" = (
-/obj/effect/floor_decal/industrial/outline/grey,
 /obj/structure/closet/crate,
 /obj/random/loot,
+/obj/effect/floor_decal/industrial/warning{
+	dir = 10
+	},
+/obj/effect/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_1/auxatmos)
 "iRu" = (
@@ -67426,10 +67476,10 @@
 /turf/simulated/open,
 /area/horizon/maintenance/deck_2/cryo)
 "iZk" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_2/main/starboard)
 "iZt" = (
@@ -68942,7 +68992,7 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/full,
 /area/horizon/hallway/primary/deck_1/central)
 "jkb" = (
 /obj/effect/decal/warning_stripes,
@@ -70609,15 +70659,14 @@
 /area/horizon/engineering/storage_hard)
 "jvL" = (
 /obj/machinery/power/apc/critical/west,
-/obj/structure/cable/green{
-	d2 = 4;
-	icon_state = "0-4"
-	},
 /obj/structure/railing/mapped,
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
 /obj/effect/floor_decal/industrial/warning,
+/obj/structure/cable/green{
+	icon_state = "0-4"
+	},
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_2/service/starboard)
 "jvO" = (
@@ -78267,6 +78316,14 @@
 /obj/structure/bed/stool/chair/shuttle,
 /turf/simulated/floor/tiled/dark/full,
 /area/shuttle/skipjack)
+"kvw" = (
+/obj/structure/lattice/catwalk/indoor/grate/dark,
+/obj/random/dirt_75,
+/obj/machinery/light/small/emergency{
+	dir = 8
+	},
+/turf/simulated/floor,
+/area/horizon/maintenance/deck_3/security/port)
 "kvH" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -81652,6 +81709,9 @@
 /obj/effect/landmark{
 	name = "Revenant"
 	},
+/obj/machinery/light/small/emergency{
+	dir = 1
+	},
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_2/research)
 "kRT" = (
@@ -82132,15 +82192,6 @@
 /obj/structure/lattice/catwalk,
 /turf/space/dynamic,
 /area/template_noop)
-"kVf" = (
-/obj/effect/floor_decal/corner/white{
-	dir = 5
-	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/horizon/hallway/primary/deck_2/central)
 "kVl" = (
 /obj/machinery/atmospherics/pipe/simple/visible/yellow,
 /turf/simulated/floor/plating,
@@ -82664,13 +82715,14 @@
 /turf/simulated/floor,
 /area/horizon/command/bridge/meeting_room)
 "kYw" = (
-/obj/machinery/light/small/emergency{
-	dir = 8
-	},
+/obj/machinery/portable_atmospherics/canister/empty,
+/obj/effect/floor_decal/industrial/outline/grey,
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
-/obj/machinery/portable_atmospherics/canister/empty,
+/obj/machinery/light/small/emergency{
+	dir = 8
+	},
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_1/auxatmos)
 "kYD" = (
@@ -83180,7 +83232,7 @@
 /area/horizon/security/hallway)
 "lbw" = (
 /obj/structure/flora/pottedplant/dead,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
 /area/horizon/maintenance/deck_1/auxatmos)
 "lbC" = (
 /obj/machinery/portable_atmospherics/canister/air/airlock,
@@ -86584,6 +86636,9 @@
 	},
 /turf/unsimulated/floor/plating,
 /area/antag/mercenary)
+"lzd" = (
+/turf/simulated/floor/plating,
+/area/horizon/maintenance/deck_1/auxatmos)
 "lze" = (
 /obj/structure/shuttle_part/scc_space_ship{
 	icon_state = "d3-2-f"
@@ -86848,10 +86903,7 @@
 	dir = 4
 	},
 /obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/structure/cable/green{
-	icon_state = "1-4"
+	icon_state = "1-8"
 	},
 /obj/structure/lattice/catwalk/indoor/grate/dark,
 /turf/simulated/floor,
@@ -88147,7 +88199,6 @@
 /area/antag/mercenary)
 "lJz" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/full,
 /area/horizon/hallway/primary/deck_2/central)
 "lJB" = (
@@ -88469,6 +88520,9 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/maintenance/deck_3/security/port)
 "lLe" = (
@@ -91369,6 +91423,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/dark,
 /area/horizon/engineering/atmos/propulsion/starboard)
+"mha" = (
+/obj/machinery/portable_atmospherics/canister/empty,
+/obj/effect/floor_decal/industrial/outline/grey,
+/obj/effect/floor_decal/industrial/warning{
+	dir = 6
+	},
+/turf/simulated/floor/plating,
+/area/horizon/maintenance/deck_1/auxatmos)
 "mhg" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -101748,6 +101810,15 @@
 /obj/random/dirt_75,
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_2/wing/starboard/far)
+"nEE" = (
+/obj/structure/sign/directions/prop{
+	dir = 4;
+	pixel_x = 32;
+	pixel_y = 24
+	},
+/obj/structure/lattice/catwalk/indoor/grate/dark,
+/turf/simulated/floor/plating,
+/area/horizon/maintenance/deck_2/aft)
 "nEH" = (
 /obj/effect/floor_decal/industrial/outline/research,
 /obj/machinery/light,
@@ -102796,13 +102867,13 @@
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_2/main)
 "nLs" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
 /obj/machinery/light/small/emergency,
-/obj/random/dirt_75,
 /obj/structure/lattice/catwalk/indoor/grate/dark,
+/obj/random/dirt_75,
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_2/main/starboard)
 "nLt" = (
@@ -104080,15 +104151,6 @@
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/service/bar)
-"nVq" = (
-/obj/structure/sign/drop{
-	desc = "A warning sign which reads 'DANGER: FALLING HAZARD' and 'THIS EQUIPMENT STARTS AND STOPS AUTOMATICALLY'.";
-	name = "\improper DANGER: FALLING HAZARD sign";
-	pixel_x = 32;
-	pixel_y = -32
-	},
-/turf/simulated/wall,
-/area/horizon/stairwell/port/deck_2)
 "nVv" = (
 /obj/structure/closet/hazmat/research,
 /obj/item/clothing/mask/gas/alt,
@@ -104927,9 +104989,11 @@
 	},
 /area/tdome/tdomeadmin)
 "obW" = (
+/obj/structure/trash_pile,
+/obj/random/maintenance_junk_or_loot,
+/obj/random/firstaid,
 /obj/effect/floor_decal/industrial/warning,
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_3/security/starboard)
 "oca" = (
@@ -105022,11 +105086,6 @@
 /obj/structure/platform{
 	dir = 4
 	},
-/obj/structure/sign/fire{
-	desc = "A warning sign which reads 'DANGER: SHUTTLE THRUSTERS IN USE' and 'MIND THE DISTANCE'.";
-	name = "\improper DANGER: THRUSTERS sign";
-	pixel_x = -32
-	},
 /obj/structure/disposalpipe/trunk{
 	dir = 4
 	},
@@ -106256,6 +106315,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/merchant_station/warehouse)
+"okz" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/random/dirt_75,
+/turf/simulated/floor/tiled/dark,
+/area/horizon/maintenance/deck_1/main/port/shortcut)
 "okE" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -106980,15 +107046,6 @@
 	},
 /turf/unsimulated/floor,
 /area/centcom/evac)
-"opI" = (
-/obj/structure/sign/directions/prop{
-	dir = 4;
-	pixel_x = 32;
-	pixel_y = 24
-	},
-/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor/plating,
-/area/horizon/maintenance/deck_2/aft)
 "opO" = (
 /obj/effect/floor_decal/spline/plain/black{
 	dir = 8
@@ -110919,7 +110976,6 @@
 	},
 /obj/machinery/light,
 /obj/structure/cable/green{
-	d2 = 4;
 	icon_state = "0-4"
 	},
 /turf/simulated/floor/tiled/white,
@@ -112199,6 +112255,9 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/rnd/conference)
 "oYJ" = (
@@ -113592,14 +113651,12 @@
 /area/horizon/maintenance/deck_1/main/starboard)
 "piR" = (
 /obj/effect/floor_decal/corner/blue/diagonal,
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/white,
 /area/horizon/security/autopsy_laboratory)
 "piU" = (
@@ -114645,6 +114702,9 @@
 	dir = 1
 	},
 /obj/structure/lattice/catwalk/indoor/grate/dark,
+/obj/machinery/light/small/emergency{
+	dir = 1
+	},
 /turf/simulated/floor,
 /area/horizon/maintenance/deck_3/security/port)
 "prG" = (
@@ -115160,6 +115220,9 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/light/floor{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/operations/machinist)
 "puW" = (
@@ -117616,13 +117679,13 @@
 /turf/unsimulated/floor/wood,
 /area/centcom/bar)
 "pNo" = (
-/obj/structure/lattice/catwalk/indoor/grate/dark,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
 /obj/structure/extinguisher_cabinet/east,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
 /turf/simulated/floor/plating,
 /area/horizon/shuttle/intrepid/starboard_compartment)
 "pNw" = (
@@ -119272,6 +119335,10 @@
 "pZi" = (
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/maintenance/deck_2/aft)
+"pZk" = (
+/obj/effect/floor_decal/corner/green/diagonal,
+/turf/simulated/floor/tiled/white,
+/area/horizon/security/washroom)
 "pZl" = (
 /obj/machinery/door/airlock/hatch{
 	dir = 4;
@@ -120001,10 +120068,6 @@
 /obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/hangar/intrepid)
-"qeG" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
-/area/horizon/maintenance/deck_3/security/starboard)
 "qeL" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -120554,12 +120617,6 @@
 /obj/structure/platform/ledge/dark,
 /turf/simulated/open,
 /area/horizon/maintenance/deck_2/main/starboard)
-"qiD" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/turf/simulated/floor,
-/area/horizon/maintenance/deck_3/aft/port)
 "qiE" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -121284,8 +121341,8 @@
 	},
 /obj/machinery/door/airlock/maintenance{
 	dir = 4;
-	name = "Xenobotany Maintenance";
-	req_one_access = list(11,12,47)
+	name = "Server Hall Maintenance";
+	req_access = list(47)
 	},
 /obj/effect/floor_decal/industrial/hatch_door/yellow,
 /turf/simulated/floor/tiled/dark/full,
@@ -122272,9 +122329,10 @@
 /area/horizon/hallway/primary/deck_3/central)
 "qvd" = (
 /obj/machinery/door/firedoor,
+/obj/effect/floor_decal/industrial/hatch_door/yellow{
+	dir = 8
+	},
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/door/airlock/engineering{
@@ -122282,9 +122340,6 @@
 	name = "Deck 2 Research Substation";
 	req_one_access = list(11,24)
 	},
-/obj/effect/floor_decal/industrial/hatch_door/yellow{
-	dir = 8
-	},
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/substation/research)
 "qve" = (
@@ -123513,9 +123568,6 @@
 /obj/machinery/firealarm/west,
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/rnd/xenoarch/hallway/hangar)
-"qED" = (
-/turf/simulated/floor/plating,
-/area/horizon/maintenance/deck_1/auxatmos)
 "qEE" = (
 /obj/structure/cable/orange{
 	icon_state = "4-8"
@@ -125403,7 +125455,9 @@
 /area/antag/ninja)
 "qRi" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
 /turf/simulated/floor/tiled/full,
 /area/horizon/hallway/primary/deck_2/central)
 "qRj" = (
@@ -133049,8 +133103,7 @@
 /area/centcom/checkpoint/aft)
 "rQJ" = (
 /obj/structure/cable/green{
-	dir = 1;
-	icon_state = "2-4"
+	icon_state = "1-8"
 	},
 /obj/structure/lattice/catwalk/indoor/grate/dark,
 /obj/effect/decal/cleanable/dirt,
@@ -133860,6 +133913,7 @@
 	dir = 4
 	},
 /obj/structure/lattice/catwalk/indoor/grate/dark,
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_1/main/starboard)
 "rWD" = (
@@ -134594,9 +134648,10 @@
 /turf/unsimulated/floor,
 /area/antag/mercenary)
 "scF" = (
-/obj/effect/floor_decal/industrial/warning,
 /obj/random/maintenance_junk_or_loot,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/industrial/warning,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor,
 /area/horizon/maintenance/deck_3/security/starboard)
 "scG" = (
 /obj/machinery/light/small,
@@ -136665,6 +136720,10 @@
 /obj/structure/sign/greencross/small,
 /turf/simulated/floor/plating,
 /area/horizon/medical/reception)
+"sqM" = (
+/obj/effect/floor_decal/industrial/outline/grey,
+/turf/simulated/floor/plating,
+/area/horizon/maintenance/deck_1/main/port/shortcut)
 "sqP" = (
 /obj/structure/table/steel,
 /obj/machinery/light/colored/red{
@@ -137583,7 +137642,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/yellow,
 /obj/structure/disposalpipe/segment,
 /obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor/tiled/dark/full,
+/turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_1/main/interstitial)
 "swN" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
@@ -137927,10 +137986,10 @@
 "syP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/railing/mapped,
 /obj/structure/railing/mapped{
 	dir = 8
 	},
+/obj/structure/railing/mapped,
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_2/wing/starboard/near)
 "syR" = (
@@ -141982,6 +142041,7 @@
 /area/horizon/maintenance/deck_2/wing/starboard/nacelle)
 "sZy" = (
 /obj/effect/decal/cleanable/spiderling_remains,
+/obj/machinery/light/small/emergency,
 /turf/simulated/floor/carpet/rubber,
 /area/horizon/maintenance/deck_1/workshop)
 "sZz" = (
@@ -142295,6 +142355,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/random/dirt_75,
 /turf/simulated/floor/tiled/dark,
 /area/horizon/maintenance/deck_2/main/starboard)
 "tcB" = (
@@ -142697,7 +142758,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/horizon/command/bridge/aibunker)
 "tfn" = (
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/full,
 /area/horizon/rnd/hallway)
 "tfr" = (
 /obj/effect/floor_decal/industrial/warning{
@@ -142820,16 +142881,13 @@
 /obj/structure/bed/handrail{
 	dir = 4
 	},
-/obj/structure/closet/walllocker/emerglocker/west{
-	pixel_x = 0;
-	pixel_y = 32
-	},
 /obj/item/clothing/suit/space/emergency,
 /obj/item/clothing/suit/space/emergency,
 /obj/item/clothing/suit/space/emergency,
 /obj/item/clothing/head/helmet/space/emergency,
 /obj/item/clothing/head/helmet/space/emergency,
 /obj/item/clothing/head/helmet/space/emergency,
+/obj/structure/closet/walllocker/emerglocker/west,
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/shuttle/intrepid/main_compartment)
 "tgg" = (
@@ -142888,11 +142946,10 @@
 /area/horizon/holodeck/source_theatre)
 "tgG" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "2-4"
-	},
 /obj/structure/closet/secure_closet/engineering_personal,
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
 /turf/simulated/floor/carpet/rubber,
 /area/horizon/engineering/locker_room)
 "tgH" = (
@@ -145872,14 +145929,6 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 5
 	},
-/obj/machinery/button/remote/blast_door{
-	dir = 4;
-	id = "engineering_storage_d2";
-	name = "Engineering Hard Storage";
-	pixel_x = 21;
-	pixel_y = 34;
-	req_one_access = list(11,24)
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -145892,6 +145941,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/button/remote/blast_door{
+	dir = 4;
+	id = "engineering_storage_d2";
+	name = "Engineering Hard Storage";
+	pixel_x = 21;
+	pixel_y = 34;
+	req_one_access = list(11,24)
+	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/engineering/storage_hard)
 "tAq" = (
@@ -147468,16 +147525,15 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/hangar/airstation)
 "tLt" = (
-/obj/machinery/power/apc/south,
-/obj/effect/floor_decal/corner/green/diagonal,
-/obj/structure/cable/green{
-	icon_state = "0-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
+/obj/effect/floor_decal/corner/green/diagonal,
+/obj/structure/cable/green{
+	icon_state = "0-8"
 	},
 /turf/simulated/floor/tiled/white,
 /area/horizon/security/washroom)
@@ -147725,7 +147781,6 @@
 	},
 /obj/machinery/power/apc/west,
 /obj/structure/cable/green{
-	d2 = 2;
 	icon_state = "0-2"
 	},
 /turf/simulated/floor/tiled/dark,
@@ -148793,7 +148848,6 @@
 /turf/simulated/floor/tiled,
 /area/horizon/command/bridge/controlroom)
 "tWF" = (
-/obj/structure/closet/crate,
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
@@ -150099,6 +150153,12 @@
 	},
 /turf/unsimulated/floor/plating,
 /area/centcom/ferry)
+"ugr" = (
+/obj/effect/floor_decal/corner/green/diagonal,
+/obj/machinery/alarm/south,
+/obj/machinery/power/apc/east,
+/turf/simulated/floor/tiled/white,
+/area/horizon/security/washroom)
 "ugu" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plating,
@@ -150399,6 +150459,13 @@
 	},
 /turf/unsimulated/floor/freezer,
 /area/antag/mercenary)
+"uiw" = (
+/obj/structure/lattice/catwalk/indoor/grate/dark,
+/obj/machinery/light/small/emergency{
+	dir = 8
+	},
+/turf/simulated/floor,
+/area/horizon/maintenance/deck_3/security/port)
 "uix" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -150596,12 +150663,12 @@
 /turf/simulated/floor/wood,
 /area/horizon/rnd/conference)
 "ujE" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 8
-	},
 /obj/effect/floor_decal/corner/dark_green{
 	dir = 10
 	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/primary/deck_1/central)
 "ujG" = (
@@ -155018,15 +155085,6 @@
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/engineering/storage_hard)
-"uNA" = (
-/obj/effect/floor_decal/corner/white{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/turf/simulated/floor/tiled,
-/area/horizon/hallway/primary/deck_2/central)
 "uNB" = (
 /obj/structure/bed/stool/chair/office/bridge/generic{
 	dir = 8
@@ -155368,10 +155426,6 @@
 	},
 /turf/unsimulated/wall/darkshuttlewall,
 /area/centcom/checkpoint/fore)
-"uQa" = (
-/obj/structure/closet/crate,
-/turf/simulated/floor/plating,
-/area/horizon/maintenance/deck_1/auxatmos)
 "uQc" = (
 /obj/effect/floor_decal/corner/dark_blue{
 	dir = 6
@@ -157290,9 +157344,7 @@
 	dir = 4
 	},
 /obj/structure/cable/green{
-	icon_state = "4-8";
-	d1 = 4;
-	d2 = 8
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/stairwell/starboard/deck_2)
@@ -158051,6 +158103,9 @@
 /obj/machinery/portable_atmospherics/powered/pump/filled,
 /obj/effect/floor_decal/industrial/outline/emergency_closet,
 /obj/effect/decal/cleanable/cobweb2,
+/obj/machinery/light/small{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/maintenance/deck_3/security/port)
 "vjb" = (
@@ -159815,20 +159870,18 @@
 	},
 /area/centcom/distress_prep)
 "vwB" = (
-/obj/structure/plasticflaps/airtight,
-/obj/machinery/door/airlock/freezer{
-	dir = 1;
-	name = "Freezer";
-	req_one_access = list(35,28)
-	},
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/airlock/freezer{
+	dir = 1;
+	name = "Freezer";
+	req_one_access = list(35,28)
+	},
+/obj/structure/plasticflaps/airtight,
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled/dark/full,
@@ -161280,11 +161333,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/horizon/engineering/atmos/air)
-"vFW" = (
-/obj/random/maintenance_junk_or_loot,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
-/area/horizon/maintenance/deck_3/security/starboard)
 "vGa" = (
 /obj/machinery/light{
 	dir = 4
@@ -167443,6 +167491,7 @@
 /obj/effect/floor_decal/corner/black/full{
 	dir = 4
 	},
+/obj/machinery/light/floor,
 /turf/simulated/floor/tiled,
 /area/horizon/operations/machinist)
 "wuS" = (
@@ -170592,11 +170641,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/horizon/engineering/atmos/propulsion/starboard)
 "wRt" = (
-/obj/effect/floor_decal/corner/green/diagonal,
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
-/obj/machinery/light/small,
+/obj/effect/floor_decal/corner/green/diagonal,
 /turf/simulated/floor/tiled/white,
 /area/horizon/security/washroom)
 "wRu" = (
@@ -171904,6 +171952,9 @@
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 8
 	},
+/obj/machinery/light/floor{
+	dir = 4
+	},
 /turf/simulated/floor/wood,
 /area/horizon/engineering/hallway/interior)
 "wZd" = (
@@ -173312,6 +173363,13 @@
 	icon_state = "dark_preview"
 	},
 /area/centcom/holding)
+"xiB" = (
+/obj/effect/floor_decal/corner/green/diagonal,
+/obj/machinery/firealarm/west,
+/obj/machinery/recharge_station,
+/obj/effect/floor_decal/industrial/hatch_door/yellow,
+/turf/simulated/floor/tiled/white,
+/area/horizon/security/washroom)
 "xiC" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 6
@@ -173627,6 +173685,22 @@
 	},
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_2/service/starboard)
+"xlj" = (
+/obj/machinery/door/firedoor{
+	req_one_access = list(24,11,67,73)
+	},
+/obj/effect/floor_decal/industrial/hatch_door/yellow{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/airlock/engineering{
+	name = "Deck 3 Civilian Substation";
+	req_one_access = list(11,24)
+	},
+/turf/simulated/floor,
+/area/horizon/maintenance/substation/civ_d3)
 "xlm" = (
 /turf/simulated/wall,
 /area/horizon/medical/icu)
@@ -173664,12 +173738,10 @@
 	name = "sink";
 	pixel_x = 21
 	},
+/obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/dark,
 /area/horizon/service/hydroponics/garden)
 "xlA" = (
@@ -174429,6 +174501,9 @@
 /area/horizon/hangar/intrepid)
 "xrf" = (
 /obj/machinery/light/floor,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/full,
 /area/horizon/hallway/primary/deck_2/central)
 "xro" = (
@@ -174452,20 +174527,7 @@
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/substation/wing_port)
 "xrw" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/door/firedoor{
-	req_one_access = list(24,11,67,73);
-	dir = 4
-	},
-/obj/effect/floor_decal/industrial/hatch_door/yellow,
-/obj/machinery/door/airlock/engineering{
-	dir = 4;
-	name = "Deck 3 Civilian Substation";
-	req_one_access = list(11,24)
-	},
-/turf/simulated/floor,
+/turf/simulated/wall,
 /area/horizon/maintenance/substation/civ_d3)
 "xrI" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -176262,18 +176324,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/engineering/hallway/interior)
-"xDT" = (
-/obj/effect/floor_decal/corner_wide/yellow{
-	dir = 9
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/simulated/floor/tiled,
-/area/horizon/engineering/hallway/aft)
 "xDX" = (
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/horizon/maintenance/deck_1/wing/port/far)
@@ -177618,13 +177668,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/dark,
 /area/horizon/command/teleporter)
-"xMP" = (
-/obj/structure/trash_pile,
-/obj/random/maintenance_junk_or_loot,
-/obj/effect/decal/cleanable/dirt,
-/obj/random/firstaid,
-/turf/simulated/floor/plating,
-/area/horizon/maintenance/deck_3/security/starboard)
 "xMV" = (
 /obj/effect/floor_decal/corner/dark_green{
 	dir = 5
@@ -178629,9 +178672,7 @@
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/intrepid/interstitial)
 "xTV" = (
-/obj/structure/cable/green{
-	icon_state = "1-8"
-	},
+/obj/machinery/light/small/emergency,
 /turf/simulated/floor,
 /area/horizon/maintenance/substation/civ_d3)
 "xTW" = (
@@ -179665,10 +179706,10 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/engineering/storage_hard)
 "ycx" = (
-/obj/random/dirt_75,
 /obj/effect/floor_decal/industrial/warning{
-	dir = 1
+	dir = 9
 	},
+/obj/random/dirt_75,
 /turf/simulated/floor,
 /area/horizon/maintenance/deck_3/aft/port)
 "ycy" = (
@@ -179820,7 +179861,6 @@
 /obj/machinery/door/blast/shutters{
 	id = "central_ring_desk";
 	name = "Shutters";
-	opacity = 0;
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark/full,
@@ -198005,7 +198045,7 @@ sRg
 mOM
 mOM
 mOM
-eAC
+tss
 tss
 hla
 tss
@@ -198262,7 +198302,7 @@ mOM
 mOM
 pYB
 wEY
-eAC
+tss
 fmy
 tWV
 tss
@@ -198519,7 +198559,7 @@ mOM
 wEY
 pYB
 wEY
-eAC
+tss
 kAI
 rjP
 tss
@@ -198776,7 +198816,7 @@ mOM
 wEY
 pYB
 wEY
-bGd
+ooy
 wTz
 nOK
 ooy
@@ -199033,7 +199073,7 @@ mOM
 pYB
 pYB
 pYB
-bGd
+ooy
 wTz
 nOK
 ooy
@@ -199290,7 +199330,7 @@ mOM
 wEY
 pYB
 wEY
-bGd
+ooy
 jDc
 nOK
 tss
@@ -199547,7 +199587,7 @@ mOM
 wEY
 pYB
 wEY
-eAC
+tss
 wTz
 nOK
 ooy
@@ -211860,8 +211900,8 @@ lKo
 unM
 lKo
 lKo
-wcB
-qfa
+okz
+sqM
 hGt
 ozx
 wbZ
@@ -221356,10 +221396,10 @@ xJI
 pvV
 ccR
 aus
-uQa
-cOB
 bti
 kYw
+mha
+lzd
 eMv
 nHV
 nLo
@@ -221872,7 +221912,7 @@ nHV
 aus
 xzq
 geP
-qED
+eVV
 cOB
 fLQ
 brl
@@ -222387,7 +222427,7 @@ aus
 aKj
 iTV
 vjk
-qED
+lzd
 vLB
 brl
 mDq
@@ -278925,7 +278965,7 @@ egn
 jxA
 sRp
 wUd
-xDT
+wUd
 bVJ
 wUd
 rBX
@@ -279971,7 +280011,7 @@ wVZ
 wVZ
 wVZ
 wVZ
-whQ
+wVZ
 gfE
 vVw
 stI
@@ -280487,7 +280527,7 @@ bLv
 ecg
 rkL
 oUY
-oUY
+hIG
 gst
 kBx
 ucf
@@ -280742,7 +280782,7 @@ bLv
 bLv
 bLv
 ecg
-kVf
+rkL
 qCx
 xrf
 gst
@@ -280999,7 +281039,7 @@ bLv
 bLv
 bLv
 ecg
-uNA
+rkL
 lJz
 qRi
 rCg
@@ -281514,8 +281554,8 @@ nqF
 nqF
 nqF
 nqF
-nqF
-nqF
+dXW
+dXW
 dXW
 nqF
 auo
@@ -283294,7 +283334,7 @@ aOj
 rBJ
 yko
 vkw
-opI
+nEE
 pRY
 pRY
 uEa
@@ -284355,7 +284395,7 @@ uCn
 cyZ
 wGn
 jSf
-nVq
+cLg
 eTc
 ukS
 mXT
@@ -345495,8 +345535,8 @@ bMq
 xZa
 pAZ
 xZa
-fyB
-fyB
+xrw
+xrw
 xrw
 fyB
 bQJ
@@ -345750,9 +345790,9 @@ yjK
 teA
 bMq
 uGB
-tet
-qiD
-fyB
+dYd
+tvB
+xlj
 dJH
 xTV
 fyB
@@ -346009,7 +346049,7 @@ bMq
 uBA
 tet
 ycx
-fyB
+xrw
 phg
 fic
 fyB
@@ -346266,7 +346306,7 @@ bMq
 uBA
 tet
 sSI
-fyB
+xrw
 qcg
 fzQ
 fyB
@@ -346523,8 +346563,8 @@ bMq
 tWr
 tet
 pfz
-fyB
-fyB
+xrw
+xrw
 lWE
 fyB
 hYg
@@ -351419,17 +351459,17 @@ kuG
 jCj
 tXB
 sph
-jEZ
+bQF
 aux
 kCv
-eJc
+dcM
 hCQ
 wqC
 nVy
 hCQ
-dXm
-dXm
-dXm
+qfv
+qfv
+qfv
 xMK
 xMK
 xMK
@@ -352959,7 +352999,7 @@ uqO
 izG
 sDI
 jCj
-tBs
+bkN
 vqE
 lOy
 gsm
@@ -353466,12 +353506,12 @@ cKu
 cKu
 uez
 dlo
-dlo
+uiw
 dlo
 tBs
 tBs
 tBs
-tBs
+kvw
 dlo
 tBs
 xTj
@@ -353487,7 +353527,7 @@ nIF
 nIF
 qRp
 dlu
-hCQ
+dlu
 hCQ
 hCQ
 hCQ
@@ -353743,9 +353783,9 @@ hUw
 nIF
 ovT
 tLt
+xiB
 dlu
 eRM
-xMP
 obW
 fSx
 wAH
@@ -354000,9 +354040,9 @@ hUw
 nIF
 bvA
 wRt
+pZk
 vtV
 sbV
-qeG
 wDT
 fSx
 jrQ
@@ -354257,9 +354297,9 @@ qxs
 nIF
 oHa
 hoY
+ugr
 dlu
 hOF
-vFW
 scF
 fSx
 bUb
@@ -354515,7 +354555,7 @@ jiH
 jiH
 jiH
 jiH
-vVZ
+jiH
 vVZ
 vVZ
 vVZ