diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 3570096d1ff..3b63a73ee7b 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -1124,3 +1124,52 @@
 			to_chat(user, SPAN_WARNING("\The [src] needs to be empty before you can do that!"))
 	else
 		..()
+
+// Flares
+/obj/item/storage/box/flares
+	name = "flares box"
+	desc = "A box full of flares."
+	foldable = FALSE
+	max_storage_space = 4
+	can_hold = list(
+		/obj/item/device/flashlight/flare
+	)
+	starts_with = list(
+		/obj/item/device/flashlight/flare = 4
+	)
+
+// Magnetic Locks
+/obj/item/storage/box/magnetic_locks
+	name = "magnetic lock box"
+	desc = "A box full of magnetic locks."
+	w_class = ITEMSIZE_LARGE
+	max_w_class = ITEMSIZE_NORMAL
+	foldable = FALSE
+	max_storage_space = 16
+	can_hold = list(
+		/obj/item/device/magnetic_lock
+	)
+	starts_with = list(
+		/obj/item/device/magnetic_lock = 4
+	)
+
+// Power Cells
+/obj/item/storage/box/cell
+	name = "power cell box"
+	desc = "A box full of power cells."
+	foldable = FALSE
+	max_storage_space = 6
+	can_hold = list(
+		/obj/item/cell
+	)
+	starts_with = list(
+		/obj/item/cell = 3
+	)
+
+// High-capacity Power Cells
+/obj/item/storage/box/cell/high
+	name = "high-capacity power cell box"
+	desc = "A box full of high-capacity power cells."
+	starts_with = list(
+		/obj/item/cell/high = 3
+	)
\ No newline at end of file
diff --git a/html/changelogs/crew_armoury_tweaks.yml b/html/changelogs/crew_armoury_tweaks.yml
new file mode 100644
index 00000000000..3a6707b35cb
--- /dev/null
+++ b/html/changelogs/crew_armoury_tweaks.yml
@@ -0,0 +1,7 @@
+author: SleepyGemmy
+
+delete-after: True
+
+changes:
+  - maptweak: "Tweaks the layout of the crew armoury. Gives it some polish."
+  - tweak: "Puts some of the contents in the crew armoury into dedicated boxes."
\ No newline at end of file
diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
index 91207aceef2..0a6abe1f1e5 100644
--- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
+++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
@@ -639,9 +639,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/starboard)
-"bj" = (
-/turf/template_noop,
-/area/space)
 "bk" = (
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/bridge/aibunker)
@@ -703,10 +700,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/bridge/aibunker)
 "bp" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
-	},
-/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "bq" = (
@@ -987,7 +981,6 @@
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
 	},
-/obj/structure/railing/mapped,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "bR" = (
@@ -1279,10 +1272,11 @@
 	},
 /obj/machinery/door/blast/regular{
 	id = "crew_armoury_desk";
-	name = "Crew Armoury Desk"
+	name = "Crew Armoury Desk";
+	is_critical = 1
 	},
 /obj/machinery/door/firedoor,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/dark/full,
 /area/crew_armory)
 "cw" = (
 /obj/structure/cable/green{
@@ -1472,10 +1466,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/bridge/aibunker)
 "cM" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 9
+	},
 /obj/structure/cable/green{
-	icon_state = "1-2"
+	icon_state = "1-8"
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
@@ -1775,20 +1770,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/bridge)
-"dr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/effect/floor_decal/spline/plain{
-	dir = 8
-	},
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/dark,
-/area/maintenance/engineering_ladder)
 "ds" = (
 /obj/effect/floor_decal/corner/green/diagonal{
 	dir = 8
@@ -2279,13 +2260,9 @@
 /turf/simulated/open/airless,
 /area/template_noop)
 "eb" = (
-/obj/machinery/camera/motion{
-	alarm_on = 1;
-	c_tag = "Third Deck - Crew Armoury Port";
-	dir = 1;
-	name = "security";
-	network = list("Command, Security")
-	},
+/obj/effect/floor_decal/corner/yellow/diagonal,
+/obj/effect/floor_decal/industrial/outline/engineering,
+/obj/machinery/shieldwallgen,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "ec" = (
@@ -3104,8 +3081,9 @@
 	name = "Station Intercom (General)";
 	pixel_x = -24
 	},
-/obj/effect/floor_decal/industrial/loading/yellow,
-/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/effect/floor_decal/corner/blue/diagonal,
+/obj/effect/floor_decal/industrial/outline/security,
+/obj/machinery/deployable/barrier,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "fP" = (
@@ -3231,7 +3209,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/dark/full,
 /area/crew_armory)
 "gb" = (
 /obj/structure/bed/stool/chair/office/bridge,
@@ -3892,16 +3870,6 @@
 /obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/break_room)
-"hl" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance_hatch{
-	req_one_access = list(12)
-	},
-/turf/simulated/floor,
-/area/maintenance/engineering_ladder)
 "hm" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 1
@@ -4011,7 +3979,8 @@
 "hy" = (
 /obj/machinery/deployable/barrier,
 /obj/effect/floor_decal/corner/blue/diagonal,
-/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/effect/floor_decal/industrial/outline/security,
+/obj/machinery/light,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "hz" = (
@@ -4187,18 +4156,16 @@
 /turf/simulated/floor/lino/grey,
 /area/horizon/deck_three/cafeteria)
 "hO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
 /obj/structure/cable/green{
-	icon_state = "1-2"
+	icon_state = "4-8"
 	},
-/obj/effect/floor_decal/spline/plain{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/visible{
+	dir = 4
 	},
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/light{
-	dir = 8
+/obj/machinery/door/airlock/maintenance{
+	req_one_access = list(12)
 	},
-/turf/simulated/floor,
+/turf/simulated/floor/tiled/full,
 /area/maintenance/engineering_ladder)
 "hP" = (
 /obj/effect/floor_decal/corner/green{
@@ -4915,11 +4882,8 @@
 	c_tag = "Third Deck - Starboard Aft Lounge";
 	dir = 1
 	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
+/obj/structure/bed/stool/chair/padded/brown{
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/port)
@@ -5233,6 +5197,14 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 9
 	},
+/obj/machinery/camera/network/third_deck{
+	c_tag = "Third Deck - Crew Armoury Entrance"
+	},
+/obj/structure/sign/securearea{
+	pixel_y = 32;
+	name = "\improper CREW ARMOURY sign";
+	desc = "A sign which reads 'CREW ARMOURY'."
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/port)
 "jy" = (
@@ -5887,16 +5859,16 @@
 /area/hallway/secondary/entry/emergency)
 "kJ" = (
 /obj/structure/closet/secure_closet/guncabinet{
-	name = "Weaponry (Ammo)";
+	name = "Weaponry (.45 Magazines)";
 	req_access = null;
 	req_one_access = list(3,19)
 	},
 /obj/structure/railing/mapped,
 /obj/effect/floor_decal/corner/red/diagonal,
-/obj/effect/floor_decal/industrial/outline/yellow,
 /obj/item/ammo_magazine/c45m,
 /obj/item/ammo_magazine/c45m,
 /obj/item/ammo_magazine/c45m,
+/obj/effect/floor_decal/industrial/outline/red,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "kK" = (
@@ -5930,10 +5902,22 @@
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/starboard/docks)
 "kN" = (
-/obj/effect/floor_decal/industrial/loading/yellow{
-	dir = 1
+/obj/structure/table/steel,
+/obj/machinery/recharger{
+	pixel_x = -6;
+	pixel_y = 12
 	},
-/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/recharger{
+	pixel_x = 6;
+	pixel_y = 12
+	},
+/obj/machinery/recharger{
+	pixel_x = -6
+	},
+/obj/machinery/recharger{
+	pixel_x = 6
+	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "kO" = (
@@ -6688,18 +6672,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/horizon/crew_quarters/fitness/pool)
 "mg" = (
-/obj/structure/table/rack,
-/obj/effect/floor_decal/corner/blue/diagonal,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/storage/firstaid/regular,
-/obj/item/storage/firstaid/regular,
-/obj/item/clothing/accessory/armband/med,
-/obj/item/clothing/accessory/armband/med,
-/obj/item/storage/firstaid/surgery,
+/obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "mh" = (
@@ -8057,16 +8030,11 @@
 /turf/simulated/floor/tiled,
 /area/bridge)
 "oG" = (
-/obj/effect/floor_decal/corner/red/diagonal,
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
 	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/turf/simulated/floor/tiled/dark,
-/area/crew_armory)
+/turf/simulated/floor/tiled,
+/area/hallway/primary/port)
 "oH" = (
 /obj/item/autopsy_scanner{
 	pixel_x = -6;
@@ -8128,7 +8096,14 @@
 /area/bridge/controlroom)
 "oM" = (
 /obj/effect/floor_decal/corner/red/diagonal,
-/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/recharger/wallcharger{
+	pixel_x = -28;
+	pixel_y = 3
+	},
+/obj/machinery/recharger/wallcharger{
+	pixel_x = -28;
+	pixel_y = -10
+	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "oN" = (
@@ -9320,8 +9295,8 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 5
 	},
-/obj/machinery/vending/cigarette,
 /obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/vending/coffee,
 /turf/simulated/floor/tiled,
 /area/hallway/primary/port)
 "rh" = (
@@ -9625,15 +9600,14 @@
 /turf/simulated/wall,
 /area/crew_quarters/lounge/secondary)
 "rH" = (
-/obj/machinery/recharger/wallcharger{
-	pixel_x = 5;
-	pixel_y = 32
+/obj/machinery/light{
+	dir = 1
 	},
-/obj/machinery/recharger/wallcharger{
-	pixel_x = 5;
-	pixel_y = 24
+/obj/machinery/alarm{
+	pixel_y = 28
 	},
-/obj/effect/floor_decal/spline/plain,
+/obj/effect/floor_decal/corner/red/diagonal,
+/obj/structure/bed/stool/padded/black,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "rI" = (
@@ -9897,6 +9871,31 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/bridge/bridge_crew)
+"sh" = (
+/obj/structure/table/rack,
+/obj/item/clothing/accessory/armband/sec,
+/obj/item/clothing/accessory/armband/sec,
+/obj/item/clothing/accessory/armband/sec,
+/obj/item/clothing/suit/armor/carrier/generic,
+/obj/item/clothing/suit/armor/carrier/generic,
+/obj/item/clothing/suit/armor/carrier/generic,
+/obj/item/clothing/head/helmet/security/generic,
+/obj/item/clothing/head/helmet/security/generic,
+/obj/item/clothing/head/helmet/security/generic,
+/obj/item/clothing/accessory/arm_guard/generic,
+/obj/item/clothing/accessory/arm_guard/generic,
+/obj/item/clothing/accessory/arm_guard/generic,
+/obj/item/clothing/accessory/leg_guard/generic,
+/obj/item/clothing/accessory/leg_guard/generic,
+/obj/item/clothing/accessory/leg_guard/generic,
+/obj/effect/floor_decal/corner/red/diagonal,
+/obj/effect/floor_decal/industrial/outline/red,
+/obj/structure/railing/mapped,
+/obj/structure/railing/mapped{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/crew_armory)
 "si" = (
 /obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /turf/simulated/floor/tiled/dark/full,
@@ -10155,6 +10154,12 @@
 /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup,
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hop/xo)
+"sI" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/dark,
+/area/crew_armory)
 "sJ" = (
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 1
@@ -11267,6 +11272,12 @@
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/entry/emergency)
+"uI" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/hallway/primary/port)
 "uJ" = (
 /obj/structure/flora/ausbushes/fullgrass,
 /obj/effect/floor_decal/spline/plain{
@@ -11976,16 +11987,20 @@
 /turf/simulated/floor/wood,
 /area/bridge/meeting_room)
 "vX" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/structure/closet/secure_closet/guncabinet{
+	name = "Weaponry (Combat Laser Rifle)";
+	req_access = null;
+	req_one_access = list(3,19)
 	},
-/obj/effect/floor_decal/spline/plain{
+/obj/item/gun/energy/rifle/laser/noctiluca,
+/obj/effect/floor_decal/corner/red/diagonal,
+/obj/effect/floor_decal/industrial/outline/red,
+/obj/structure/railing/mapped{
 	dir = 8
 	},
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/railing/mapped,
 /turf/simulated/floor/tiled/dark,
-/area/maintenance/engineering_ladder)
+/area/crew_armory)
 "vY" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -12043,6 +12058,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/bridge/controlroom)
+"we" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 6
+	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/tiled,
+/area/hallway/primary/port)
 "wf" = (
 /obj/effect/floor_decal/corner/blue/diagonal,
 /obj/machinery/atmospherics/pipe/manifold/hidden/cyan,
@@ -13322,7 +13346,8 @@
 	},
 /obj/machinery/door/blast/regular{
 	id = "crew_armoury_desk";
-	name = "Crew Armoury Desk"
+	name = "Crew Armoury Desk";
+	is_critical = 1
 	},
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -13335,7 +13360,7 @@
 	icon_state = "4-8"
 	},
 /obj/effect/floor_decal/industrial/hatch/yellow,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/dark/full,
 /area/crew_armory)
 "yz" = (
 /obj/structure/cable/green{
@@ -13648,10 +13673,15 @@
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/starboard)
 "ze" = (
-/obj/structure/bed/stool/chair/padded/brown,
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 6
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/port)
 "zf" = (
@@ -13660,6 +13690,14 @@
 	dir = 1
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/button/remote/blast_door{
+	id = "crew_armory";
+	name = "Crew Armoury Main Access";
+	req_access = list(60);
+	dir = 8;
+	pixel_x = 25;
+	pixel_y = -7
+	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "zg" = (
@@ -14677,7 +14715,7 @@
 /obj/item/device/radio/intercom{
 	dir = 1;
 	name = "Station Intercom (General)";
-	pixel_y = -21
+	pixel_y = -24
 	},
 /obj/structure/bed/stool/chair/padded/brown{
 	dir = 4
@@ -14822,9 +14860,6 @@
 /area/lawoffice/consular)
 "Bs" = (
 /obj/effect/floor_decal/corner/red/diagonal,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "Bt" = (
@@ -15356,20 +15391,9 @@
 	},
 /area/bridge/controlroom)
 "Cx" = (
-/obj/effect/floor_decal/corner/paleblue{
-	dir = 5
-	},
-/obj/machinery/camera/network/third_deck{
-	c_tag = "Third Deck - Crew Armoury Entrance"
-	},
-/obj/machinery/status_display{
-	layer = 4;
-	pixel_y = 32
-	},
-/obj/machinery/vending/snack,
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/effect/floor_decal/industrial/warning/corner{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/port)
@@ -15441,6 +15465,22 @@
 /obj/machinery/portable_atmospherics/canister/air,
 /turf/simulated/floor/tiled,
 /area/maintenance/aux_atmospherics/deck_3)
+"CG" = (
+/obj/structure/table/rack,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/item/stack/material/plasteel{
+	amount = 20
+	},
+/obj/item/stack/material/steel/full,
+/obj/item/stack/material/steel/full,
+/obj/item/stack/material/steel/full,
+/obj/item/stack/liquidbags/half_full,
+/obj/item/stack/barbed_wire/half_full,
+/obj/machinery/status_display/supply_display{
+	pixel_y = 32
+	},
+/turf/simulated/floor/tiled/dark,
+/area/crew_armory)
 "CH" = (
 /obj/effect/floor_decal/industrial/warning/cee{
 	dir = 8
@@ -15469,13 +15509,13 @@
 	})
 "CJ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/light/small/emergency{
-	dir = 8
-	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/door/airlock/maintenance_hatch{
+	req_one_access = list(12)
+	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor,
 /area/maintenance/engineering_ladder)
 "CK" = (
@@ -15559,10 +15599,18 @@
 /turf/simulated/floor,
 /area/maintenance/bridge)
 "CR" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
+/obj/machinery/door/airlock/glass_security{
+	name = "Crew Armoury"
 	},
-/turf/simulated/floor/tiled/dark,
+/obj/machinery/door/blast/regular{
+	dir = 4;
+	id = "crew_armory";
+	name = "Crew Armoury";
+	is_critical = 1
+	},
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled/dark/full,
 /area/crew_armory)
 "CS" = (
 /obj/machinery/camera/network/third_deck{
@@ -15643,15 +15691,13 @@
 /turf/simulated/floor/carpet/rubber,
 /area/horizon/crew_quarters/fitness/gym)
 "CY" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 6
-	},
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
 	},
 /obj/structure/cable/green{
-	icon_state = "4-8"
+	icon_state = "1-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/tiled,
 /area/hallway/primary/port)
 "CZ" = (
@@ -15958,8 +16004,21 @@
 /turf/simulated/floor/tiled/ramp,
 /area/bridge/meeting_room)
 "DJ" = (
-/obj/machinery/light{
-	dir = 1
+/obj/structure/closet/secure_closet/guncabinet{
+	name = "Weaponry (Bullpup Carbine and Ammunition)";
+	req_access = null;
+	req_one_access = list(3,19)
+	},
+/obj/item/ammo_magazine/a556/carbine/polymer,
+/obj/item/ammo_magazine/a556/carbine/polymer,
+/obj/item/ammo_magazine/a556/carbine/polymer,
+/obj/item/ammo_magazine/a556/carbine/polymer,
+/obj/item/gun/projectile/automatic/rifle/carbine/civcarbine,
+/obj/item/gun/projectile/automatic/rifle/carbine/civcarbine,
+/obj/effect/floor_decal/corner/red/diagonal,
+/obj/effect/floor_decal/industrial/outline/red,
+/obj/structure/railing/mapped{
+	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
@@ -16661,13 +16720,17 @@
 /area/horizon/hallway/deck_three/primary/starboard)
 "EZ" = (
 /obj/effect/floor_decal/corner/red/diagonal,
-/obj/machinery/power/apc/super{
-	dir = 1;
-	pixel_y = 24
-	},
 /obj/structure/cable/green{
 	icon_state = "0-2"
 	},
+/obj/machinery/power/apc/super/critical{
+	dir = 1;
+	pixel_y = 24
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/bed/stool/padded/black,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "Fa" = (
@@ -16898,11 +16961,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/bridge/meeting_room)
 "Ft" = (
-/obj/machinery/vending/coffee,
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 5
 	},
 /obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/vending/cola,
 /turf/simulated/floor/tiled,
 /area/hallway/primary/port)
 "Fu" = (
@@ -16941,25 +17004,11 @@
 /turf/simulated/floor/tiled/freezer,
 /area/horizon/crew_quarters/cryo/showers)
 "Fx" = (
-/obj/structure/table/rack,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
-/obj/effect/floor_decal/corner/brown/diagonal,
-/obj/machinery/firealarm/north,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/device/magnetic_lock,
-/obj/item/device/magnetic_lock,
-/obj/item/device/magnetic_lock,
-/obj/item/device/magnetic_lock,
-/obj/item/cell/high,
-/obj/item/cell/high,
-/obj/item/cell/high,
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/anti_bluespace,
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "Fy" = (
@@ -17107,7 +17156,7 @@
 /area/horizon/crew_quarters/fitness/lounge)
 "FN" = (
 /obj/structure/closet/secure_closet/guncabinet{
-	name = "Weaponry (Rifle)";
+	name = "Weaponry (Bullpup Carbine and Ammunition)";
 	req_access = null;
 	req_one_access = list(3,19)
 	},
@@ -17117,6 +17166,11 @@
 /obj/item/ammo_magazine/a556/carbine/polymer,
 /obj/item/gun/projectile/automatic/rifle/carbine/civcarbine,
 /obj/item/gun/projectile/automatic/rifle/carbine/civcarbine,
+/obj/effect/floor_decal/corner/red/diagonal,
+/obj/effect/floor_decal/industrial/outline/red,
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "FO" = (
@@ -17916,6 +17970,14 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/machinery/button/remote/blast_door{
+	dir = 8;
+	id = "crew_armoury_desk";
+	name = "Crew Armoury Auxiliary Access";
+	req_access = list(60);
+	pixel_y = -25;
+	pixel_x = 25
+	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "Hp" = (
@@ -17937,6 +17999,7 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 6
 	},
+/obj/machinery/firealarm/east,
 /turf/simulated/floor/tiled,
 /area/hallway/primary/port)
 "Hr" = (
@@ -18131,16 +18194,10 @@
 /turf/simulated/wall,
 /area/medical/ward/isolation)
 "HJ" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/visible{
-	dir = 4
-	},
-/obj/machinery/door/airlock/maintenance{
-	req_one_access = list(12)
-	},
-/turf/simulated/floor/tiled,
+/obj/structure/window/shuttle/scc_space_ship,
+/obj/structure/grille,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
 /area/maintenance/engineering_ladder)
 "HK" = (
 /obj/effect/floor_decal/corner_wide/green/full{
@@ -18217,9 +18274,8 @@
 /turf/simulated/floor,
 /area/maintenance/engineering_ladder)
 "HR" = (
-/obj/effect/floor_decal/corner/blue/diagonal,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
@@ -18487,6 +18543,17 @@
 	},
 /turf/simulated/floor/tiled,
 /area/bridge)
+"Io" = (
+/obj/structure/table/rack,
+/obj/item/clothing/accessory/armband/med,
+/obj/item/clothing/accessory/armband/med,
+/obj/item/storage/firstaid/surgery,
+/obj/item/storage/firstaid/regular,
+/obj/item/storage/firstaid/regular,
+/obj/effect/floor_decal/corner/lime/diagonal,
+/obj/effect/floor_decal/industrial/outline/medical,
+/turf/simulated/floor/tiled/dark,
+/area/crew_armory)
 "Ip" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -19596,8 +19663,12 @@
 	icon_state = "1-4"
 	},
 /obj/machinery/recharger/wallcharger{
-	pixel_x = 5;
-	pixel_y = -32
+	pixel_x = 4;
+	pixel_y = -29
+	},
+/obj/machinery/recharger/wallcharger{
+	pixel_x = 4;
+	pixel_y = -42
 	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
@@ -19675,11 +19746,18 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/machinery/vending/cola,
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 5
 	},
 /obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/vending/snack,
+/obj/effect/floor_decal/industrial/warning/corner{
+	dir = 1
+	},
+/obj/machinery/status_display{
+	layer = 4;
+	pixel_y = 32
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/port)
 "Kq" = (
@@ -19875,15 +19953,6 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/structure/closet/walllocker/medical{
-	pixel_y = -32
-	},
-/obj/item/stack/medical/bruise_pack,
-/obj/item/stack/medical/bruise_pack,
-/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline,
-/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline,
-/obj/item/stack/medical/ointment,
-/obj/item/stack/medical/ointment,
 /turf/simulated/floor/tiled,
 /area/hallway/primary/port)
 "KL" = (
@@ -20117,16 +20186,8 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/ward)
 "Li" = (
+/obj/effect/floor_decal/industrial/loading/yellow,
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/table/rack,
-/obj/item/stack/material/steel/full,
-/obj/item/stack/material/plasteel{
-	amount = 20
-	},
-/obj/item/stack/material/steel/full,
-/obj/item/stack/material/steel/full,
-/obj/item/stack/barbed_wire/half_full,
-/obj/item/stack/liquidbags/half_full,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "Lj" = (
@@ -20495,13 +20556,18 @@
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/starboard/docks)
 "LQ" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/glass_security{
+	name = "Crew Armoury"
+	},
 /obj/machinery/door/blast/regular{
 	dir = 4;
 	id = "crew_armory";
-	name = "Crew Armoury"
+	name = "Crew Armoury";
+	is_critical = 1
 	},
-/turf/simulated/floor/tiled/dark,
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled/dark/full,
 /area/crew_armory)
 "LR" = (
 /obj/structure/railing/mapped{
@@ -20714,20 +20780,15 @@
 /turf/simulated/floor/tiled/dark,
 /area/horizon/crew_quarters/fitness/gym)
 "Ml" = (
-/obj/structure/closet/secure_closet/guncabinet{
-	name = "Weaponry (Rifle)";
-	req_access = null;
-	req_one_access = list(3,19)
+/obj/effect/floor_decal/corner/red/diagonal,
+/obj/machinery/recharger/wallcharger{
+	pixel_x = 36;
+	pixel_y = 3
 	},
-/obj/machinery/light{
-	dir = 4
+/obj/machinery/recharger/wallcharger{
+	pixel_x = 36;
+	pixel_y = -10
 	},
-/obj/item/ammo_magazine/a556/carbine/polymer,
-/obj/item/ammo_magazine/a556/carbine/polymer,
-/obj/item/ammo_magazine/a556/carbine/polymer,
-/obj/item/ammo_magazine/a556/carbine/polymer,
-/obj/item/gun/projectile/automatic/rifle/carbine/civcarbine,
-/obj/item/gun/projectile/automatic/rifle/carbine/civcarbine,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "Mm" = (
@@ -20791,8 +20852,9 @@
 	dir = 4;
 	id = "crew_armoury_desk";
 	name = "Crew Armoury Auxiliary Access";
-	pixel_x = -32;
-	req_access = list(60)
+	pixel_x = -25;
+	req_access = list(60);
+	pixel_y = 7
 	},
 /obj/machinery/light{
 	dir = 8
@@ -21006,7 +21068,7 @@
 /area/bridge/controlroom)
 "MK" = (
 /obj/structure/closet/secure_closet/guncabinet{
-	name = "Weaponry (Sidearm)";
+	name = "Weaponry (.45 Pistol and Holsters)";
 	req_access = null;
 	req_one_access = list(3,19)
 	},
@@ -21014,13 +21076,13 @@
 	dir = 8
 	},
 /obj/effect/floor_decal/corner/red/diagonal,
-/obj/effect/floor_decal/industrial/outline/yellow,
 /obj/item/gun/projectile/sec/lethal,
 /obj/item/gun/projectile/sec/lethal,
 /obj/item/gun/projectile/sec/lethal,
 /obj/item/clothing/accessory/holster/thigh,
 /obj/item/clothing/accessory/holster/thigh,
 /obj/item/clothing/accessory/holster/thigh,
+/obj/effect/floor_decal/industrial/outline/red,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "ML" = (
@@ -21210,11 +21272,9 @@
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/starboard/docks)
 "Nd" = (
-/obj/effect/floor_decal/corner/green/diagonal,
-/obj/machinery/alarm{
-	pixel_y = 32
-	},
 /obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/firealarm/north,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "Ne" = (
@@ -21324,19 +21384,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/vacantoffice)
-"No" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_security{
-	name = "Crew Armoury"
-	},
-/obj/machinery/door/blast/regular{
-	dir = 4;
-	id = "crew_armory";
-	name = "Crew Armoury"
-	},
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/turf/simulated/floor/tiled,
-/area/crew_armory)
 "Np" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -21576,6 +21623,17 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/starboard)
+"NN" = (
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/light/small/emergency{
+	dir = 8
+	},
+/turf/simulated/floor,
+/area/maintenance/engineering_ladder)
 "NO" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -22259,10 +22317,19 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
 	},
-/obj/machinery/firealarm/south,
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/structure/closet/walllocker/medical{
+	pixel_y = -32
+	},
+/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline,
+/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline,
+/obj/item/stack/medical/ointment,
+/obj/item/stack/medical/ointment,
+/obj/item/stack/medical/bruise_pack,
+/obj/item/stack/medical/bruise_pack,
+/obj/effect/floor_decal/industrial/outline/medical,
 /turf/simulated/floor/tiled,
 /area/hallway/primary/port)
 "OW" = (
@@ -22324,11 +22391,14 @@
 /area/horizon/hallway/deck_three/primary/starboard/docks)
 "Pb" = (
 /obj/structure/closet/secure_closet/guncabinet{
-	name = "Weaponry (Laser Rifle)";
+	name = "Weaponry (Combat Laser Rifle)";
 	req_access = null;
 	req_one_access = list(3,19)
 	},
 /obj/item/gun/energy/rifle/laser/noctiluca,
+/obj/effect/floor_decal/corner/red/diagonal,
+/obj/effect/floor_decal/industrial/outline/red,
+/obj/structure/railing/mapped,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "Pc" = (
@@ -23309,7 +23379,6 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
 /area/maintenance/engineering_ladder)
 "QN" = (
@@ -23483,16 +23552,12 @@
 /turf/simulated/floor/carpet/art,
 /area/horizon/crew_quarters/fitness/lounge)
 "Rb" = (
-/obj/machinery/light{
-	dir = 1
-	},
+/obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/status_display{
 	layer = 4;
 	pixel_y = 32
 	},
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/anti_bluespace,
+/obj/structure/dispenser/oxygen,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "Rc" = (
@@ -24021,17 +24086,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/bridge/controlroom)
-"Se" = (
-/obj/structure/closet/toolcloset,
-/obj/item/wrench,
-/obj/item/screwdriver,
-/obj/item/crowbar/red,
-/obj/item/crowbar/red,
-/obj/item/crowbar/rescue_axe/red,
-/obj/item/weldingtool,
-/obj/item/clothing/head/welding,
-/turf/simulated/floor/tiled/dark,
-/area/crew_armory)
 "Sf" = (
 /obj/structure/bed/stool/chair/office/dark{
 	dir = 8
@@ -24167,19 +24221,6 @@
 /area/security/forensics_office{
 	name = "Security - Investigations Office"
 	})
-"Sr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 9
-	},
-/obj/effect/floor_decal/spline/plain{
-	dir = 8
-	},
-/obj/structure/cable/green{
-	icon_state = "1-8"
-	},
-/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
-/area/maintenance/engineering_ladder)
 "Ss" = (
 /obj/structure/disposalpipe/segment{
 	dir = 2;
@@ -24391,6 +24432,20 @@
 /obj/machinery/recharger,
 /turf/simulated/floor/carpet/rubber,
 /area/bridge/controlroom)
+"SP" = (
+/obj/machinery/camera/motion{
+	alarm_on = 1;
+	c_tag = "Third Deck - Crew Armoury Port";
+	dir = 1;
+	name = "security";
+	network = list("Command, Security")
+	},
+/obj/effect/floor_decal/industrial/loading/yellow{
+	dir = 1
+	},
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/tiled/dark,
+/area/crew_armory)
 "SQ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/reinforced,
@@ -26286,9 +26341,13 @@
 /turf/simulated/floor/reinforced/airless,
 /area/template_noop)
 "Wv" = (
-/obj/machinery/shieldwallgen,
-/obj/effect/floor_decal/corner/yellow/diagonal,
+/obj/structure/table/rack,
 /obj/effect/floor_decal/industrial/outline/yellow,
+/obj/item/storage/box/magnetic_locks,
+/obj/item/storage/box/cell/high,
+/obj/item/storage/box/flares,
+/obj/item/storage/box/flares,
+/obj/machinery/firealarm/north,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "Ww" = (
@@ -26373,7 +26432,7 @@
 	name = "Deck 3 Port Auxiliary Atmospherics";
 	req_one_access = list(11,24)
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/full,
 /area/maintenance/aux_atmospherics/deck_3)
 "WG" = (
 /obj/effect/floor_decal/corner/red/full{
@@ -26570,27 +26629,26 @@
 /area/horizon/crew_quarters/fitness/pool)
 "Xa" = (
 /obj/structure/table/rack,
-/obj/effect/floor_decal/corner/blue/diagonal,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
+/obj/item/clothing/accessory/armband/sec,
+/obj/item/clothing/accessory/armband/sec,
+/obj/item/clothing/accessory/armband/sec,
+/obj/item/clothing/suit/armor/carrier/generic,
+/obj/item/clothing/suit/armor/carrier/generic,
+/obj/item/clothing/suit/armor/carrier/generic,
+/obj/item/clothing/head/helmet/security/generic,
+/obj/item/clothing/head/helmet/security/generic,
+/obj/item/clothing/head/helmet/security/generic,
+/obj/item/clothing/accessory/arm_guard/generic,
+/obj/item/clothing/accessory/arm_guard/generic,
+/obj/item/clothing/accessory/arm_guard/generic,
+/obj/item/clothing/accessory/leg_guard/generic,
+/obj/item/clothing/accessory/leg_guard/generic,
+/obj/item/clothing/accessory/leg_guard/generic,
+/obj/effect/floor_decal/corner/red/diagonal,
+/obj/effect/floor_decal/industrial/outline/red,
+/obj/structure/railing/mapped{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/clothing/accessory/armband/sec,
-/obj/item/clothing/accessory/armband/sec,
-/obj/item/clothing/accessory/armband/sec,
-/obj/item/clothing/suit/armor/carrier/generic,
-/obj/item/clothing/suit/armor/carrier/generic,
-/obj/item/clothing/suit/armor/carrier/generic,
-/obj/item/clothing/head/helmet/security/generic,
-/obj/item/clothing/head/helmet/security/generic,
-/obj/item/clothing/head/helmet/security/generic,
-/obj/item/clothing/accessory/arm_guard/generic,
-/obj/item/clothing/accessory/arm_guard/generic,
-/obj/item/clothing/accessory/arm_guard/generic,
-/obj/item/clothing/accessory/leg_guard/generic,
-/obj/item/clothing/accessory/leg_guard/generic,
-/obj/item/clothing/accessory/leg_guard/generic,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "Xb" = (
@@ -26796,11 +26854,9 @@
 /turf/simulated/floor/wood,
 /area/bridge/minibar)
 "Xr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark,
-/area/crew_armory)
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/tiled,
+/area/hallway/primary/port)
 "Xs" = (
 /obj/machinery/telecomms/server/presets/supply,
 /turf/simulated/floor/bluegrid,
@@ -27181,17 +27237,14 @@
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/starboard/docks)
 "XX" = (
-/obj/machinery/door/airlock/glass_security{
-	name = "Crew Armoury"
-	},
+/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /obj/machinery/door/blast/regular{
 	dir = 4;
 	id = "crew_armory";
-	name = "Crew Armoury"
+	name = "Crew Armoury";
+	is_critical = 1
 	},
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/dark/full,
 /area/crew_armory)
 "XY" = (
 /obj/effect/floor_decal/corner/paleblue{
@@ -27780,12 +27833,6 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/medical/smoking)
-"YZ" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
-	},
-/turf/simulated/floor/tiled,
-/area/hallway/primary/port)
 "Za" = (
 /obj/structure/railing/mapped{
 	dir = 1
@@ -27828,9 +27875,10 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/cmo)
 "Ze" = (
-/obj/machinery/light,
 /obj/machinery/power/portgen/basic,
 /obj/item/stack/material/graphite/full,
+/obj/effect/floor_decal/corner/yellow/diagonal,
+/obj/effect/floor_decal/industrial/outline/engineering,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "Zf" = (
@@ -28048,15 +28096,19 @@
 /turf/simulated/floor/tiled/white,
 /area/security/forensics_morgue)
 "Zx" = (
+/obj/structure/closet/toolcloset,
+/obj/item/wrench,
+/obj/item/screwdriver,
+/obj/item/crowbar/red,
+/obj/item/crowbar/red,
+/obj/item/crowbar/rescue_axe/red,
+/obj/item/weldingtool,
+/obj/item/clothing/head/welding,
+/obj/effect/floor_decal/corner/yellow/diagonal,
+/obj/effect/floor_decal/industrial/outline/engineering,
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/structure/closet/secure_closet/guncabinet{
-	name = "Weaponry (Laser Rifle)";
-	req_access = null;
-	req_one_access = list(3,19)
-	},
-/obj/item/gun/energy/rifle/laser/noctiluca,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "Zy" = (
@@ -51049,7 +51101,7 @@ em
 gK
 DQ
 EZ
-oG
+zi
 zi
 rV
 Bg
@@ -51252,7 +51304,7 @@ EG
 DQ
 Xa
 Bs
-Xa
+sh
 Dn
 DQ
 DQ
@@ -51453,11 +51505,11 @@ em
 EG
 DQ
 Nd
-Xr
+yt
 yt
 wy
 fO
-No
+DQ
 jx
 Pm
 Ms
@@ -51652,16 +51704,16 @@ bk
 bk
 bk
 bk
-hl
+Ip
 DQ
 Rb
-CR
+yt
 mg
 HR
 Li
 LQ
 Gb
-pW
+uI
 NL
 lo
 he
@@ -51858,12 +51910,12 @@ EG
 DQ
 Fx
 yt
+Io
 wz
-yt
 kN
 XX
 Gb
-BX
+pW
 NL
 OV
 po
@@ -52058,15 +52110,15 @@ Qf
 EC
 cd
 DQ
-Wv
+CG
 yt
 bp
-yt
-hy
-DQ
-Cx
+sI
+SP
+CR
+Gb
 BX
-YZ
+NL
 Be
 po
 wX
@@ -52268,7 +52320,7 @@ hy
 DQ
 Kp
 BX
-BX
+NL
 wW
 po
 JC
@@ -52463,14 +52515,14 @@ EC
 xT
 DQ
 DJ
-yt
-yt
+Bs
+vX
 yt
 Ze
 DQ
 Ft
-BX
-BX
+Xr
+oG
 KK
 po
 Pu
@@ -52665,14 +52717,14 @@ EC
 Fq
 DQ
 rH
-yt
-yt
+Bs
+Bs
 yt
 eb
 DQ
 rg
-BX
-BX
+we
+Cx
 CY
 WF
 qT
@@ -52870,7 +52922,7 @@ FN
 Ml
 Pb
 Zx
-Se
+eb
 DQ
 OF
 ze
@@ -53075,8 +53127,8 @@ DQ
 DQ
 DQ
 FH
-FH
-FH
+hO
+em
 HJ
 wr
 wr
@@ -53274,12 +53326,10 @@ Iy
 Os
 QM
 LZ
-dr
-vX
 jU
+jU
+NN
 cM
-hO
-Sr
 em
 at
 at
@@ -53295,6 +53345,8 @@ at
 at
 at
 at
+at
+at
 Cu
 rD
 gO
@@ -53481,8 +53533,8 @@ em
 em
 em
 em
-em
-em
+at
+at
 at
 at
 at
@@ -60716,7 +60768,7 @@ Wm
 Wm
 Wm
 Wm
-bj
+Wm
 Wm
 Wm
 Wm
@@ -60918,7 +60970,7 @@ Wm
 Wm
 Wm
 Wm
-bj
+Wm
 Wm
 Wm
 Wm
@@ -61120,7 +61172,7 @@ Wm
 Wm
 Wm
 Wm
-bj
+Wm
 Wm
 Wm
 Wm
@@ -61322,7 +61374,7 @@ Wm
 Wm
 Wm
 Wm
-bj
+Wm
 Wm
 Wm
 Wm
@@ -61510,21 +61562,21 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -61712,21 +61764,21 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -61914,21 +61966,21 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -62116,21 +62168,21 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -62318,21 +62370,21 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -62520,21 +62572,21 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -62722,21 +62774,21 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -62919,26 +62971,26 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -63121,26 +63173,26 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -63323,26 +63375,26 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -63525,26 +63577,26 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -63727,26 +63779,26 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -63929,26 +63981,26 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -64131,26 +64183,26 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -64333,26 +64385,26 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -64535,26 +64587,26 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -64737,26 +64789,26 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
 Wm
 Wm
 Wm
 Wm
 Wm
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -64939,26 +64991,26 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
 Wm
 Wm
 Wm
 Wm
 Wm
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -65141,26 +65193,26 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
 Wm
 Wm
 Wm
 Wm
 Wm
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -65343,26 +65395,26 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
 Wm
 Wm
 Wm
 Wm
 Wm
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -65545,26 +65597,26 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
 Wm
 Wm
 Wm
 Wm
 Wm
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -65747,26 +65799,26 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
 Wm
 Wm
 Wm
 Wm
 Wm
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -65949,26 +66001,26 @@ Wm
 Wm
 Wm
 Wm
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
-bj
 Wm
 Wm
 Wm
 Wm
 Wm
-bj
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
+Wm
 Wm
 Wm
 Wm
@@ -66170,7 +66222,7 @@ Wm
 Wm
 Wm
 Wm
-bj
+Wm
 Wm
 Wm
 Wm
@@ -66372,7 +66424,7 @@ Wm
 Wm
 Wm
 Wm
-bj
+Wm
 Wm
 Wm
 Wm