diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm
index ab5d87ee73..15d0b74333 100644
--- a/maps/map_files/golden_arrow/golden_arrow.dmm
+++ b/maps/map_files/golden_arrow/golden_arrow.dmm
@@ -327,13 +327,13 @@
 	},
 /area/golden_arrow/engineering)
 "bD" = (
-/obj/structure/machinery/door/airlock/almayer/command/reinforced{
-	dir = 1;
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/machinery/door/airlock/almayer/secure{
 	name = "\improper Platoon Commander's Office";
 	req_access = list();
-	req_one_access_txt = "19;12"
+	req_one_access_txt = "19;12";
+	dir = 1
 	},
-/obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
 	},
@@ -488,13 +488,16 @@
 	dir = 1
 	},
 /obj/structure/pipes/vents/scrubber,
-/obj/structure/surface/table/almayer,
-/obj/item/ammo_box/magazine/mk1,
+/obj/structure/surface/table/reinforced/black,
+/obj/item/storage/box/nade_box{
+	pixel_y = 8;
+	pixel_x = -4
+	},
 /obj/item/ammo_magazine/rifle/m41aMK1/heap{
 	desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 99 rounds. This one contained High-Explosive Armor-Piercing bullets. It also has some... notches on the side..?";
 	current_rounds = 0;
-	pixel_y = 6;
-	pixel_x = 13
+	pixel_x = 12;
+	pixel_y = 7
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -612,8 +615,10 @@
 	},
 /area/golden_arrow/prep_hallway)
 "cV" = (
-/obj/structure/surface/table/almayer,
-/obj/item/storage/box/guncase/pumpshotgun/special,
+/obj/structure/surface/table/reinforced/black,
+/obj/item/storage/box/guncase/pumpshotgun/special{
+	pixel_y = 3
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -1554,9 +1559,9 @@
 /obj/effect/decal/warning_stripes{
 	icon_state = "SE-out"
 	},
-/obj/structure/machinery/door/airlock/almayer/generic{
-	id = "Delta_1";
-	name = "\improper Bathroom"
+/obj/structure/machinery/door/airlock/almayer/secure{
+	name = "\improper Bathroom";
+	req_access = list()
 	},
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
@@ -1645,10 +1650,16 @@
 	},
 /area/golden_arrow/supply)
 "iR" = (
+/obj/structure/closet/crate/secure/gear{
+	name = "secure Motion Detector crate"
+	},
+/obj/item/device/motiondetector,
+/obj/item/device/motiondetector,
+/obj/item/device/motiondetector,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/golden_arrow/platoon_commander_rooms)
+/area/golden_arrow/squad_one)
 "iX" = (
 /obj/structure/sign/safety/rewire{
 	pixel_x = 14;
@@ -1736,11 +1747,6 @@
 /obj/structure/machinery/firealarm{
 	pixel_y = 28
 	},
-/obj/structure/largecrate/supply/ammo/m41amk1,
-/obj/structure/largecrate/supply/ammo/m41amk1{
-	pixel_x = 3;
-	pixel_y = 10
-	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -2144,7 +2150,7 @@
 	},
 /area/golden_arrow/platoon_sergeant)
 "me" = (
-/obj/structure/machinery/door/airlock/almayer/command/reinforced{
+/obj/structure/machinery/door/airlock/almayer/secure{
 	dir = 1;
 	name = "\improper Briefing Room";
 	req_access = list()
@@ -2210,12 +2216,14 @@
 	},
 /area/golden_arrow/hangar)
 "mD" = (
-/obj/structure/machinery/door/airlock/almayer/generic{
-	req_one_access_txt = "8;12;39"
-	},
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/machinery/door/airlock/almayer/secure{
+	name = "\improper Squad One Armory";
+	req_access = list();
+	req_one_access_txt = "8;12;39"
+	},
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
 	},
@@ -2252,7 +2260,7 @@
 	},
 /area/golden_arrow/supply)
 "nb" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
+/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{
 	name = "\improper Squad Two Armoury";
 	req_one_access_txt = "8;12;40"
 	},
@@ -2509,14 +2517,13 @@
 	},
 /area/golden_arrow/supply)
 "ot" = (
-/obj/structure/largecrate/supply/ammo{
-	name = "sentry crate";
-	fill_from_loc = 1
-	},
-/obj/item/ammo_magazine/sentry{
-	layer = 3.01
+/obj/structure/closet/crate/secure/ammo{
+	name = "secure M41A MK1 magazine crate"
 	},
-/obj/item/defenses/handheld/sentry,
+/obj/item/ammo_box/magazine/mk1,
+/obj/item/ammo_box/magazine/mk1,
+/obj/item/ammo_box/magazine/mk1,
+/obj/item/ammo_box/magazine/mk1,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -2792,9 +2799,9 @@
 	},
 /area/golden_arrow/cryo_cells)
 "qu" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
-	dir = 1;
-	name = "\improper Briefing Room"
+/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{
+	name = "\improper Briefing Room";
+	dir = 1
 	},
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
@@ -3103,10 +3110,10 @@
 /turf/open/floor/almayer,
 /area/golden_arrow/squad_one)
 "sg" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{
 	name = "\improper Dorms"
 	},
-/obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
 	},
@@ -3239,8 +3246,6 @@
 	},
 /area/golden_arrow/supply)
 "sY" = (
-/obj/item/clothing/suit/storage/jacket/marine/service,
-/obj/item/clothing/suit/storage/jacket/marine/service/tanker,
 /obj/structure/closet/secure_closet/marine_personal{
 	job = "Platoon Commander";
 	icon_broken = "cabinetdetective_broken";
@@ -3252,6 +3257,7 @@
 	has_cryo_gear = 0
 	},
 /obj/item/clothing/under/marine/officer/boiler,
+/obj/item/clothing/suit/storage/jacket/marine/bomber,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -3628,13 +3634,14 @@
 /area/golden_arrow/platoon_commander_rooms)
 "vA" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door/airlock/almayer/generic{
+/obj/structure/machinery/door/airlock/almayer/secure{
 	dir = 1;
 	name = "\improper Platoon Sergeant's Bunk";
+	req_access = list();
 	req_one_access_txt = "12"
 	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "test_floor4"
 	},
 /area/golden_arrow/platoon_sergeant)
 "vB" = (
@@ -3768,8 +3775,10 @@
 	},
 /area/golden_arrow/engineering)
 "wc" = (
-/obj/structure/machinery/door/airlock/almayer/command/reinforced{
-	name = "\improper Platoon Commander's Quarters"
+/obj/structure/machinery/door/airlock/almayer/secure{
+	name = "\improper Platoon Commander's Office";
+	req_access = list();
+	req_one_access_txt = "19;12"
 	},
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
@@ -3902,12 +3911,13 @@
 /turf/open/floor/almayer,
 /area/golden_arrow/briefing)
 "wV" = (
-/obj/structure/machinery/door/airlock/almayer/generic{
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/machinery/door/airlock/almayer/secure{
 	dir = 1;
 	name = "\improper Platoon Sergeant's Bunk";
+	req_access = null;
 	req_one_access_txt = "12"
 	},
-/obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
 	},
@@ -4405,8 +4415,9 @@
 	icon_state = "SW-out";
 	pixel_x = -1
 	},
-/obj/structure/machinery/door/airlock/almayer/generic{
-	name = "\improper Canteen"
+/obj/structure/machinery/door/airlock/almayer/secure{
+	name = "\improper Canteen";
+	req_access = list()
 	},
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
@@ -4585,13 +4596,21 @@
 	},
 /area/golden_arrow/engineering)
 "Bu" = (
-/obj/item/ammo_magazine/sentry{
-	layer = 3.01
+/obj/structure/closet/crate/secure/ammo{
+	name = "secure M41A MK1 magazine crate"
 	},
-/obj/item/defenses/handheld/sentry,
-/obj/structure/largecrate/supply/ammo{
-	name = "sentry crate";
-	fill_from_loc = 1
+/obj/item/ammo_box/magazine/mk1,
+/obj/item/ammo_box/magazine/mk1,
+/obj/item/ammo_box/magazine/mk1,
+/obj/item/ammo_box/magazine/mk1,
+/obj/structure/machinery/prop{
+	desc = "This stylized recruitment poster for the USCM depicts a the head of a screaming eagle breaking into orbit, surrounded by flames. Death from above.";
+	icon = 'icons/obj/structures/props/posters.dmi';
+	icon_state = "poster41";
+	name = "USCM recruitment poster";
+	layer = 3.5;
+	pixel_y = 2;
+	pixel_x = 29
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -4812,7 +4831,7 @@
 	},
 /area/golden_arrow/canteen)
 "Cu" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
+/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{
 	name = "\improper Sergeants Room";
 	req_one_access_txt = "12;32"
 	},
@@ -4853,15 +4872,10 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/prep_hallway)
 "CC" = (
-/obj/structure/surface/table/almayer,
-/obj/item/storage/box/guncase/flamer/special,
-/obj/item/explosive/grenade/smokebomb{
-	pixel_y = 14;
-	pixel_x = -5
-	},
-/obj/item/explosive/grenade/smokebomb{
-	pixel_y = 11;
-	pixel_x = -9
+/obj/structure/surface/table/reinforced/black,
+/obj/item/storage/box/guncase/pumpshotgun/special{
+	pixel_y = 2;
+	pixel_x = 1
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -4982,14 +4996,11 @@
 	},
 /area/golden_arrow/platoon_sergeant)
 "Di" = (
-/obj/structure/surface/table/almayer,
-/obj/item/prop/helmetgarb/spent_slug{
-	pixel_y = -9;
-	pixel_x = 8;
-	name = "spent snailshot";
-	layer = 2.7
+/obj/item/storage/box/guncase/flamer/special{
+	pixel_y = 5;
+	pixel_x = 1
 	},
-/obj/item/storage/box/guncase/pumpshotgun/special,
+/obj/structure/surface/table/reinforced/black,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -5105,11 +5116,12 @@
 /turf/open/floor/almayer,
 /area/golden_arrow/briefing)
 "Ei" = (
-/obj/structure/surface/table/almayer,
-/obj/item/storage/box/guncase/flamer/special,
 /obj/item/trash/cigbutt/cigarbutt{
 	pixel_y = 18
 	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/surface/table/reinforced/black,
+/obj/item/storage/box/guncase/flamer/special,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -5299,8 +5311,9 @@
 	icon_state = "SE-out";
 	pixel_x = 1
 	},
-/obj/structure/machinery/door/airlock/almayer/generic{
-	name = "\improper Canteen"
+/obj/structure/machinery/door/airlock/almayer/secure{
+	name = "\improper Canteen";
+	req_access = list()
 	},
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
@@ -5622,10 +5635,10 @@
 	icon_state = "SE-out";
 	pixel_x = 1
 	},
-/obj/structure/machinery/door/airlock/almayer/generic{
+/obj/structure/machinery/door/airlock/almayer/secure{
 	dir = 1;
-	id = "Delta_1";
-	name = "\improper Bathroom"
+	name = "\improper Bathroom";
+	req_access = list()
 	},
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
@@ -5682,9 +5695,7 @@
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 10
 	},
-/turf/open/floor/almayer{
-	icon_state = "bluefull"
-	},
+/turf/open/floor/almayer,
 /area/golden_arrow/platoon_commander_rooms)
 "GY" = (
 /obj/effect/decal/cleanable/dirt,
@@ -5786,7 +5797,9 @@
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
 	},
-/obj/structure/machinery/door/airlock/almayer/generic{
+/obj/structure/machinery/door/airlock/almayer/secure{
+	name = "\improper Squad Two Armory";
+	req_access = list();
 	req_one_access_txt = "8;12;40"
 	},
 /turf/open/floor/almayer{
@@ -5837,11 +5850,17 @@
 	},
 /area/golden_arrow/hangar)
 "HR" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/secure/gear{
+	name = "secure Motion Detector crate"
+	},
+/obj/item/device/motiondetector,
+/obj/item/device/motiondetector,
+/obj/item/device/motiondetector,
 /turf/open/floor/almayer{
-	icon_state = "bluefull"
+	icon_state = "plate"
 	},
-/area/golden_arrow/hangar)
+/area/golden_arrow/squad_two)
 "HS" = (
 /obj/structure/machinery/landinglight/ds1/delaythree{
 	dir = 4
@@ -6234,12 +6253,13 @@
 	},
 /area/golden_arrow/platoon_sergeant)
 "Kp" = (
-/obj/structure/largecrate/supply/motiondetectors,
-/obj/structure/largecrate/supply/explosives/grenades/less{
-	icon_state = "case";
-	pixel_y = 10;
-	pixel_x = 3
+/obj/structure/closet/crate/secure/mortar_ammo{
+	name = "secure UA 571-C sentry crate"
 	},
+/obj/item/ammo_magazine/sentry{
+	layer = 3.01
+	},
+/obj/item/defenses/handheld/sentry,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -6423,18 +6443,14 @@
 /turf/open/floor/plating,
 /area/golden_arrow/hangar)
 "Lh" = (
-/obj/structure/sign/poster{
-	pixel_y = -8;
-	pixel_x = -25;
-	icon_state = "poster15";
-	name = "pulse rifle pinup";
-	desc = "The Armat Battlefield Systems Model 41 Derivative 'A' Pulse Rifle Mark One. The only pinup you'll ever need."
+/obj/structure/machinery/light{
+	dir = 1
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
+/obj/structure/machinery/photocopier{
+	wrenchable = 1
 	},
-/area/golden_arrow/squad_two)
+/turf/open/floor/almayer,
+/area/golden_arrow/platoon_commander_rooms)
 "Ll" = (
 /obj/structure/ship_ammo/minirocket/incendiary,
 /turf/open/floor/almayer{
@@ -6651,8 +6667,10 @@
 /obj/effect/decal/warning_stripes{
 	icon_state = "SE-out"
 	},
-/obj/structure/machinery/door/airlock/almayer/generic{
-	name = "\improper Bathroom"
+/obj/structure/machinery/door/airlock/almayer/secure{
+	name = "\improper Bathroom";
+	req_access = list();
+	req_one_access_txt = "19;12"
 	},
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
@@ -7126,22 +7144,23 @@
 	},
 /area/golden_arrow/cryo_cells)
 "Pm" = (
-/obj/structure/largecrate/supply/explosives/grenades/less{
-	icon_state = "case"
+/obj/structure/closet/crate/secure/mortar_ammo{
+	name = "secure UA 571-C sentry crate"
 	},
-/obj/structure/largecrate/supply/motiondetectors{
-	pixel_y = 10
+/obj/item/defenses/handheld/sentry,
+/obj/item/ammo_magazine/sentry{
+	layer = 3.01
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/golden_arrow/squad_two)
 "Pp" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{
 	name = "\improper Squad One Armoury";
 	req_one_access_txt = "8;12;39"
 	},
-/obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
 	},
@@ -7191,14 +7210,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"PA" = (
-/obj/structure/closet/crate/supply,
-/obj/item/storage/box/m94,
-/obj/item/storage/box/m94,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/squad_one)
 "PF" = (
 /obj/structure/machinery/light,
 /turf/open/floor/almayer{
@@ -7249,7 +7260,7 @@
 	},
 /area/golden_arrow/firingrange)
 "PW" = (
-/obj/structure/machinery/door/airlock/almayer/command/reinforced{
+/obj/structure/machinery/door/airlock/almayer/secure{
 	name = "\improper Private Briefing Room";
 	req_access = list();
 	req_one_access_txt = "12;19;32"
@@ -7551,9 +7562,10 @@
 	icon_state = "SW-out";
 	pixel_x = -1
 	},
-/obj/structure/machinery/door/airlock/almayer/generic{
+/obj/structure/machinery/door/airlock/almayer/secure{
 	dir = 1;
-	name = "\improper Supply Office"
+	name = "\improper Supply Office";
+	req_access = list()
 	},
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
@@ -8382,9 +8394,10 @@
 /area/golden_arrow/briefing)
 "Vu" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door/airlock/almayer/generic{
+/obj/structure/machinery/door/airlock/almayer/secure{
 	dir = 1;
-	name = "\improper Supply Bay"
+	name = "\improper Supply Bay";
+	req_access = list()
 	},
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
@@ -8701,9 +8714,9 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
 "Xu" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
-	dir = 2;
-	name = "\improper Firing Range"
+/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{
+	name = "\improper Firing Range";
+	dir = 2
 	},
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
@@ -8714,9 +8727,7 @@
 	pixel_x = 14;
 	pixel_y = 29
 	},
-/turf/open/floor/almayer{
-	icon_state = "bluefull"
-	},
+/turf/open/floor/almayer,
 /area/golden_arrow/platoon_commander_rooms)
 "Xw" = (
 /obj/structure/bed/chair/comfy{
@@ -8839,17 +8850,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/squad_two)
-"Yc" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/largecrate/supply/ammo/m41amk1,
-/obj/structure/largecrate/supply/ammo/m41amk1{
-	pixel_x = 3;
-	pixel_y = 10
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/squad_one)
 "Yd" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/pipes/standard/simple/hidden/supply{
@@ -9082,8 +9082,11 @@
 	dir = 1
 	},
 /obj/structure/pipes/vents/scrubber,
-/obj/structure/surface/table/almayer,
-/obj/item/ammo_box/magazine/mk1,
+/obj/structure/surface/table/reinforced/black,
+/obj/item/storage/box/nade_box{
+	pixel_x = -2;
+	pixel_y = 7
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -15948,8 +15951,8 @@ Cr
 Cr
 Qw
 ot
-Lh
 pB
+HR
 Pm
 Qw
 Cr
@@ -18380,7 +18383,7 @@ XQ
 KD
 ZC
 ZC
-Yc
+cs
 Ty
 cz
 VK
@@ -19900,8 +19903,8 @@ XI
 wp
 ZC
 Bu
+iR
 WK
-PA
 Kp
 Ty
 Cr
@@ -20775,7 +20778,7 @@ SV
 Bz
 GV
 bD
-HR
+zy
 pR
 Rg
 Nf
@@ -20921,7 +20924,7 @@ ZL
 Dc
 ZL
 hS
-BZ
+Lh
 Bz
 iA
 Bz
@@ -21379,7 +21382,7 @@ QN
 MK
 MK
 Xv
-iR
+Bz
 Bz
 qU
 hS
@@ -21531,7 +21534,7 @@ Yw
 MK
 MK
 BZ
-iR
+Bz
 Bz
 OC
 hS
@@ -21683,7 +21686,7 @@ Cr
 Cr
 MK
 vt
-iR
+Bz
 Bz
 Jg
 hS
@@ -21835,7 +21838,7 @@ Cr
 Cr
 MK
 sY
-iR
+Bz
 Bz
 dH
 hS