diff --git a/code/game/objects/random/weapon.dm b/code/game/objects/random/weapon.dm
index a96a719744d..4667cebf9af 100644
--- a/code/game/objects/random/weapon.dm
+++ b/code/game/objects/random/weapon.dm
@@ -30,7 +30,7 @@
 /obj/random/ammo
 	name = "random ammunition"
 	desc = "This is some random ammunition."
-	icon_state = "needsprite"
+	icon_state = "need-sprite"
 	problist = list(
 		/obj/item/storage/box/shells/beanbags = 6,
 		/obj/item/storage/box/shells/slugs = 2,
@@ -206,7 +206,7 @@
 /obj/random/vault_weapon
 	name = "random vault weapon"
 	desc = "This is a random vault weapon."
-	icon_state = "needsprite"
+	icon_state = "kinetic"
 	spawnlist = list(
 		/obj/item/gun/custom_ka/frameA/prebuilt = 1,
 		/obj/item/gun/custom_ka/frameB/prebuilt = 0.5,
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/operations.dm b/code/game/objects/structures/crates_lockers/closets/secure/operations.dm
index f6bb0c12588..f980ae13b15 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/operations.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/operations.dm
@@ -54,6 +54,7 @@
 	new /obj/item/flashlight/marshallingwand(src)
 	new /obj/item/flashlight/marshallingwand(src)
 	new /obj/item/paint_sprayer(src)
+	new /obj/item/storage/toolbox/mechanical(src)
 
 // Machinist
 /obj/structure/closet/secure_closet/machinist
diff --git a/html/changelogs/CargoMapping.yml b/html/changelogs/CargoMapping.yml
new file mode 100644
index 00000000000..00ecab17531
--- /dev/null
+++ b/html/changelogs/CargoMapping.yml
@@ -0,0 +1,12 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixed a large number of overlapping wall objects in operations."
+  - bugfix: "Tool storage is now on the same grid as the hallway, rather than on the ops grid."
+  - rscadd: "Gave hangar techs a blue toolbox in their lockers to do their job with."
+  - rscadd: "Added a sheet snatcher to ops."
+  - rscadd: "Moved miner and OM spawn to the ops break room."
+  - rscadd: "Made the conveyor on the cargo elevator one shorter, to avoid loose items being shuffled off the elevator."
+  - bugfix: "Fixed two sprites mainly seen when mapping random object spawns."
diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm
index 73e7b7f49c4..5ff4e4af76f 100644
--- a/maps/sccv_horizon/sccv_horizon.dmm
+++ b/maps/sccv_horizon/sccv_horizon.dmm
@@ -3618,9 +3618,6 @@
 	pixel_y = 4;
 	pixel_x = 8
 	},
-/obj/machinery/light{
-	dir = 1
-	},
 /obj/machinery/button/switch/windowtint{
 	id = "OM Windows";
 	pixel_x = 4;
@@ -7678,7 +7675,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /obj/effect/floor_decal/spline/plain/brown,
 /obj/effect/landmark/start{
-	name = "Hangar Technician"
+	name = "Shaft Miner"
 	},
 /turf/simulated/floor/tiled/white,
 /area/horizon/operations/break_room)
@@ -8137,6 +8134,7 @@
 /obj/effect/landmark/start{
 	name = "Assistant"
 	},
+/obj/item/radio/intercom/north,
 /turf/simulated/floor/tiled,
 /area/horizon/operations/lobby)
 "aZW" = (
@@ -16676,14 +16674,10 @@
 /turf/simulated/floor,
 /area/horizon/maintenance/deck_3/aft/starboard)
 "chc" = (
-/obj/machinery/camera/network/supply{
-	c_tag = "Operations -  Upper Warehouse Port";
-	dir = 8
-	},
-/obj/item/radio/intercom/east,
 /obj/effect/floor_decal/corner/brown/full{
 	dir = 1
 	},
+/obj/item/radio/intercom/east,
 /turf/simulated/floor/tiled,
 /area/horizon/operations/office)
 "chf" = (
@@ -16894,6 +16888,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/operations/lobby)
 "ciR" = (
@@ -17569,7 +17566,6 @@
 "coo" = (
 /obj/machinery/door/airlock/highsecurity{
 	dir = 4;
-	icon_state = "door_locked";
 	id_tag = "airlocks_deck2_ammostorage";
 	locked = 1;
 	name = "Secure Ammunition Storage";
@@ -21849,7 +21845,6 @@
 /obj/effect/floor_decal/corner/dark_green{
 	dir = 10
 	},
-/obj/item/radio/intercom/south,
 /obj/machinery/camera/network/second_deck{
 	c_tag = "Second Deck - Auxiliary Custodial Closet Entrance";
 	dir = 1
@@ -26812,6 +26807,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/horizon/operations/office)
 "dwn" = (
@@ -32944,7 +32940,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/horizon/engineering/atmos/turbine)
 "elM" = (
-/obj/machinery/alarm/south,
 /obj/structure/closet/secure_closet/hangar_tech,
 /obj/effect/floor_decal/corner/brown/full{
 	dir = 4
@@ -33765,7 +33760,6 @@
 /obj/effect/floor_decal/corner/brown/full{
 	dir = 8
 	},
-/obj/machinery/alarm/north,
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/vending/wardrobe/cargo_wardrobe,
 /turf/simulated/floor/tiled,
@@ -39934,6 +39928,7 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 10
 	},
+/obj/machinery/firealarm/south,
 /turf/simulated/floor/tiled,
 /area/horizon/operations/break_room)
 "fjq" = (
@@ -40814,6 +40809,9 @@
 	icon_state = "2-4"
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plating,
 /area/horizon/operations/lobby)
 "fpG" = (
@@ -40967,9 +40965,6 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 9
 	},
-/obj/machinery/light{
-	dir = 8
-	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "fqO" = (
@@ -41991,15 +41986,9 @@
 /turf/simulated/floor/tiled/white,
 /area/horizon/medical/hallway)
 "fzv" = (
-/obj/machinery/conveyor{
-	dir = 1;
-	id = "QMLoad";
-	color = "#CCCCCC"
-	},
 /obj/effect/floor_decal/industrial/warning,
 /obj/structure/railing/mapped,
-/obj/effect/floor_decal/industrial/hatch/operations,
-/turf/simulated/floor/tiled/dark/full,
+/turf/simulated/floor/tiled/full,
 /area/supply/dock)
 "fzw" = (
 /obj/effect/decal/fake_object{
@@ -45582,7 +45571,6 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
-/obj/structure/extinguisher_cabinet/south,
 /turf/simulated/floor/tiled,
 /area/horizon/operations/lobby)
 "fYN" = (
@@ -46104,6 +46092,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/operations/lobby)
 "gco" = (
@@ -46886,7 +46877,6 @@
 "giz" = (
 /obj/machinery/door/airlock/highsecurity{
 	dir = 4;
-	icon_state = "door_locked";
 	id_tag = "airlocks_deck2_ammostorage";
 	locked = 1;
 	name = "Secure Ammunition Storage";
@@ -47095,6 +47085,9 @@
 	req_one_access = list(24,11,67,73);
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/full,
 /area/horizon/operations/lobby)
 "gjT" = (
@@ -51433,12 +51426,17 @@
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/legion)
 "gNi" = (
-/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/effect/floor_decal/corner/brown{
+	dir = 5
+	},
+/obj/machinery/light{
+	dir = 1
+	},
 /obj/effect/landmark/start{
 	name = "Shaft Miner"
 	},
-/turf/simulated/floor/tiled/dark,
-/area/horizon/operations/mining_main/eva)
+/turf/simulated/floor/tiled,
+/area/horizon/operations/break_room)
 "gNm" = (
 /obj/item/holomenu{
 	pixel_y = 5;
@@ -53704,14 +53702,16 @@
 /turf/simulated/floor/marble/dark,
 /area/horizon/holodeck/source_tribunal)
 "hdj" = (
-/obj/effect/floor_decal/corner/brown{
-	dir = 5
+/obj/machinery/conveyor{
+	dir = 4;
+	id = "sorting";
+	reversed = 1
 	},
-/obj/machinery/light/floor{
-	dir = 1
+/obj/machinery/camera/network/supply{
+	c_tag = "Operations - Mail Sorting"
 	},
-/turf/simulated/floor/tiled,
-/area/horizon/operations/office)
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/operations/mail_room)
 "hdo" = (
 /obj/effect/floor_decal/corner_wide/lime{
 	dir = 6
@@ -60983,6 +60983,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
+/obj/effect/landmark/start{
+	name = "Shaft Miner"
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/operations/break_room)
 "ian" = (
@@ -66240,20 +66243,12 @@
 /obj/effect/floor_decal/corner/brown/full{
 	dir = 8
 	},
-/obj/machinery/camera/network/supply{
-	c_tag = "Operations - Main Desk";
-	dir = 4
-	},
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/table/standard,
 /obj/item/stack/material/glass/full,
 /obj/item/stack/material/steel/full,
 /obj/item/stack/material/plastic/full,
 /obj/item/stack/material/aluminium/full,
-/obj/item/storage/belt/utility,
-/obj/machinery/light{
-	dir = 8
-	},
 /obj/item/radio/intercom/west,
 /turf/simulated/floor/tiled,
 /area/horizon/operations/office)
@@ -71225,6 +71220,7 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 9
 	},
+/obj/machinery/alarm/west,
 /turf/simulated/floor/tiled,
 /area/horizon/operations/break_room)
 "jsX" = (
@@ -73329,6 +73325,9 @@
 	dir = 4
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plating,
 /area/horizon/operations/lobby)
 "jId" = (
@@ -74657,9 +74656,6 @@
 /obj/structure/closet/walllocker/medical/firstaid{
 	pixel_x = 32
 	},
-/obj/machinery/light/small{
-	dir = 4
-	},
 /turf/simulated/floor/tiled/gridded,
 /area/horizon/operations/warehouse)
 "jRJ" = (
@@ -76911,7 +76907,6 @@
 	dir = 4;
 	pixel_x = 13
 	},
-/obj/machinery/light/small,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -77345,9 +77340,6 @@
 /obj/structure/bed/stool/chair/office/dark{
 	dir = 4
 	},
-/obj/effect/landmark/start{
-	name = "Operations Manager"
-	},
 /turf/simulated/floor/carpet,
 /area/horizon/command/heads/om)
 "kip" = (
@@ -78721,21 +78713,12 @@
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/primary/deck_2/central)
 "krp" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/floor_decal/corner/brown{
+	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor/plating,
-/area/horizon/maintenance/deck_2/wing/starboard/near)
+/obj/machinery/alarm/north,
+/turf/simulated/floor/tiled,
+/area/horizon/operations/break_room)
 "krr" = (
 /obj/effect/map_effect/window_spawner/full/borosilicate/reinforced,
 /turf/simulated/floor/tiled/dark/full,
@@ -79584,7 +79567,6 @@
 	},
 /obj/structure/closet/secure_closet/operations_manager,
 /obj/effect/floor_decal/industrial/outline/operations,
-/obj/machinery/light,
 /turf/simulated/floor/tiled/full,
 /area/horizon/command/heads/om)
 "kwI" = (
@@ -83353,6 +83335,9 @@
 	icon_state = "pipe-j2"
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plating,
 /area/horizon/operations/lobby)
 "kVr" = (
@@ -83812,15 +83797,15 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 5
 	},
-/obj/machinery/light{
-	dir = 1
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
 /obj/machinery/light_switch/north{
 	pixel_x = -8
 	},
+/obj/machinery/light/floor{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/operations/loading)
 "kYo" = (
@@ -84557,12 +84542,12 @@
 /area/horizon/engineering/storage/lower)
 "lcZ" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/lattice/catwalk/indoor/grate/damaged{
-	color = "#4c535b"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/lattice/catwalk/indoor/grate/damaged{
+	color = "#4c535b"
+	},
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_1/wing/starboard)
 "lde" = (
@@ -86329,6 +86314,9 @@
 	dir = 1
 	},
 /obj/structure/punching_bag,
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/operations/break_room)
 "lpe" = (
@@ -92284,7 +92272,6 @@
 /obj/effect/floor_decal/corner/brown/full{
 	dir = 4
 	},
-/obj/item/destTagger,
 /obj/item/paper_scanner,
 /obj/item/quikpay{
 	destinationact = "Operations"
@@ -93925,16 +93912,6 @@
 /obj/structure/bed/stool/chair/padded/beige,
 /turf/simulated/floor/wood,
 /area/horizon/command/bridge/minibar)
-"mpL" = (
-/obj/effect/floor_decal/industrial/warning,
-/obj/structure/railing/mapped,
-/obj/effect/floor_decal/industrial/hatch/operations,
-/obj/machinery/conveyor{
-	id = "cargo_1";
-	color = "#CCCCCC"
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/supply/dock)
 "mpM" = (
 /obj/effect/floor_decal/spline/plain/corner,
 /obj/effect/floor_decal/corner/red/diagonal,
@@ -95084,7 +95061,6 @@
 /turf/unsimulated/floor,
 /area/centcom/legion)
 "mxF" = (
-/obj/machinery/alarm/east,
 /obj/structure/railing/mapped,
 /turf/simulated/open,
 /area/horizon/operations/office)
@@ -95805,6 +95781,9 @@
 	dir = 1;
 	icon_state = "pipe-c"
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/operations/lobby)
 "mDC" = (
@@ -97047,12 +97026,12 @@
 /obj/machinery/firealarm/west{
 	pixel_x = -24
 	},
+/obj/structure/railing/mapped,
+/obj/structure/disposalpipe/segment,
 /obj/machinery/camera/network/supply{
 	c_tag = "Operations - Warehouse Entrance";
 	dir = 4
 	},
-/obj/structure/railing/mapped,
-/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/horizon/operations/loading)
 "mLM" = (
@@ -97689,7 +97668,7 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/structure/cable/green{
-	icon_state = "1-8"
+	icon_state = "1-4"
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/operations/lobby)
@@ -99758,11 +99737,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 8
 	},
-/obj/structure/lattice/catwalk/indoor/grate/dark,
 /obj/structure/disposalpipe/segment{
 	dir = 4;
 	icon_state = "pipe-c"
 	},
+/obj/structure/lattice/catwalk/indoor/grate/dark,
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_2/wing/starboard/near)
 "neA" = (
@@ -100261,13 +100240,13 @@
 /turf/simulated/floor/holofloor/tiled,
 /area/horizon/holodeck/source_combat_training)
 "nin" = (
-/obj/machinery/light/floor{
-	dir = 8
-	},
 /obj/structure/bed/stool/chair/padded/brown,
 /obj/effect/floor_decal/corner/brown/full{
 	dir = 8
 	},
+/obj/machinery/light/floor{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/operations/office)
 "nir" = (
@@ -103983,9 +103962,6 @@
 /area/horizon/operations/machinist)
 "nJi" = (
 /obj/effect/floor_decal/corner_wide/grey/diagonal,
-/obj/machinery/light{
-	dir = 1
-	},
 /obj/structure/table/standard,
 /turf/simulated/floor/tiled/white,
 /area/horizon/operations/break_room)
@@ -109444,10 +109420,10 @@
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
-/obj/structure/lattice/catwalk/indoor/grate/dark,
 /obj/machinery/light/small/emergency{
 	dir = 8
 	},
+/obj/structure/lattice/catwalk/indoor/grate/dark,
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_2/wing/starboard/near)
 "ovc" = (
@@ -113896,12 +113872,12 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/light{
-	dir = 1
-	},
 /obj/effect/floor_decal/corner/brown{
 	dir = 5
 	},
+/obj/machinery/light/floor{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/operations/loading)
 "oYa" = (
@@ -115067,6 +115043,9 @@
 	dir = 6
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/light/small{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/horizon/operations/break_room)
 "pgw" = (
@@ -115795,6 +115774,7 @@
 /obj/structure/closet/walllocker/medical/firstaid{
 	pixel_y = -32
 	},
+/obj/machinery/light/floor,
 /turf/simulated/floor/tiled,
 /area/horizon/operations/office)
 "plP" = (
@@ -117551,9 +117531,6 @@
 /turf/simulated/floor/wood,
 /area/horizon/service/mess_hall)
 "pyx" = (
-/obj/machinery/light{
-	dir = 4
-	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /obj/effect/floor_decal/corner/brown/full{
 	dir = 1
@@ -117563,6 +117540,7 @@
 	pixel_x = 24;
 	pixel_y = 24
 	},
+/obj/machinery/alarm/east,
 /turf/simulated/floor/tiled,
 /area/horizon/operations/office)
 "pyz" = (
@@ -118109,9 +118087,6 @@
 /obj/structure/toilet{
 	dir = 4
 	},
-/obj/machinery/light/small{
-	dir = 1
-	},
 /obj/machinery/button/remote/airlock{
 	dir = 1;
 	id = "cargobreak_stall";
@@ -118121,6 +118096,9 @@
 	specialfunctions = 4
 	},
 /obj/effect/floor_decal/corner/green/diagonal,
+/obj/machinery/light/small{
+	must_start_working = 1
+	},
 /turf/simulated/floor/tiled/white,
 /area/horizon/operations/break_room)
 "pCe" = (
@@ -120806,9 +120784,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/mercenary)
 "pVT" = (
-/obj/machinery/light/small{
-	dir = 1
-	},
 /obj/machinery/button/remote/airlock{
 	dir = 1;
 	id = "cargobreak_shower";
@@ -120821,6 +120796,9 @@
 /obj/machinery/shower{
 	dir = 4
 	},
+/obj/machinery/light/small{
+	must_start_working = 1
+	},
 /turf/simulated/floor/tiled/freezer,
 /area/horizon/operations/break_room)
 "pVY" = (
@@ -123175,10 +123153,6 @@
 /area/horizon/engineering/hallway/aft)
 "qmv" = (
 /obj/item/radio/intercom/south,
-/obj/machinery/camera/network/supply{
-	c_tag = "Operations - Lower Warehouse 4";
-	dir = 1
-	},
 /obj/effect/floor_decal/corner/brown{
 	dir = 10
 	},
@@ -127062,6 +127036,9 @@
 /obj/effect/floor_decal/corner/brown/full{
 	dir = 1
 	},
+/obj/effect/landmark/start{
+	name = "Operations Manager"
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/operations/break_room)
 "qNb" = (
@@ -128528,6 +128505,7 @@
 	},
 /obj/vehicle/train/cargo/trolley,
 /obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/firealarm/south,
 /turf/simulated/floor/tiled/slate/full,
 /area/horizon/operations/warehouse)
 "qXC" = (
@@ -128564,9 +128542,6 @@
 /obj/structure/bed/stool/chair/folding{
 	dir = 4
 	},
-/obj/machinery/light{
-	dir = 8
-	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "qXH" = (
@@ -129235,9 +129210,6 @@
 /obj/item/folder/yellow{
 	pixel_x = 6
 	},
-/obj/item/price_scanner{
-	pixel_x = 6
-	},
 /obj/item/pen/black,
 /turf/simulated/floor/tiled,
 /area/horizon/operations/office)
@@ -130578,9 +130550,7 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 9
 	},
-/obj/effect/landmark/start{
-	name = "Shaft Miner"
-	},
+/obj/machinery/firealarm/west,
 /turf/simulated/floor/tiled/dark,
 /area/horizon/operations/mining_main/eva)
 "rlx" = (
@@ -135151,9 +135121,6 @@
 /obj/effect/floor_decal/corner/green/full{
 	dir = 1
 	},
-/obj/machinery/light/small{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
@@ -144819,9 +144786,6 @@
 	dir = 8
 	},
 /obj/effect/floor_decal/industrial/outline/emergency_closet,
-/obj/machinery/light{
-	dir = 8
-	},
 /turf/simulated/floor/tiled,
 /area/horizon/operations/office)
 "tda" = (
@@ -149697,9 +149661,6 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 9
 	},
-/obj/machinery/light/floor{
-	dir = 8
-	},
 /obj/structure/bed/stool/chair/padded/brown{
 	dir = 1
 	},
@@ -150362,12 +150323,12 @@
 	},
 /obj/machinery/fabricator/autolathe,
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/light{
-	dir = 1
-	},
 /obj/machinery/light_switch/north{
 	pixel_x = -6
 	},
+/obj/machinery/camera/network/supply{
+	c_tag = "Operations - Main Desk"
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/operations/office)
 "tNI" = (
@@ -155243,6 +155204,7 @@
 /obj/effect/floor_decal/corner/dark_green{
 	dir = 5
 	},
+/obj/structure/extinguisher_cabinet/north,
 /turf/simulated/floor/tiled,
 /area/horizon/operations/lobby)
 "uwE" = (
@@ -155723,6 +155685,18 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/security/hallway)
+"uAz" = (
+/obj/effect/floor_decal/corner/brown{
+	dir = 10
+	},
+/obj/vehicle/train/cargo/trolley,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/camera/network/supply{
+	c_tag = "Operations - Lower Warehouse 4";
+	dir = 1
+	},
+/turf/simulated/floor/tiled/slate/full,
+/area/horizon/operations/warehouse)
 "uAA" = (
 /obj/effect/floor_decal/industrial/outline/grey,
 /obj/random/maintenance_junk_or_loot,
@@ -156932,6 +156906,9 @@
 	dir = 1
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plating,
 /area/horizon/operations/lobby)
 "uHI" = (
@@ -157780,6 +157757,10 @@
 /obj/structure/platform_deco/ledge{
 	dir = 6
 	},
+/obj/machinery/camera/network/supply{
+	c_tag = "Operations -  Upper Warehouse Port";
+	dir = 8
+	},
 /turf/simulated/open,
 /area/horizon/operations/office)
 "uNu" = (
@@ -158434,6 +158415,10 @@
 /obj/structure/railing/mapped{
 	dir = 4
 	},
+/obj/structure/table/standard{
+	no_cargo = 1
+	},
+/obj/item/storage/bag/sheetsnatcher,
 /turf/simulated/floor/tiled,
 /area/horizon/operations/loading)
 "uSm" = (
@@ -158955,13 +158940,9 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 6
 	},
-/obj/machinery/firealarm/east,
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/effect/landmark/start{
-	name = "Shaft Miner"
-	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/operations/mining_main/eva)
 "uVw" = (
@@ -159960,6 +159941,7 @@
 /obj/structure/railing/mapped{
 	dir = 8
 	},
+/obj/structure/extinguisher_cabinet/east,
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "vcx" = (
@@ -163368,7 +163350,6 @@
 	pixel_y = 1;
 	pixel_x = -1
 	},
-/obj/machinery/firealarm/south,
 /turf/simulated/floor/tiled,
 /area/horizon/operations/mining_main/refinery)
 "vCc" = (
@@ -163883,6 +163864,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-8"
 	},
+/obj/structure/extinguisher_cabinet/south,
 /turf/simulated/floor/tiled/slate,
 /area/horizon/operations/warehouse)
 "vFG" = (
@@ -166972,11 +166954,11 @@
 /obj/machinery/door/firedoor{
 	dir = 4
 	},
+/obj/effect/floor_decal/industrial/hatch_door/yellow,
 /obj/machinery/door/airlock/maintenance{
 	dir = 4;
 	req_access = list(48)
 	},
-/obj/effect/floor_decal/industrial/hatch_door/yellow,
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/operations/mining_main/eva)
 "wck" = (
@@ -169937,6 +169919,9 @@
 /obj/structure/disposalpipe/junction{
 	dir = 8
 	},
+/obj/effect/landmark/start{
+	name = "Hangar Technician"
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/operations/break_room)
 "wtv" = (
@@ -170136,6 +170121,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/operations/lobby)
 "wus" = (
@@ -171164,14 +171152,11 @@
 /obj/machinery/light_switch/west{
 	pixel_y = -3
 	},
-/obj/machinery/camera/network/supply{
-	c_tag = "Operations - Mail Sorting";
-	dir = 4
-	},
 /obj/structure/disposalpipe/segment,
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 4
 	},
+/obj/structure/table/standard,
 /turf/simulated/floor/tiled,
 /area/horizon/operations/mail_room)
 "wBP" = (
@@ -176816,6 +176801,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/survey_probe,
+/obj/machinery/firealarm/south,
 /turf/simulated/floor/tiled,
 /area/horizon/operations/mining_main/refinery)
 "xnl" = (
@@ -178692,7 +178678,7 @@
 /turf/simulated/floor/shuttle/dark_blue,
 /area/shuttle/transport1)
 "xAf" = (
-/obj/machinery/light/small{
+/obj/machinery/light{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/gridded,
@@ -182556,9 +182542,6 @@
 /obj/structure/cable/green{
 	icon_state = "1-8"
 	},
-/obj/structure/cable/green{
-	icon_state = "1-4"
-	},
 /turf/simulated/floor/tiled,
 /area/horizon/operations/lobby)
 "ybP" = (
@@ -205586,7 +205569,7 @@ hyD
 ayi
 emr
 rPC
-qXB
+uAz
 wlr
 oIY
 lZm
@@ -212775,7 +212758,7 @@ pzV
 wZA
 dFP
 jhe
-gNi
+xCU
 tXV
 wZA
 krH
@@ -269073,7 +269056,7 @@ dEI
 dEI
 dEI
 euG
-gxN
+lDz
 mSR
 fAi
 yex
@@ -269330,7 +269313,7 @@ rCM
 tAH
 dEI
 uwC
-gxN
+lDz
 mSR
 fXl
 ngp
@@ -269844,7 +269827,7 @@ vSP
 jai
 dEI
 cHA
-lDz
+gxN
 bBK
 ngp
 ngp
@@ -270606,7 +270589,7 @@ rTW
 xYF
 dQN
 epa
-hdj
+aFJ
 jWv
 dhN
 avu
@@ -270849,7 +270832,7 @@ rPd
 rPd
 oJM
 nwj
-rNQ
+gNi
 uGE
 hoO
 eUZ
@@ -271106,7 +271089,7 @@ jkr
 jkr
 pyM
 nwj
-lhf
+krp
 pgA
 pgA
 mzm
@@ -271120,7 +271103,7 @@ eSs
 qGy
 dLQ
 aic
-hdj
+aFJ
 wer
 gal
 dJw
@@ -272646,7 +272629,7 @@ sON
 ltE
 dUV
 khW
-krp
+ebm
 nwj
 vwY
 eTz
@@ -274717,7 +274700,7 @@ rPd
 rPd
 hxm
 qAo
-jNv
+hdj
 dov
 etd
 qAo
@@ -390214,7 +390197,7 @@ hZi
 hZi
 hZi
 hZi
-mpL
+fzv
 dFx
 sJv
 eSV