diff --git a/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm b/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm
index 3b2b1b2eb09..dcfe7087a7a 100644
--- a/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm
@@ -8359,21 +8359,12 @@
 /turf/open/floor/plating,
 /area/cargo/storage)
 "ayI" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced,
 /obj/effect/turf_decal/bot,
-/obj/structure/rack,
-/obj/item/storage/box/armament_tokens_sidearm{
-	pixel_x = 7
-	},
-/obj/item/storage/box/armament_tokens_primary{
-	pixel_x = -8
-	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
 	dir = 8
 	},
+/obj/structure/rack/gunrack,
+/obj/effect/spawner/armory_spawn/shotguns,
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
 "ayK" = (
@@ -92303,23 +92294,11 @@
 /turf/open/space,
 /area/engineering/atmos/upper)
 "eys" = (
-/obj/structure/rack,
-/obj/item/gun/ballistic/shotgun/riot{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/gun/ballistic/shotgun/riot,
-/obj/item/gun/ballistic/shotgun/riot,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
 /obj/effect/turf_decal/bot,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
 	dir = 8
 	},
+/obj/structure/rack/gunrack,
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
 "eyA" = (
@@ -99850,15 +99829,12 @@
 /turf/open/floor/iron,
 /area/hallway/secondary/entry)
 "lwn" = (
-/obj/structure/rack,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
 /obj/effect/turf_decal/bot,
-/obj/item/storage/box/armament_tokens_energy,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
 	dir = 8
 	},
+/obj/structure/rack/gunrack,
+/obj/effect/spawner/armory_spawn/rifles,
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
 "lwE" = (
@@ -108978,9 +108954,6 @@
 /turf/open/floor/iron/dark,
 /area/ai_monitored/turret_protected/aisat_interior)
 "ueM" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
 /obj/effect/turf_decal/bot,
 /obj/structure/closet/secure_closet/smartgun,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm b/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm
index 14778c5b410..d03b31aebab 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm
@@ -293,10 +293,9 @@
 	},
 /area/security/prison)
 "abm" = (
-/obj/structure/table,
-/obj/item/storage/box/firingpins,
-/obj/item/storage/box/firingpins,
-/obj/item/key/security,
+/obj/structure/rack,
+/obj/item/gun/energy/e_gun/dragnet,
+/obj/item/gun/energy/e_gun/dragnet,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -307,6 +306,11 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/item/melee/hammer,
+/obj/item/melee/hammer,
+/obj/item/melee/hammer,
+/obj/item/storage/box/firingpins,
+/obj/item/storage/box/firingpins,
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
 "abu" = (
@@ -451,43 +455,7 @@
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
 "abJ" = (
-/obj/structure/rack,
-/obj/item/clothing/suit/armor/bulletproof{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/clothing/suit/armor/bulletproof,
-/obj/item/clothing/suit/armor/bulletproof{
-	pixel_x = 3;
-	pixel_y = -3
-	},
-/obj/item/clothing/head/helmet/alt{
-	layer = 3.00001;
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/clothing/head/helmet/alt{
-	layer = 3.00001
-	},
-/obj/item/clothing/head/helmet/alt{
-	layer = 3.00001;
-	pixel_x = 3;
-	pixel_y = -3
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/machinery/camera/motion{
-	c_tag = "Armory Motion Sensor"
-	},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/smooth,
 /area/ai_monitored/security/armory)
 "abN" = (
 /obj/structure/closet/secure_closet/contraband/armory,
@@ -529,9 +497,9 @@
 /turf/open/floor/iron/dark/side,
 /area/security/prison)
 "aci" = (
-/obj/vehicle/ridden/secway,
-/obj/effect/turf_decal/delivery/blue,
-/turf/open/floor/iron/dark,
+/obj/machinery/power/apc/auto_name/east,
+/obj/structure/cable,
+/turf/open/floor/iron/smooth,
 /area/ai_monitored/security/armory)
 "ack" = (
 /obj/effect/turf_decal/stripes/line{
@@ -541,17 +509,19 @@
 /area/ai_monitored/security/armory)
 "acl" = (
 /obj/effect/turf_decal/stripes/line{
-	dir = 9
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
 	},
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
 "acm" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
 /obj/structure/cable,
-/obj/machinery/power/apc/auto_name/east,
-/turf/open/floor/iron/dark,
+/obj/structure/fence{
+	dir = 4
+	},
+/turf/open/floor/iron/smooth,
 /area/ai_monitored/security/armory)
 "acr" = (
 /obj/structure/closet/secure_closet/engineering_personal,
@@ -634,15 +604,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
-"acM" = (
-/obj/structure/window/reinforced{
-	dir = 1;
-	layer = 2.9
-	},
-/obj/structure/closet/secure_closet/smartgun,
-/obj/effect/turf_decal/delivery/blue,
-/turf/open/floor/iron/dark,
-/area/ai_monitored/security/armory)
 "acQ" = (
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plating,
@@ -749,51 +710,13 @@
 	},
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
-"adj" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/window/reinforced{
-	dir = 1;
-	layer = 2.9
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/rack,
-/obj/item/storage/box/armament_tokens_sidearm{
-	pixel_x = 7
-	},
-/obj/item/storage/box/armament_tokens_primary{
-	pixel_x = -8
-	},
-/turf/open/floor/iron/dark,
-/area/ai_monitored/security/armory)
-"adk" = (
-/obj/structure/rack,
-/obj/item/gun/ballistic/shotgun/riot{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/gun/ballistic/shotgun/riot,
-/obj/item/gun/ballistic/shotgun/riot{
-	pixel_x = 3;
-	pixel_y = -3
-	},
-/obj/effect/turf_decal/bot,
-/obj/structure/window/reinforced{
-	dir = 1;
-	layer = 2.9
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/open/floor/iron/dark,
-/area/ai_monitored/security/armory)
 "adl" = (
 /obj/machinery/door/poddoor/shutters{
 	id = "armory";
 	name = "Armoury Shutter"
 	},
 /obj/effect/turf_decal/delivery,
+/obj/effect/turf_decal/delivery/blue,
 /turf/open/floor/iron,
 /area/ai_monitored/security/armory)
 "ads" = (
@@ -961,6 +884,9 @@
 	},
 /area/security/prison/safe)
 "aes" = (
+/obj/vehicle/ridden/secway,
+/obj/effect/turf_decal/delivery/blue,
+/obj/item/key/security,
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
 "aet" = (
@@ -1864,6 +1790,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
 "ajE" = (
@@ -10203,6 +10132,9 @@
 	name = "Sergeant-at-Armsky";
 	weaponscheck = 1
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
 "bkD" = (
@@ -18009,34 +17941,6 @@
 /obj/machinery/space_heater,
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
-"coS" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/bot,
-/obj/structure/window/reinforced{
-	dir = 1;
-	layer = 2.9
-	},
-/obj/item/storage/box/armament_tokens_energy,
-/turf/open/floor/iron/dark,
-/area/ai_monitored/security/armory)
-"cpg" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/item/key/security,
-/obj/item/circuitboard/machine/dish_drive/bullet,
-/obj/item/circuitboard/machine/dish_drive/bullet,
-/obj/item/circuitboard/machine/dish_drive/bullet,
-/turf/open/floor/iron/dark,
-/area/ai_monitored/security/armory)
 "cpl" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable,
@@ -18049,6 +17953,9 @@
 	dir = 4
 	},
 /obj/structure/cable,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
 "cpE" = (
@@ -21202,12 +21109,10 @@
 /turf/open/floor/iron,
 /area/engineering/atmos)
 "doq" = (
-/obj/machinery/camera/motion{
-	c_tag = "Armory - External";
-	dir = 1
-	},
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/icemoon/surface/outdoors)
+/obj/structure/closet/secure_closet/smartgun,
+/obj/effect/turf_decal/delivery/blue,
+/turf/open/floor/iron/smooth,
+/area/ai_monitored/security/armory)
 "doE" = (
 /obj/structure/light_construct/directional/east,
 /turf/open/floor/iron,
@@ -21903,10 +21808,7 @@
 /turf/open/floor/wood,
 /area/service/lawoffice)
 "dLc" = (
-/obj/machinery/dish_drive/bullet{
-	succrange = 3
-	},
-/obj/structure/reagent_dispensers/peppertank/directional/south,
+/obj/machinery/rnd/production/protolathe/department/security,
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
 "dLg" = (
@@ -22544,9 +22446,6 @@
 	name = "Armory";
 	req_access_txt = "3"
 	},
-/obj/machinery/light{
-	dir = 4
-	},
 /obj/effect/turf_decal/stripes/line,
 /obj/structure/cable,
 /obj/effect/turf_decal/delivery/blue,
@@ -22554,6 +22453,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
 	dir = 4
 	},
+/obj/machinery/light/directional/east,
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
 "ebX" = (
@@ -24844,24 +24744,6 @@
 	},
 /turf/open/floor/iron,
 /area/maintenance/port/aft)
-"fsz" = (
-/obj/structure/rack,
-/obj/item/gun/energy/ionrifle,
-/obj/item/gun/energy/temperature/security,
-/obj/item/clothing/suit/hooded/ablative,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron/dark,
-/area/ai_monitored/security/armory)
 "fsN" = (
 /obj/machinery/door/airlock/atmos{
 	name = "Atmospherics";
@@ -25558,6 +25440,9 @@
 /obj/structure/sign/painting/library,
 /turf/closed/wall,
 /area/hallway/secondary/service)
+"fPz" = (
+/turf/closed/wall,
+/area/ai_monitored/security/armory)
 "fPW" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/r_wall,
@@ -30900,6 +30785,23 @@
 "iJq" = (
 /turf/open/floor/iron/cafeteria,
 /area/maintenance/port/aft)
+"iJZ" = (
+/obj/structure/rack,
+/obj/item/gun/energy/ionrifle,
+/obj/item/gun/energy/temperature/security,
+/obj/item/clothing/suit/hooded/ablative,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/turf/open/floor/iron/dark,
+/area/ai_monitored/security/armory)
 "iKd" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/public/glass{
@@ -32322,7 +32224,7 @@
 /turf/open/floor/iron/dark,
 /area/science/genetics)
 "jyJ" = (
-/obj/machinery/gun_vendor,
+/obj/structure/table/reinforced,
 /turf/open/floor/iron/dark,
 /area/security/office)
 "jyL" = (
@@ -36135,6 +36037,12 @@
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/plating,
 /area/engineering/storage/tech)
+"lyH" = (
+/obj/structure/rack/gunrack,
+/obj/effect/spawner/armory_spawn/shotguns,
+/obj/effect/turf_decal/delivery/red,
+/turf/open/floor/iron/smooth,
+/area/ai_monitored/security/armory)
 "lyM" = (
 /obj/structure/table,
 /obj/item/folder/yellow,
@@ -40244,24 +40152,8 @@
 	},
 /area/security/prison/safe)
 "nxy" = (
-/obj/structure/rack,
-/obj/item/gun/energy/e_gun/dragnet,
-/obj/item/gun/energy/e_gun/dragnet,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/item/melee/hammer,
-/obj/item/melee/hammer,
-/obj/item/melee/hammer,
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/iron/dark,
+/obj/structure/fence,
+/turf/open/floor/iron/smooth,
 /area/ai_monitored/security/armory)
 "nxB" = (
 /turf/open/floor/plating,
@@ -41506,6 +41398,12 @@
 "omo" = (
 /turf/open/floor/iron,
 /area/cargo/miningdock)
+"onh" = (
+/obj/structure/closet/ammunitionlocker/useful,
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/delivery/red,
+/turf/open/floor/iron/smooth,
+/area/ai_monitored/security/armory)
 "ont" = (
 /obj/machinery/atmospherics/components/binary/thermomachine/freezer{
 	dir = 4
@@ -43350,6 +43248,12 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/engineering/storage/tech)
+"ppC" = (
+/obj/effect/turf_decal/loading_area{
+	dir = 1
+	},
+/turf/open/floor/iron/smooth,
+/area/ai_monitored/security/armory)
 "ppE" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -44646,6 +44550,12 @@
 	},
 /turf/open/floor/iron,
 /area/hallway/primary/port)
+"pTU" = (
+/obj/structure/fence/corner{
+	dir = 1
+	},
+/turf/open/floor/iron/smooth,
+/area/ai_monitored/security/armory)
 "pUe" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/turf_decal/trimline/white/line,
@@ -45442,6 +45352,11 @@
 /obj/machinery/holopad/secure,
 /turf/open/floor/carpet,
 /area/command/heads_quarters/hos)
+"qqa" = (
+/obj/effect/turf_decal/delivery/red,
+/obj/structure/rack/gunrack,
+/turf/open/floor/iron/smooth,
+/area/ai_monitored/security/armory)
 "qqH" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
@@ -45956,6 +45871,13 @@
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/iron/freezer,
 /area/command/heads_quarters/captain)
+"qHA" = (
+/obj/machinery/airalarm/directional/north,
+/obj/structure/rack/gunrack,
+/obj/effect/spawner/armory_spawn/rifles,
+/obj/effect/turf_decal/delivery/red,
+/turf/open/floor/iron/smooth,
+/area/ai_monitored/security/armory)
 "qHE" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{
 	dir = 8
@@ -51552,6 +51474,12 @@
 	dir = 9
 	},
 /area/science/research)
+"tAU" = (
+/obj/structure/fence{
+	dir = 4
+	},
+/turf/open/floor/iron/smooth,
+/area/ai_monitored/security/armory)
 "tAY" = (
 /obj/structure/table/wood,
 /obj/item/taperecorder{
@@ -53535,6 +53463,16 @@
 	},
 /turf/open/floor/iron/white,
 /area/medical/cryo)
+"uyL" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/firealarm/directional/north,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/iron/dark,
+/area/ai_monitored/security/armory)
 "uyS" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/cable,
@@ -53969,6 +53907,10 @@
 	},
 /turf/open/floor/plating,
 /area/engineering/supermatter)
+"uIu" = (
+/obj/structure/fence/door,
+/turf/open/floor/iron/smooth,
+/area/ai_monitored/security/armory)
 "uIv" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -56155,6 +56097,45 @@
 	dir = 5
 	},
 /area/maintenance/port/aft)
+"vVT" = (
+/obj/structure/rack,
+/obj/item/clothing/suit/armor/bulletproof{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/clothing/suit/armor/bulletproof,
+/obj/item/clothing/suit/armor/bulletproof{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/obj/item/clothing/head/helmet/alt{
+	layer = 3.00001;
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/clothing/head/helmet/alt{
+	layer = 3.00001
+	},
+/obj/item/clothing/head/helmet/alt{
+	layer = 3.00001;
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/obj/machinery/camera/motion{
+	c_tag = "Armory Motion Sensor"
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/turf/open/floor/iron/dark,
+/area/ai_monitored/security/armory)
 "vWA" = (
 /obj/machinery/vending/modularpc,
 /turf/open/floor/iron,
@@ -59349,6 +59330,10 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/wood,
 /area/commons/dorms)
+"xHN" = (
+/obj/structure/reagent_dispensers/peppertank,
+/turf/closed/wall/r_wall,
+/area/ai_monitored/security/armory)
 "xHX" = (
 /obj/structure/extinguisher_cabinet/directional/north,
 /obj/effect/turf_decal/tile/neutral{
@@ -88917,13 +88902,13 @@ abz
 nxw
 aeH
 aaJ
-boP
-boP
 aaZ
+sdP
+vVT
 abm
-cpg
-adi
-adi
+abH
+iJZ
+abN
 adi
 aaZ
 tsa
@@ -89174,10 +89159,10 @@ aaJ
 aaJ
 aaJ
 aaJ
-bBM
-boP
 aaZ
-abH
+uyL
+acl
+acl
 acl
 ajC
 acL
@@ -89431,12 +89416,12 @@ blq
 blq
 boP
 bBM
-boP
-boP
 aaZ
 nxy
+nxy
+nxy
+pTU
 ack
-adk
 adK
 cqG
 avB
@@ -89688,12 +89673,12 @@ cyJ
 cyJ
 rSN
 bBM
-boP
-doq
 aaZ
+doq
 abJ
+abJ
+tAU
 ack
-acM
 adQ
 cwM
 avB
@@ -89945,12 +89930,12 @@ blq
 blq
 boP
 bBM
-boP
-boP
 aaZ
-sdP
+lyH
+abJ
+ppC
+uIu
 ack
-coS
 aet
 cxA
 aeY
@@ -90202,12 +90187,12 @@ vOj
 vOj
 vOj
 vOj
-vOj
-boP
-aaZ
-fsz
+fPz
+onh
+abJ
+abJ
+tAU
 ack
-adj
 arc
 blT
 ebP
@@ -90459,11 +90444,11 @@ uLo
 rtE
 rIf
 lsk
-vOj
-boP
-aaZ
-abN
-ack
+fPz
+qHA
+abJ
+ppC
+uIu
 bkA
 acF
 aes
@@ -90716,15 +90701,15 @@ uLo
 und
 koX
 eBY
-vOj
-boP
-aaZ
+fPz
+qqa
+abJ
 aci
 acm
 cpA
 qac
 dLc
-aaZ
+xHN
 nsp
 agX
 agQ
@@ -90973,8 +90958,8 @@ uLo
 hak
 iXb
 abC
-vOj
-vOj
+fPz
+aaZ
 aaZ
 aaZ
 aaZ
diff --git a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm
index b78c69a47cd..1ba92a3e9d8 100644
--- a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm
+++ b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm
@@ -1026,8 +1026,10 @@
 /turf/closed/wall/r_wall,
 /area/ai_monitored/security/armory)
 "aer" = (
-/obj/machinery/suit_storage_unit/security_peacekeeper,
-/turf/open/floor/iron/dark,
+/obj/structure/rack/gunrack,
+/obj/effect/spawner/armory_spawn/shotguns,
+/obj/effect/turf_decal/delivery/red,
+/turf/open/floor/iron/smooth,
 /area/ai_monitored/security/armory)
 "aes" = (
 /obj/effect/decal/cleanable/dirt,
@@ -1826,13 +1828,10 @@
 /turf/open/floor/iron/dark,
 /area/security/brig)
 "aiA" = (
-/obj/item/storage/secure/safe{
-	name = "armory safe A";
-	pixel_x = 6;
-	pixel_y = 28
-	},
-/obj/machinery/suit_storage_unit/security_peacekeeper,
-/turf/open/floor/iron/dark,
+/obj/structure/closet/ammunitionlocker/useful,
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/delivery/red,
+/turf/open/floor/iron/smooth,
 /area/ai_monitored/security/armory)
 "aiB" = (
 /obj/structure/disposalpipe/segment{
@@ -2504,17 +2503,16 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
-/obj/structure/rack,
-/obj/item/storage/box/armament_tokens_primary{
-	pixel_x = -8
-	},
-/obj/item/storage/box/armament_tokens_sidearm{
-	pixel_x = 7
-	},
-/obj/item/storage/box/armament_tokens_energy,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/structure/closet/secure_closet{
+	name = "contraband locker";
+	req_access_txt = "3"
+	},
+/obj/effect/spawner/lootdrop/armory_contraband/metastation,
+/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/item/gun/ballistic/rifle/boltaction,
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
 "alW" = (
@@ -15818,17 +15816,9 @@
 /turf/open/floor/iron,
 /area/hallway/secondary/service)
 "bLT" = (
-/obj/structure/closet/secure_closet{
-	name = "contraband locker";
-	req_access_txt = "3"
-	},
-/obj/effect/spawner/lootdrop/maintenance/three,
-/obj/effect/spawner/lootdrop/armory_contraband/metastation,
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/item/gun/ballistic/rifle/boltaction,
-/turf/open/floor/iron/dark,
+/obj/structure/rack/gunrack,
+/obj/effect/turf_decal/delivery/red,
+/turf/open/floor/iron/smooth,
 /area/ai_monitored/security/armory)
 "bLW" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible,
@@ -81117,11 +81107,11 @@
 /turf/open/floor/engine,
 /area/science/xenobiology)
 "xVU" = (
-/obj/item/radio/intercom{
-	pixel_y = 25
-	},
-/obj/machinery/suit_storage_unit/security_peacekeeper,
-/turf/open/floor/iron/dark,
+/obj/machinery/airalarm/directional/north,
+/obj/structure/rack/gunrack,
+/obj/effect/spawner/armory_spawn/rifles,
+/obj/effect/turf_decal/delivery/red,
+/turf/open/floor/iron/smooth,
 /area/ai_monitored/security/armory)
 "xVX" = (
 /turf/open/floor/plating/airless,
diff --git a/_maps/map_files/NSSJourney/NSSJourney.dmm b/_maps/map_files/NSSJourney/NSSJourney.dmm
index 4aef06865b1..30d01c28b5e 100644
--- a/_maps/map_files/NSSJourney/NSSJourney.dmm
+++ b/_maps/map_files/NSSJourney/NSSJourney.dmm
@@ -139,23 +139,6 @@
 /turf/open/floor/carpet,
 /area/command/heads_quarters/hos)
 "abm" = (
-/obj/structure/table,
-/obj/item/storage/box/firingpins,
-/obj/item/storage/box/firingpins,
-/obj/item/key/security,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/iron/dark,
-/area/ai_monitored/security/armory)
-"abn" = (
 /obj/structure/rack,
 /obj/item/gun/energy/e_gun/dragnet,
 /obj/item/gun/energy/e_gun/dragnet,
@@ -172,9 +155,14 @@
 /obj/item/melee/hammer,
 /obj/item/melee/hammer,
 /obj/item/melee/hammer,
-/obj/machinery/firealarm/directional/north,
+/obj/item/storage/box/firingpins,
+/obj/item/storage/box/firingpins,
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
+"abn" = (
+/obj/structure/fence,
+/turf/open/floor/iron/smooth,
+/area/ai_monitored/security/armory)
 "abo" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -386,24 +374,9 @@
 /turf/open/floor/iron,
 /area/cargo/qm)
 "abN" = (
-/turf/open/floor/iron/dark,
-/area/ai_monitored/security/armory)
-"abQ" = (
-/obj/structure/rack,
-/obj/item/gun/energy/ionrifle,
-/obj/item/gun/energy/temperature/security,
-/obj/item/clothing/suit/hooded/ablative,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/machinery/airalarm/directional/north,
+/obj/vehicle/ridden/secway,
+/obj/effect/turf_decal/delivery/blue,
+/obj/item/key/security,
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
 "abS" = (
@@ -37416,6 +37389,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
 "dRT" = (
@@ -37630,6 +37606,13 @@
 	},
 /turf/open/floor/iron/dark/textured_large,
 /area/cargo/storage)
+"dZT" = (
+/obj/machinery/airalarm/directional/north,
+/obj/structure/rack/gunrack,
+/obj/effect/spawner/armory_spawn/rifles,
+/obj/effect/turf_decal/delivery/red,
+/turf/open/floor/iron/smooth,
+/area/ai_monitored/security/armory)
 "eaa" = (
 /obj/effect/turf_decal/tile/red,
 /obj/effect/turf_decal/tile/red{
@@ -38484,6 +38467,10 @@
 /obj/effect/turf_decal/trimline/darkblue/filled/line,
 /turf/open/floor/iron/dark,
 /area/hallway/primary/fore)
+"eYL" = (
+/obj/machinery/gun_vendor,
+/turf/open/floor/iron/dark,
+/area/security/office)
 "eZk" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
@@ -38560,12 +38547,11 @@
 /turf/open/floor/plating,
 /area/maintenance/solars/port/fore)
 "fdm" = (
-/obj/machinery/camera/motion{
-	c_tag = "Armory - External";
-	dir = 1
-	},
-/turf/open/space/basic,
-/area/space)
+/obj/structure/rack/gunrack,
+/obj/effect/spawner/armory_spawn/shotguns,
+/obj/effect/turf_decal/delivery/red,
+/turf/open/floor/iron/smooth,
+/area/ai_monitored/security/armory)
 "fds" = (
 /obj/machinery/door/airlock/command/glass{
 	name = "Gravity Generator Chamber";
@@ -39190,6 +39176,11 @@
 /obj/structure/trash_pile,
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
+"fFF" = (
+/obj/structure/closet/secure_closet/smartgun,
+/obj/effect/turf_decal/delivery/blue,
+/turf/open/floor/iron/smooth,
+/area/ai_monitored/security/armory)
 "fFQ" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/siding/thinplating/dark{
@@ -39494,7 +39485,7 @@
 /turf/open/floor/iron/dark,
 /area/security/prison)
 "fSV" = (
-/obj/machinery/gun_vendor,
+/obj/structure/table/reinforced,
 /turf/open/floor/iron/dark,
 /area/security/office)
 "fTd" = (
@@ -39721,6 +39712,9 @@
 	dir = 4
 	},
 /obj/structure/cable,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
 "gdQ" = (
@@ -40541,6 +40535,23 @@
 /obj/effect/turf_decal/tile/neutral,
 /turf/open/floor/iron/dark,
 /area/security/checkpoint/auxiliary)
+"gYM" = (
+/obj/structure/rack,
+/obj/item/gun/energy/ionrifle,
+/obj/item/gun/energy/temperature/security,
+/obj/item/clothing/suit/hooded/ablative,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/turf/open/floor/iron/dark,
+/area/ai_monitored/security/armory)
 "gYU" = (
 /obj/machinery/camera{
 	c_tag = "Locker Room West";
@@ -41070,6 +41081,15 @@
 	dir = 9
 	},
 /area/security/prison)
+"hzc" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/iron/dark,
+/area/ai_monitored/security/armory)
 "hzQ" = (
 /obj/structure/grille,
 /turf/open/floor/plating,
@@ -41262,6 +41282,14 @@
 /obj/effect/landmark/start/security_officer,
 /turf/open/floor/iron/dark,
 /area/security/office)
+"hEU" = (
+/obj/structure/grille,
+/obj/machinery/camera/motion{
+	c_tag = "Armory - External";
+	dir = 1
+	},
+/turf/open/space/basic,
+/area/space/nearstation)
 "hFg" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
@@ -41495,6 +41523,9 @@
 	name = "Sergeant-at-Armsky";
 	weaponscheck = 1
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
 "hQC" = (
@@ -42141,6 +42172,12 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/hallway/primary/central)
+"ivZ" = (
+/obj/effect/turf_decal/loading_area{
+	dir = 1
+	},
+/turf/open/floor/iron/smooth,
+/area/ai_monitored/security/armory)
 "ixq" = (
 /obj/machinery/holopad,
 /obj/effect/turf_decal/bot,
@@ -42650,6 +42687,9 @@
 /obj/machinery/light/directional/south,
 /turf/open/floor/iron/dark,
 /area/security/prison)
+"jgL" = (
+/turf/open/floor/iron/smooth,
+/area/ai_monitored/security/armory)
 "jgM" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 1
@@ -44783,6 +44823,11 @@
 /obj/effect/spawner/structure/window,
 /turf/open/floor/plating,
 /area/medical/cryo)
+"kQc" = (
+/obj/machinery/power/apc/auto_name/east,
+/obj/structure/cable,
+/turf/open/floor/iron/smooth,
+/area/ai_monitored/security/armory)
 "kQe" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
@@ -44854,12 +44899,11 @@
 /turf/open/floor/iron/white,
 /area/medical/medbay/central)
 "kVz" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
 /obj/structure/cable,
-/obj/machinery/power/apc/auto_name/east,
-/turf/open/floor/iron/dark,
+/obj/structure/fence{
+	dir = 4
+	},
+/turf/open/floor/iron/smooth,
 /area/ai_monitored/security/armory)
 "kWe" = (
 /obj/effect/turf_decal/tile/neutral,
@@ -46796,6 +46840,11 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/maintenance/port)
+"mQS" = (
+/obj/structure/rack/gunrack,
+/obj/effect/turf_decal/delivery/red,
+/turf/open/floor/iron/smooth,
+/area/ai_monitored/security/armory)
 "mRE" = (
 /obj/structure/chair/office{
 	dir = 8
@@ -47180,13 +47229,6 @@
 "nlg" = (
 /turf/open/floor/iron/dark/textured_large,
 /area/service/hydroponics)
-"nli" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/effect/turf_decal/delivery/blue,
-/turf/open/floor/iron/dark,
-/area/security/office)
 "nlo" = (
 /obj/effect/turf_decal/tile/blue/darkblue{
 	dir = 8
@@ -48658,6 +48700,12 @@
 	},
 /turf/open/floor/iron/freezer,
 /area/maintenance/starboard/fore)
+"oEV" = (
+/obj/structure/fence/corner{
+	dir = 1
+	},
+/turf/open/floor/iron/smooth,
+/area/ai_monitored/security/armory)
 "oFd" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
@@ -49457,13 +49505,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood,
 /area/maintenance/port/aft)
-"puT" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/machinery/gun_vendor,
-/turf/open/floor/iron/dark,
-/area/security/office)
 "pva" = (
 /obj/effect/turf_decal/tile/yellow{
 	dir = 1
@@ -49492,6 +49533,16 @@
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/commons/vacant_room/commissary)
+"pvP" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/firealarm/directional/north,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/iron/dark,
+/area/ai_monitored/security/armory)
 "pwd" = (
 /obj/structure/flora/ausbushes/fullgrass{
 	pixel_x = -3;
@@ -50636,16 +50687,6 @@
 	},
 /turf/open/floor/plating,
 /area/cargo/storage)
-"qxh" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/bot,
-/obj/structure/window/reinforced{
-	dir = 1;
-	layer = 2.9
-	},
-/obj/item/storage/box/armament_tokens_energy,
-/turf/open/floor/iron/dark,
-/area/ai_monitored/security/armory)
 "qxr" = (
 /obj/machinery/holopad/secure,
 /turf/open/floor/iron/dark,
@@ -50880,27 +50921,6 @@
 	},
 /turf/open/floor/iron,
 /area/security/prison)
-"qJV" = (
-/obj/structure/rack,
-/obj/item/gun/ballistic/shotgun/riot{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/gun/ballistic/shotgun/riot,
-/obj/item/gun/ballistic/shotgun/riot{
-	pixel_x = 3;
-	pixel_y = -3
-	},
-/obj/effect/turf_decal/bot,
-/obj/structure/window/reinforced{
-	dir = 1;
-	layer = 2.9
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/open/floor/iron/dark,
-/area/ai_monitored/security/armory)
 "qKp" = (
 /obj/machinery/power/apc/auto_name/north,
 /obj/structure/cable,
@@ -51138,6 +51158,12 @@
 /obj/effect/turf_decal/bot,
 /turf/open/floor/iron,
 /area/service/hydroponics)
+"qXa" = (
+/obj/structure/closet/ammunitionlocker/useful,
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/delivery/red,
+/turf/open/floor/iron/smooth,
+/area/ai_monitored/security/armory)
 "qXk" = (
 /obj/effect/turf_decal/vg_decals/atmos/air{
 	dir = 1
@@ -51612,12 +51638,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/cargo/qm)
-"rtz" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 9
-	},
-/turf/open/floor/iron/dark,
-/area/ai_monitored/security/armory)
 "rut" = (
 /obj/structure/table,
 /obj/item/clothing/suit/apron/chef,
@@ -52433,9 +52453,7 @@
 /turf/open/floor/iron/dark,
 /area/security/prison)
 "snY" = (
-/obj/machinery/dish_drive/bullet{
-	succrange = 3
-	},
+/obj/machinery/rnd/production/protolathe/department/security,
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
 "sol" = (
@@ -52525,10 +52543,6 @@
 	},
 /turf/open/floor/engine,
 /area/science/xenobiology)
-"sur" = (
-/obj/machinery/rnd/production/techfab/department/security,
-/turf/open/floor/iron/dark,
-/area/ai_monitored/security/armory)
 "suJ" = (
 /obj/effect/turf_decal/arrows,
 /obj/effect/turf_decal/stripes/line{
@@ -53802,15 +53816,6 @@
 /obj/item/pen,
 /turf/open/floor/wood,
 /area/service/lawoffice)
-"tzz" = (
-/obj/structure/window/reinforced{
-	dir = 1;
-	layer = 2.9
-	},
-/obj/structure/closet/secure_closet/smartgun,
-/obj/effect/turf_decal/delivery/blue,
-/turf/open/floor/iron/dark,
-/area/ai_monitored/security/armory)
 "tzD" = (
 /obj/structure/chair/stool,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -53912,24 +53917,6 @@
 	},
 /turf/open/floor/iron,
 /area/commons/fitness)
-"tDP" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/item/key/security,
-/obj/item/circuitboard/machine/dish_drive/bullet,
-/obj/item/circuitboard/machine/dish_drive/bullet,
-/obj/item/circuitboard/machine/dish_drive/bullet,
-/turf/open/floor/iron/dark,
-/area/ai_monitored/security/armory)
 "tEk" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/siding/thinplating/dark,
@@ -56028,11 +56015,6 @@
 	},
 /turf/open/floor/iron/smooth_large,
 /area/engineering/main)
-"vAI" = (
-/obj/vehicle/ridden/secway,
-/obj/effect/turf_decal/delivery/blue,
-/turf/open/floor/iron/dark,
-/area/ai_monitored/security/armory)
 "vAN" = (
 /obj/effect/landmark/start/brigoff,
 /turf/open/floor/iron/dark,
@@ -56295,6 +56277,12 @@
 /obj/structure/cable,
 /turf/open/floor/circuit,
 /area/ai_monitored/turret_protected/ai)
+"vLz" = (
+/obj/structure/fence{
+	dir = 4
+	},
+/turf/open/floor/iron/smooth,
+/area/ai_monitored/security/armory)
 "vLG" = (
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt,
@@ -56472,24 +56460,6 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/wood,
 /area/maintenance/port/aft)
-"vVl" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/window/reinforced{
-	dir = 1;
-	layer = 2.9
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/rack,
-/obj/item/storage/box/armament_tokens_sidearm{
-	pixel_x = 7
-	},
-/obj/item/storage/box/armament_tokens_primary{
-	pixel_x = -8
-	},
-/turf/open/floor/iron/dark,
-/area/ai_monitored/security/armory)
 "vVG" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
 	dir = 4
@@ -56513,6 +56483,9 @@
 /obj/machinery/computer/cargo/request,
 /turf/open/floor/iron/dark,
 /area/security/office)
+"vWE" = (
+/turf/closed/wall,
+/area/ai_monitored/security/armory)
 "vWX" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "Genetics Lab Maintenance";
@@ -57633,6 +57606,10 @@
 /obj/effect/spawner/liquids_spawner,
 /turf/open/floor/iron/pool,
 /area/security/prison)
+"wTo" = (
+/obj/structure/fence/door,
+/turf/open/floor/iron/smooth,
+/area/ai_monitored/security/armory)
 "wTp" = (
 /obj/machinery/chem_heater/withbuffer,
 /obj/structure/window/reinforced,
@@ -87555,14 +87532,14 @@ abz
 ydU
 teK
 aaJ
-xzh
-xzh
 aaZ
+abI
+abJ
 abm
-tDP
+abH
+gYM
 iSP
 adi
-adi
 aaZ
 lzE
 guI
@@ -87812,11 +87789,11 @@ aaJ
 aaJ
 pUm
 aaJ
-xzh
-xzh
 aaZ
-abH
-rtz
+pvP
+hzc
+hzc
+hzc
 dRi
 otg
 adi
@@ -88069,12 +88046,12 @@ xzh
 xzh
 xzh
 bBM
-xzh
-xzh
 aaZ
 abn
+abn
+abn
+oEV
 xoJ
-qJV
 obK
 cRD
 avB
@@ -88325,13 +88302,13 @@ xzh
 xzh
 xzh
 xzh
-bBM
-xzh
-fdm
+hEU
 aaZ
-abJ
+fFF
+jgL
+jgL
+vLz
 xoJ
-tzz
 nNO
 ugN
 avB
@@ -88583,12 +88560,12 @@ xzh
 xzh
 xzh
 bBM
-xzh
-xzh
 aaZ
-abI
+fdm
+jgL
+ivZ
+wTo
 xoJ
-qxh
 gLJ
 qNz
 rDX
@@ -88840,12 +88817,12 @@ abq
 abq
 abq
 abq
-abq
-xzh
-aaZ
-abQ
+vWE
+qXa
+jgL
+jgL
+vLz
 xoJ
-vVl
 mlh
 nHu
 lPd
@@ -89097,11 +89074,11 @@ hgD
 glM
 ovx
 trX
-abq
-xzh
-aaZ
-sur
-xoJ
+vWE
+dZT
+jgL
+ivZ
+wTo
 hPF
 uaA
 abN
@@ -89354,10 +89331,10 @@ hgD
 iVu
 kwy
 utD
-abq
-xzh
-aaZ
-vAI
+vWE
+mQS
+jgL
+kQc
 kVz
 gdu
 kct
@@ -89611,8 +89588,8 @@ hgD
 xjQ
 ygM
 nDg
-abq
-abo
+vWE
+aaZ
 aaZ
 aaZ
 aaZ
@@ -90378,8 +90355,8 @@ xzh
 xzh
 xzh
 abq
-puT
-nli
+eYL
+wbO
 fBM
 mNa
 abo
diff --git a/code/__DEFINES/~skyrat_defines/projectiles.dm b/code/__DEFINES/~skyrat_defines/projectiles.dm
index b90d8857d44..4e99ca1d5d5 100644
--- a/code/__DEFINES/~skyrat_defines/projectiles.dm
+++ b/code/__DEFINES/~skyrat_defines/projectiles.dm
@@ -9,3 +9,6 @@
 
 /// The caliber used by the M45A5
 #define CALIBER_460 ".460 RM JHP"
+
+/// The caliber used by Armadyne shotguns.
+#define CALIBER_14GAUGE "14 Gauge"
diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm
index 98853f8a21d..6a9fd75d80d 100644
--- a/code/game/objects/structures/fence.dm
+++ b/code/game/objects/structures/fence.dm
@@ -114,8 +114,8 @@
 
 /obj/structure/fence/door/Initialize()
 	. = ..()
-
-	update_door_status()
+	if(open) //SKYRAT EDIT CHANGE
+		update_door_status()
 
 /obj/structure/fence/door/opened
 	icon_state = "door_opened"
diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm
index 92c7c5ac112..c2d2f0cc06e 100644
--- a/code/modules/jobs/job_types/security_officer.dm
+++ b/code/modules/jobs/job_types/security_officer.dm
@@ -196,7 +196,7 @@ GLOBAL_LIST_EMPTY(security_officer_distribution)
 	shoes = /obj/item/clothing/shoes/combat/peacekeeper //SKYRAT EDIT CHANGE - SEC_HAUL
 	l_pocket = /obj/item/restraints/handcuffs
 	r_pocket = /obj/item/assembly/flash/handheld
-	suit_store = /obj/item/gun/energy/taser/armadyne //SKYRAT EDIT CHANGE - SEC_HAUL
+	suit_store = /obj/item/gun/energy/disabler
 	backpack_contents = list(/obj/item/melee/classic_baton/peacekeeper, /obj/item/armament_token/sidearm) //SKYRAT EDIT CHANGE - SEC_HAUL - ORIGINAL: backpack_contents = list(/obj/item/melee/baton/loaded=1)
 
 	backpack = /obj/item/storage/backpack/security/peacekeeper //SKYRAT EDIT CHANGE - SEC_HAUL - ORIGINAL: backpack = /obj/item/storage/backpack/security
diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm
index 47c1e9dc198..71cc8a12c7d 100644
--- a/code/modules/jobs/job_types/warden.dm
+++ b/code/modules/jobs/job_types/warden.dm
@@ -49,7 +49,7 @@
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses/peacekeeper //SKYRAT EDIT CHANGE - SEC_HAUL - ORIGINAL: /obj/item/clothing/glasses/hud/security/sunglasses
 	r_pocket = /obj/item/assembly/flash/handheld
 	l_pocket = /obj/item/restraints/handcuffs
-	//suit_store = /obj/item/gun/energy/disabler //SKYRAT EDIT REMOVAL - SEC_HAUL
+	suit_store = /obj/item/gun/energy/disabler
 	backpack_contents = list(/obj/item/melee/classic_baton/peacekeeper, /obj/item/clothing/head/beret/sec/peacekeeper, /obj/item/armament_token/sidearm) //SKRYAT EDIT CHANGE - SEC_HAUL - ORIGINAL: backpack_contents = list(/obj/item/melee/baton/loaded=1)
 
 	backpack = /obj/item/storage/backpack/security/peacekeeper //SKYRAT EDIT CHANGE - SEC_HAUL - ORIGINAL: backpack = /obj/item/storage/backpack/security
diff --git a/modular_skyrat/modules/aesthetics/rack/code/rack.dm b/modular_skyrat/modules/aesthetics/rack/code/rack.dm
index 0bc7ea39143..131e870c74f 100644
--- a/modular_skyrat/modules/aesthetics/rack/code/rack.dm
+++ b/modular_skyrat/modules/aesthetics/rack/code/rack.dm
@@ -6,3 +6,42 @@
 	icon_state = "shelf"
 	name = "Shelf"
 	desc = "A shelf, for storing things on. Conveinent!"
+
+/obj/item/gun
+	var/on_rack = FALSE
+
+/obj/item/gun/proc/place_on_rack()
+	on_rack = TRUE
+	var/matrix/M = matrix()
+	M.Turn(-90)
+	transform = M
+
+/obj/item/gun/proc/remove_from_rack()
+	if(on_rack)
+		var/matrix/M = matrix()
+		transform = M
+		on_rack = FALSE
+
+/obj/item/gun/pickup(mob/user)
+	. = ..()
+	remove_from_rack()
+
+/obj/structure/rack/gunrack
+	icon_state = "gunrack"
+	name = "gun rack"
+	desc = "A gun rack for storing guns."
+
+/obj/structure/rack/gunrack/attackby(obj/item/W, mob/living/user, params)
+	var/list/modifiers = params2list(params)
+	if (W.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1) && LAZYACCESS(modifiers, RIGHT_CLICK))
+		W.play_tool_sound(src)
+		deconstruct(TRUE)
+		return
+	if(user.combat_mode)
+		return ..()
+	if(user.transferItemToLoc(W, drop_location()))
+		if(istype(W, /obj/item/gun))
+			var/obj/item/gun/our_gun = W
+			our_gun.place_on_rack()
+			our_gun.pixel_x = rand(-10, 10)
+		return TRUE
diff --git a/modular_skyrat/modules/aesthetics/rack/icons/rack.dmi b/modular_skyrat/modules/aesthetics/rack/icons/rack.dmi
index f2f514555c4..14e3b6eb51d 100644
Binary files a/modular_skyrat/modules/aesthetics/rack/icons/rack.dmi and b/modular_skyrat/modules/aesthetics/rack/icons/rack.dmi differ
diff --git a/modular_skyrat/modules/sec_haul/code/guns/ammo.dm b/modular_skyrat/modules/sec_haul/code/guns/ammo.dm
index 906c96a2415..93e8d377c42 100644
--- a/modular_skyrat/modules/sec_haul/code/guns/ammo.dm
+++ b/modular_skyrat/modules/sec_haul/code/guns/ammo.dm
@@ -205,3 +205,80 @@
 	. = ..()
 	if(stored_ammo.len)
 		. += "[initial(icon_state)]_[round_type]"
+
+////////////////////////////
+///////////14 GAUGE/////////
+////////////////////////////
+
+/obj/item/ammo_casing/s14gauge
+	name = "14 gauge shotgun slug"
+	desc = "A 14 gauge lead slug."
+	icon_state = "blshell"
+	worn_icon_state = "shell"
+	caliber = CALIBER_14GAUGE
+	custom_materials = list(/datum/material/iron=2000)
+	projectile_type = /obj/projectile/bullet/s14gauge_slug
+
+/obj/item/ammo_casing/s14gauge/beanbag
+	name = "14 gauge beanbag slug"
+	desc = "A weak beanbag slug for riot control."
+	icon_state = "bshell"
+	custom_materials = list(/datum/material/iron=250)
+	projectile_type = /obj/projectile/bullet/s14gauge_beanbag
+	harmful = FALSE
+
+/obj/item/ammo_casing/s14gauge/buckshot
+	name = "14 gauge buckshot shell"
+	desc = "A 14 gauge  buckshot shell."
+	icon_state = "gshell"
+	projectile_type = /obj/projectile/bullet/pellet/s14gauge_buckshot
+	pellets = 5
+	variance = 25
+
+/obj/item/ammo_casing/s14gauge/rubbershot
+	name = "14 gauge rubber shot"
+	desc = "A shotgun casing filled with densely-packed rubber balls, used to incapacitate crowds from a distance."
+	icon_state = "bshell"
+	projectile_type = /obj/projectile/bullet/pellet/s14gauge_rubbershot
+	pellets = 5
+	variance = 25
+	custom_materials = list(/datum/material/iron=4000)
+	harmful = FALSE //SKYRAT EDIT ADDITION
+
+/obj/item/ammo_casing/s14gauge/stunslug
+	name = "14 gauge taser slug"
+	desc = "A stunning taser slug."
+	icon_state = "stunshell"
+	projectile_type = /obj/projectile/bullet/s14gauge_stunslug
+	custom_materials = list(/datum/material/iron=500,/datum/material/gold=100)
+	harmful = FALSE
+
+/obj/item/storage/box/rubbershot_14gauge
+	name = "box of 14 gauge rubber shots"
+	desc = "A box full of rubber shots, designed for riot shotguns."
+	icon_state = "rubbershot_box"
+	illustration = null
+
+/obj/item/storage/box/rubbershot_14gauge/PopulateContents()
+	for(var/i in 1 to 7)
+		new /obj/item/ammo_casing/s14gauge/rubbershot(src)
+
+/obj/item/storage/box/lethalshot_14gauge
+	name = "box of lethal 14 gauge shotgun shots"
+	desc = "A box full of lethal shots, designed for riot shotguns."
+	icon_state = "lethalshot_box"
+	illustration = null
+
+/obj/item/storage/box/lethalshot_14gauge/PopulateContents()
+	for(var/i in 1 to 7)
+		new /obj/item/ammo_casing/s14gauge/buckshot(src)
+
+/obj/item/storage/box/beanbag_14gauge
+	name = "box of 14 gauge beanbags"
+	desc = "A box full of beanbag shells."
+	icon_state = "rubbershot_box"
+	illustration = null
+
+/obj/item/storage/box/beanbag_14gauge/PopulateContents()
+	for(var/i in 1 to 6)
+		new /obj/item/ammo_casing/s14gauge/beanbag(src)
diff --git a/modular_skyrat/modules/sec_haul/code/guns/bullets.dm b/modular_skyrat/modules/sec_haul/code/guns/bullets.dm
index 632fb6c9e56..01cf2b946d5 100644
--- a/modular_skyrat/modules/sec_haul/code/guns/bullets.dm
+++ b/modular_skyrat/modules/sec_haul/code/guns/bullets.dm
@@ -58,9 +58,6 @@
 	bare_wound_bonus = 50
 	embedding = list(embed_chance=60, fall_chance=3, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10)
 	weak_against_armour = TRUE
-	armour_penetration = -60
-	
-	
 
 ///////////9x19mm/////////////////
 //FMJ | JHP | IHDF | RUBBER//
@@ -77,7 +74,6 @@
 	name = "9x19mm FMJ bullet"
 	damage = 15
 	speed = 0.8
-	armour_penetration = -30
 
 /obj/item/ammo_casing/b9mm/hp
 	name = "9x19mm JHP bullet casing"
@@ -92,7 +88,6 @@
 	icon_state = "bullet_h"
 	damage = 20
 	wound_bonus = 35
-	armour_penetration = -60
 	embedding = list(embed_chance=75, fall_chance=3, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10)
 	weak_against_armour = TRUE
 
@@ -257,7 +252,6 @@
 	icon_state = "bullet_h"
 	damage = 47
 	wound_bonus = 40
-	armour_penetration = -20
 	embedding = list(embed_chance=75, fall_chance=3, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10)
 	weak_against_armour = TRUE
 
@@ -387,3 +381,46 @@
 	damage = 25
 	damage_type = STAMINA
 	embedding = list(embed_chance=0, fall_chance=3, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10)
+
+////////////////////////////
+///////////14 GAUGE/////////
+////////////////////////////
+
+/obj/projectile/bullet/s14gauge_slug
+	name = "12g shotgun slug"
+	damage = 27
+	sharpness = SHARP_POINTY
+	wound_bonus = 0
+
+/obj/projectile/bullet/s14gauge_beanbag
+	name = "beanbag slug"
+	damage = 5
+	stamina = 30
+	wound_bonus = 0
+	sharpness = NONE
+	embedding = null
+
+/obj/projectile/bullet/pellet/s14gauge_buckshot
+	name = "buckshot pellet"
+	damage = 5
+	wound_bonus = 3
+	bare_wound_bonus = 3
+	wound_falloff_tile = -2.5 // low damage + additional dropoff will already curb wounding potential anything past point blank
+
+/obj/projectile/bullet/pellet/s14gauge_rubbershot
+	name = "rubbershot pellet"
+	damage = 2
+	stamina = 7
+	sharpness = NONE
+	embedding = null
+
+/obj/projectile/bullet/s14gauge_stunslug
+	name = "stunslug"
+	damage = 5
+	knockdown = 100
+	stutter = 5
+	jitter = 20
+	range = 7
+	icon_state = "spark"
+	color = "#FFFF00"
+	embedding = null
diff --git a/modular_skyrat/modules/sec_haul/code/guns/gun_spawns.dm b/modular_skyrat/modules/sec_haul/code/guns/gun_spawns.dm
new file mode 100644
index 00000000000..d2dc01c791d
--- /dev/null
+++ b/modular_skyrat/modules/sec_haul/code/guns/gun_spawns.dm
@@ -0,0 +1,87 @@
+/obj/effect/spawner/armory_spawn
+	icon = 'modular_skyrat/modules/sec_haul/icons/guns/spawner.dmi'
+	icon_state = "random_gun"
+	layer = OBJ_LAYER
+	/// How many guns will be spawned here.
+	var/gun_count = 1
+	/// If the same gun can be spawned twice.
+	var/gun_doubles = TRUE
+	/// A list of possible guns to spawn.
+	var/list/guns
+	/// Do we fan out the items spawned for a natural effect?
+	var/fan_out_items = TRUE
+	/// How many mags per gun do we spawn, if it takes magazines.
+	var/mags_to_spawn = 3
+	/// Do we want to angle it so that it is horizontal?
+	var/vertial_guns = TRUE
+
+/obj/structure/rack/shelf
+
+/obj/effect/spawner/armory_spawn/Initialize(mapload)
+	..()
+	if(guns?.len)
+		var/guns_spawned = 0
+		while((gun_count - guns_spawned) && guns.len)
+			var/gunspawn = pickweight(guns)
+			while(islist(gunspawn))
+				gunspawn = pickweight(gunspawn)
+			if(!gun_doubles)
+				guns.Remove(gunspawn)
+
+			if(gunspawn)
+				var/obj/item/gun/spawned_gun = new gunspawn(loc)
+
+				if(vertial_guns)
+					spawned_gun.place_on_rack()
+					spawned_gun.pixel_x = rand(-10,10)
+
+				if(istype(spawned_gun, /obj/item/gun/ballistic))
+					var/obj/item/gun/ballistic/spawned_ballistic_gun = spawned_gun
+					if(spawned_ballistic_gun.magazine && !istype(spawned_ballistic_gun.magazine, /obj/item/ammo_box/magazine/internal))
+						var/obj/item/storage/box/ammo_box/spawned_box = new(loc)
+						spawned_box.name = "ammo box - [spawned_ballistic_gun.name]"
+						for(var/i in 1 to mags_to_spawn)
+							new spawned_ballistic_gun.mag_type (spawned_box)
+
+			guns_spawned++
+	return INITIALIZE_HINT_QDEL
+
+//////////////RIFLE SPAWNER
+/obj/effect/spawner/armory_spawn/rifles
+	icon_state = "random_rifle"
+	gun_count = 4
+	guns = list(
+		/obj/item/gun/ballistic/automatic/pcr,
+		/obj/item/gun/ballistic/automatic/pitbull,
+		/obj/item/gun/ballistic/automatic/ostwind,
+		/obj/item/gun/ballistic/automatic/norwind,
+		/obj/item/gun/ballistic/automatic/vintorez,
+	)
+
+/obj/effect/spawner/armory_spawn/shotguns
+	icon_state = "random_shotgun"
+	gun_count = 4
+	guns = list(
+		/obj/item/gun/ballistic/shotgun/m23,
+		/obj/item/gun/ballistic/shotgun/automatic/as2,
+		/obj/item/gun/ballistic/shotgun/sas14,
+	)
+
+/obj/structure/closet/ammunitionlocker/useful/PopulateContents()
+	new /obj/item/storage/box/rubbershot_14gauge(src)
+	new /obj/item/storage/box/rubbershot_14gauge(src)
+	new /obj/item/storage/box/lethalshot_14gauge(src)
+	new /obj/item/storage/box/lethalshot_14gauge(src)
+
+//////////////////////////AMMO BOXES
+/obj/item/storage/box/ammo_box
+	name = "ammo box"
+	desc = "A box filled with ammunition."
+	icon_state = "boxhrifle"
+	icon = 'modular_skyrat/modules/sec_haul/icons/guns/ammoboxes.dmi'
+	illustration = null
+	layer = 2.9
+
+/obj/item/storage/box/ammo_box/PopulateContents()
+	new /obj/item/storage/bag/ammo(src)
+	new /obj/item/gun_maintenance_supplies(src)
diff --git a/modular_skyrat/modules/sec_haul/code/guns/guns.dm b/modular_skyrat/modules/sec_haul/code/guns/guns.dm
index 74093085e9c..2c4b2c71ccf 100644
--- a/modular_skyrat/modules/sec_haul/code/guns/guns.dm
+++ b/modular_skyrat/modules/sec_haul/code/guns/guns.dm
@@ -19,7 +19,7 @@
 		. +=  "It has an <p style='color:red'>Armadyne</p> embroidery on the grip."
 
 //////////////////GLOCK
-/obj/item/gun/ballistic/automatic/pistol/g17       //UNUSED
+/obj/item/gun/ballistic/automatic/pistol/g17
 	name = "\improper Glock-17"
 	desc = "A weapon from bygone times, this has been made to feel and look exactly like the 21st century version. Let's hope it's more reliable. Chambered in 9mm."
 	icon = 'modular_skyrat/modules/sec_haul/icons/guns/glock.dmi'
@@ -33,9 +33,10 @@
 	bolt_drop_sound = 'sound/weapons/gun/pistol/slide_drop.ogg'
 	realistic = TRUE
 	can_flashlight = TRUE
-	dirt_modifier = 1.7
+	dirt_modifier = 1
 	emp_damageable = TRUE
 	armadyne = TRUE
+	fire_delay = 3
 
 /obj/item/ammo_box/magazine/multi_sprite/g17
 	name = "g17 handgun magazine (9mm)"
@@ -100,7 +101,7 @@
 	round_type = AMMO_TYPE_RUBBER
 
 ////////////////PDH 40x32
-/obj/item/gun/ballistic/automatic/pistol/pdh       //UNUSED
+/obj/item/gun/ballistic/automatic/pistol/pdh
 	name = "\improper PDH-6H 'Osprey'"
 	desc = "A modern ballistics sidearm, used primarily by the military, however this one has had a paintjob to match command. It's chambered in 12mm."
 	icon = 'modular_skyrat/modules/sec_haul/icons/guns/pdh.dmi'
@@ -181,7 +182,7 @@
 
 
 ///////////////////////////PDH PEACEKEEPER
-/obj/item/gun/ballistic/automatic/pistol/pdh/peacekeeper     //SIDEARM CHOICE #1
+/obj/item/gun/ballistic/automatic/pistol/pdh/peacekeeper
 	name = "\improper PDH-6B 'Peacekeeper'"
 	desc = "A modern ballistic sidearm, used primarily by law enforcement, however this one has had a paintjob to match the peacekeeper theme."
 	fire_delay = 1.95
@@ -213,7 +214,7 @@
 	round_type = AMMO_TYPE_RUBBER
 
 ///////////////////////LADON 40x32
-/obj/item/gun/ballistic/automatic/pistol/ladon       //UNUSED
+/obj/item/gun/ballistic/automatic/pistol/ladon
 	name = "\improper P-3 'Ladon'"
 	desc = "A modern ballistic sidearm based off the PDH models, chambered in 10mm and quite recent on the market. It has an <p style='color:red'>Armadyne</p> embroidery on the grip."
 	icon = 'modular_skyrat/modules/sec_haul/icons/guns/ladon.dmi'
@@ -233,6 +234,7 @@
 	dirt_modifier = 0.8
 	emp_damageable = TRUE
 	armadyne = TRUE
+	fire_delay = 4.20
 
 /obj/item/ammo_box/magazine/multi_sprite/ladon
 	name = "ladon handgun magazine (10mm)"
@@ -372,7 +374,7 @@
 
 /////////////////////PCR
 
-/obj/item/gun/ballistic/automatic/pcr              //PRIMARY OPTION #1
+/obj/item/gun/ballistic/automatic/pcr
 	name = "\improper PCR-9 SMG"
 	desc = "An accurate, fast-firing SMG chambered in 9x19mm."
 	icon = 'modular_skyrat/modules/sec_haul/icons/guns/pcr.dmi'
@@ -419,7 +421,7 @@
 	ammo_type = /obj/item/ammo_casing/b9mm/rubber
 	round_type = AMMO_TYPE_RUBBER
 
-/obj/item/gun/ballistic/automatic/pitbull          //PRIMARY OPTION #2
+/obj/item/gun/ballistic/automatic/pitbull
 	name = "\improper Pitbull PDW"
 	desc = "A sturdy personal defense weapon designed to fire 10mm Auto rounds."
 	icon = 'modular_skyrat/modules/sec_haul/icons/guns/pitbull.dmi'
@@ -467,7 +469,7 @@
 	round_type = AMMO_TYPE_RUBBER
 
 /////////////////DTR
-/obj/item/gun/ballistic/automatic/ostwind              //PRIMARY OPTION #3
+/obj/item/gun/ballistic/automatic/ostwind
 	name = "\improper DTR-6 Rifle"
 	desc = "A 6.3mm special-purpose rifle designed for specific situations."
 	icon = 'modular_skyrat/modules/sec_haul/icons/guns/ostwind.dmi'
@@ -557,7 +559,7 @@
 	round_type = AMMO_TYPE_IHDF
 
 ///////////////////////////Dozer
-/obj/item/gun/ballistic/automatic/dozer       //UNUSED
+/obj/item/gun/ballistic/automatic/dozer
 	name = "\improper DZR-10 'Dozer'"
 	desc = "The DZR-10, a notorious 10mm PDW that lives up to its nickname. For safety concerns, this peacekeeping model has been locked to semi-automatic."
 	icon = 'modular_skyrat/modules/sec_haul/icons/guns/dozer.dmi'
@@ -570,9 +572,9 @@
 	can_suppress = TRUE
 	mag_display = FALSE
 	mag_display_ammo = FALSE
-	burst_size = 1
-	fire_delay = 0
-	fire_select_modes = list(SELECT_SEMI_AUTOMATIC)
+	burst_size = 2
+	fire_delay = 1.50
+	fire_select_modes = list(SELECT_SEMI_AUTOMATIC, SELECT_BURST_SHOT)
 	fire_sound = 'sound/weapons/gun/rifle/shot.ogg'
 	rack_sound = 'sound/weapons/gun/smg/smgrack.ogg'
 	lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg'
@@ -582,29 +584,29 @@
 	armadyne = TRUE
 
 /obj/item/ammo_box/magazine/multi_sprite/dozer
-	name = "dozer pdw magazine (10mm)"
+	name = "dozer pdw magazine (9mm)"
 	icon = 'modular_skyrat/modules/sec_haul/icons/guns/mags.dmi'
 	icon_state = "croon"
-	ammo_type = /obj/item/ammo_casing/b10mm
+	ammo_type = /obj/item/ammo_casing/b9mm
 	caliber = CALIBER_10MM
 	max_ammo = 8
 	multiple_sprites = AMMO_BOX_FULL_EMPTY_BASIC
 
 /obj/item/ammo_box/magazine/multi_sprite/dozer/hp
-	ammo_type = /obj/item/ammo_casing/b10mm/hp
+	ammo_type = /obj/item/ammo_casing/b9mm/hp
 	round_type = AMMO_TYPE_HOLLOWPOINT
 
 /obj/item/ammo_box/magazine/multi_sprite/dozer/ihdf
-	ammo_type = /obj/item/ammo_casing/b10mm/ihdf
+	ammo_type = /obj/item/ammo_casing/b9mm/ihdf
 	round_type = AMMO_TYPE_IHDF
 
 /obj/item/ammo_box/magazine/multi_sprite/dozer/rubber
-	ammo_type = /obj/item/ammo_casing/b10mm/rubber
+	ammo_type = /obj/item/ammo_casing/b9mm/rubber
 	round_type = AMMO_TYPE_RUBBER
 
 /////////////////////NORWIND
-/obj/item/gun/ballistic/automatic/norwind            //PRIMARY CHOICE #4
-	name = "\improper M112 'Norwind'"      
+/obj/item/gun/ballistic/automatic/norwind
+	name = "\improper M112 'Norwind'"
 	desc = "A rare M112 DMR rechambered to 12.7x30mm for peacekeeping work, it comes with a scope for medium-long range engagements. A bayonet lug is visible."
 	icon = 'modular_skyrat/modules/sec_haul/icons/guns/norwind.dmi'
 	righthand_file = 'modular_skyrat/modules/sec_haul/icons/guns/inhands/righthand.dmi'
@@ -655,7 +657,7 @@
 	ammo_type = /obj/item/ammo_casing/b12mm/rubber
 	round_type = AMMO_TYPE_RUBBER
 
-/obj/item/gun/ballistic/automatic/vintorez       //UNUSED
+/obj/item/gun/ballistic/automatic/vintorez
 	name = "\improper VKC 'Vintorez'"
 	desc = "The VKC Vintorez is a lightweight integrally-suppressed scoped carbine usually employed in stealth operations. It was rechambered to 9mm for peacekeeping work."
 	icon = 'modular_skyrat/modules/sec_haul/icons/guns/vintorez.dmi'
@@ -682,6 +684,7 @@
 	fire_sound = 'sound/weapons/gun/smg/shot_suppressed.ogg'
 	emp_damageable = TRUE
 	armadyne = TRUE
+
 /obj/item/ammo_box/magazine/multi_sprite/vintorez
 	name = "vintorez rifle magazine (9mm)"
 	icon = 'modular_skyrat/modules/sec_haul/icons/guns/mags.dmi'
@@ -704,7 +707,6 @@
 	round_type = AMMO_TYPE_RUBBER
 
 /////////////////DMR 40x32
-
 /obj/item/gun/ballistic/automatic/dmr
 	name = "\improper M557 'Ripper' Gen-2"
 	desc = "An incredibly powerful marksman rifle with an internal stabilization gymbal. It's chambered in .577 Snider."
@@ -737,7 +739,7 @@
 	multiple_sprites = AMMO_BOX_FULL_EMPTY_BASIC
 
 /////////////////////////////////////////////ZETA
-/obj/item/gun/ballistic/revolver/zeta                //SIDEARM CHOICE #2
+/obj/item/gun/ballistic/revolver/zeta
 	name = "\improper Zeta-6 'Spurchamber'"
 	desc = "A fairly common double-action six-shooter chambered for 10mm Peacekeeper."
 	icon = 'modular_skyrat/modules/sec_haul/icons/guns/zeta.dmi'
@@ -766,7 +768,7 @@
 	start_empty = TRUE
 
 /////////////////////////////////////////////////////////REVOLUTION
-/obj/item/gun/ballistic/revolver/revolution       //UNUSED
+/obj/item/gun/ballistic/revolver/revolution
 	name = "\improper Revolution-8 'Spurmaster'"
 	desc = "The Zeta 6's distant cousin, sporting an eight-round competition grade cylinder chambered for 9mm Peacekeeper."
 	icon = 'modular_skyrat/modules/sec_haul/icons/guns/revolution.dmi'
@@ -938,8 +940,8 @@
 
 /obj/item/ammo_box/magazine/internal/shot/m23
 	name = "m23 shotgun internal magazine"
-	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
-	max_ammo = 8
+	ammo_type = /obj/item/ammo_casing/s14gauge
+	max_ammo = 6
 
 /obj/item/gun/ballistic/shotgun/automatic/as2
 	name = "\improper M2 Autoshotgun"
@@ -964,8 +966,40 @@
 
 /obj/item/ammo_box/magazine/internal/shot/as2
 	name = "shotgun internal magazine"
-	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
-	max_ammo = 6
+	ammo_type = /obj/item/ammo_casing/s14gauge
+	max_ammo = 4
+
+/obj/item/gun/ballistic/shotgun/sas14
+	name = "\improper SAS14"
+	desc = "A revolving automatic shotgun with a six round box magazine."
+	icon =  'modular_skyrat/modules/sec_haul/icons/guns/sas14.dmi'
+	icon_state = "sas14"
+	inhand_icon_state = "shotgun"
+	worn_icon_state = "shotgun"
+	can_suppress = TRUE
+	suppressed_sound = 'modular_skyrat/modules/aesthetics/guns/sound/suppressed_shotgun.ogg'
+	suppressed_volume = 100
+	vary_fire_sound = TRUE
+	fire_sound = 'modular_skyrat/modules/sec_haul/sound/shotgun_bm.ogg'
+	fire_delay = 5
+	mag_type = /obj/item/ammo_box/magazine/sas14
+	w_class = WEIGHT_CLASS_BULKY
+	slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_OCLOTHING
+	weapon_weight = WEAPON_MEDIUM
+	burst_size = 1
+	fire_select_modes = list(SELECT_SEMI_AUTOMATIC)
+	semi_auto = FALSE
+	internal_magazine = FALSE
+	armadyne = TRUE
+
+/obj/item/ammo_box/magazine/sas14
+	name = "14 gauge box magazine"
+	icon = 'modular_skyrat/modules/sec_haul/icons/guns/mags.dmi'
+	icon_state = "sas14"
+	multiple_sprites = AMMO_BOX_FULL_EMPTY_BASIC
+	caliber = CALIBER_14GAUGE
+	ammo_type = /obj/item/ammo_casing/s14gauge
+	max_ammo = 5
 
 /obj/item/gun/energy/taser/armadyne
 	name = "\improper ATS Taser"
diff --git a/modular_skyrat/modules/sec_haul/code/guns/token_system/gunsets.dm b/modular_skyrat/modules/sec_haul/code/guns/token_system/gunsets.dm
index c39f2ba3e5d..6e5c4332371 100644
--- a/modular_skyrat/modules/sec_haul/code/guns/token_system/gunsets.dm
+++ b/modular_skyrat/modules/sec_haul/code/guns/token_system/gunsets.dm
@@ -51,6 +51,51 @@
 //SIDEARM TOKEN GUNSETS
 ////////////////
 
+//G-17
+/obj/item/storage/box/gunset/glock17
+	name = "glock-17 supply box"
+
+/obj/item/gun/ballistic/automatic/pistol/g17/nomag
+	spawnwithmagazine = FALSE
+
+
+/obj/item/storage/box/gunset/glock17/PopulateContents()
+	. = ..()
+	new /obj/item/gun/ballistic/automatic/pistol/g17/nomag(src)
+	new /obj/item/ammo_box/magazine/multi_sprite/g17(src)
+	new /obj/item/ammo_box/magazine/multi_sprite/g17(src)
+	new /obj/item/ammo_box/magazine/multi_sprite/g17(src)
+	new /obj/item/ammo_box/magazine/multi_sprite/g17(src)
+
+//LADON
+/obj/item/storage/box/gunset/ladon
+	name = "p-3 ladon supply box"
+
+/obj/item/gun/ballistic/automatic/pistol/ladon/nomag
+	spawnwithmagazine = FALSE
+
+/obj/item/storage/box/gunset/ladon/PopulateContents()
+	. = ..()
+	new /obj/item/gun/ballistic/automatic/pistol/ladon/nomag(src)
+	new /obj/item/ammo_box/magazine/multi_sprite/ladon(src)
+	new /obj/item/ammo_box/magazine/multi_sprite/ladon(src)
+	new /obj/item/ammo_box/magazine/multi_sprite/ladon(src)
+	new /obj/item/ammo_box/magazine/multi_sprite/ladon(src)
+
+//DOZER
+/obj/item/storage/box/gunset/dozer
+	name = "dozer supply box"
+
+/obj/item/gun/ballistic/automatic/dozer/nomag
+	spawnwithmagazine = FALSE
+
+/obj/item/storage/box/gunset/dozer/PopulateContents()
+	. = ..()
+	new /obj/item/gun/ballistic/automatic/dozer/nomag(src)
+	new /obj/item/ammo_box/magazine/multi_sprite/dozer(src)
+	new /obj/item/ammo_box/magazine/multi_sprite/dozer(src)
+	new /obj/item/ammo_box/magazine/multi_sprite/dozer(src)
+
 //PDH
 /obj/item/storage/box/gunset/pdh_peacekeeper
 	name = "9x19mm handgun supply box"
@@ -126,17 +171,18 @@
 	new /obj/item/ammo_box/revolver/zeta(src)
 	new /obj/item/ammo_box/revolver/zeta(src)
 	new /obj/item/ammo_box/advanced/b10mm(src)
-	
-//DISABLER
-/obj/item/storage/box/gunset/proplayer
-	name = "disabler supply box"
-	desc = "Ideally contains an energy-based disabler for those who know what to do with it."
 
-/obj/item/storage/box/gunset/proplayer/PopulateContents()
+//REVOLUTION
+/obj/item/storage/box/gunset/revolution
+	name = "revolution supply box"
+
+/obj/item/storage/box/gunset/revolution/PopulateContents()
 	. = ..()
-	new /obj/item/gun/energy/disabler(src)
-	new /obj/item/clothing/glasses/sunglasses/garb(src)  //Useless gimmick item for people who want to look like dickheads
-
+	new /obj/item/gun/ballistic/revolver/revolution(src)
+	new /obj/item/ammo_box/revolver/revolution(src)
+	new /obj/item/ammo_box/revolver/revolution(src)
+	new /obj/item/ammo_box/revolver/revolution(src)
+	new /obj/item/ammo_box/advanced/b9mm(src)
 
 /////////////////
 //PRIMARY TOKEN GUNSETS
@@ -240,10 +286,10 @@
 /obj/item/storage/box/gunset/glock18_hos/PopulateContents()
 	. = ..()
 	new /obj/item/gun/ballistic/automatic/pistol/g18/nomag(src)
-	new /obj/item/ammo_box/magazine/multi_sprite/g18/hp(src)
-	new /obj/item/ammo_box/magazine/multi_sprite/g18/hp(src)
-	new /obj/item/ammo_box/magazine/multi_sprite/g18/ihdf(src)
-	new /obj/item/ammo_box/magazine/multi_sprite/g18/ihdf(src)
+	new /obj/item/ammo_box/magazine/multi_sprite/g18(src)
+	new /obj/item/ammo_box/magazine/multi_sprite/g18(src)
+	new /obj/item/ammo_box/magazine/multi_sprite/g18(src)
+	new /obj/item/ammo_box/magazine/multi_sprite/g18(src)
 
 //HOP
 /obj/item/storage/box/gunset/pdh_hop
diff --git a/modular_skyrat/modules/sec_haul/code/guns/token_system/token_system.dm b/modular_skyrat/modules/sec_haul/code/guns/token_system/token_system.dm
index 2a0f0580988..2fb40b570ed 100644
--- a/modular_skyrat/modules/sec_haul/code/guns/token_system/token_system.dm
+++ b/modular_skyrat/modules/sec_haul/code/guns/token_system/token_system.dm
@@ -72,14 +72,26 @@
 		icon = 'modular_skyrat/modules/sec_haul/icons/guns/gunsets.dmi',
 		icon_state = "pdh_peacekeeper"
 		),
-	/obj/item/storage/box/gunset/proplayer= image(
-		icon = 'icons/obj/guns/energy.dmi',
-		icon_state = "disabler"
+	/obj/item/storage/box/gunset/glock17 = image(
+		icon = 'modular_skyrat/modules/sec_haul/icons/guns/gunsets.dmi',
+		icon_state = "g17"
+		),
+	/obj/item/storage/box/gunset/ladon = image(
+		icon = 'modular_skyrat/modules/sec_haul/icons/guns/gunsets.dmi',
+		icon_state = "ladon"
 		),
 	/obj/item/storage/box/gunset/zeta = image(
 		icon = 'modular_skyrat/modules/sec_haul/icons/guns/gunsets.dmi',
 		icon_state = "zeta"
-		)
+		),
+	/obj/item/storage/box/gunset/dozer = image(
+		icon = 'modular_skyrat/modules/sec_haul/icons/guns/gunsets.dmi',
+		icon_state = "dozer"
+		),
+	/obj/item/storage/box/gunset/revolution = image(
+		icon = 'modular_skyrat/modules/sec_haul/icons/guns/gunsets.dmi',
+		icon_state = "revolution"
+		),
 	)
 
 //BAD BOY!
diff --git a/modular_skyrat/modules/sec_haul/code/security_sergeant/security_sergeant.dm b/modular_skyrat/modules/sec_haul/code/security_sergeant/security_sergeant.dm
index c3a3c2a4add..580abf53272 100644
--- a/modular_skyrat/modules/sec_haul/code/security_sergeant/security_sergeant.dm
+++ b/modular_skyrat/modules/sec_haul/code/security_sergeant/security_sergeant.dm
@@ -41,7 +41,7 @@
 
 	suit_store = /obj/item/gun/energy/taser/armadyne //SKYRAT EDIT CHANGE - SEC_HAUL
 
-	backpack_contents = list(/obj/item/melee/classic_baton/telescopic, /obj/item/armament_token/sidearm, /obj/item/armament_token/primary)
+	backpack_contents = list(/obj/item/melee/classic_baton/telescopic)
 
 	backpack = /obj/item/storage/backpack/security/peacekeeper
 	satchel = /obj/item/storage/backpack/satchel/sec/peacekeeper
diff --git a/modular_skyrat/modules/sec_haul/icons/guns/mags.dmi b/modular_skyrat/modules/sec_haul/icons/guns/mags.dmi
index 6f8318b62d1..e46621fa195 100644
Binary files a/modular_skyrat/modules/sec_haul/icons/guns/mags.dmi and b/modular_skyrat/modules/sec_haul/icons/guns/mags.dmi differ
diff --git a/modular_skyrat/modules/sec_haul/icons/guns/sas14.dmi b/modular_skyrat/modules/sec_haul/icons/guns/sas14.dmi
new file mode 100644
index 00000000000..77452eaf7c1
Binary files /dev/null and b/modular_skyrat/modules/sec_haul/icons/guns/sas14.dmi differ
diff --git a/modular_skyrat/modules/sec_haul/icons/guns/spawner.dmi b/modular_skyrat/modules/sec_haul/icons/guns/spawner.dmi
new file mode 100644
index 00000000000..a5a06c490a7
Binary files /dev/null and b/modular_skyrat/modules/sec_haul/icons/guns/spawner.dmi differ
diff --git a/modular_skyrat/modules/sec_haul/sound/shotgun_bm.ogg b/modular_skyrat/modules/sec_haul/sound/shotgun_bm.ogg
new file mode 100644
index 00000000000..3ff5fff0a27
Binary files /dev/null and b/modular_skyrat/modules/sec_haul/sound/shotgun_bm.ogg differ
diff --git a/tgstation.dme b/tgstation.dme
index b108dd84e26..d3429726058 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -4424,6 +4424,7 @@
 #include "modular_skyrat\modules\rod-stopper\code\rodstopper.dm"
 #include "modular_skyrat\modules\sec_haul\code\guns\ammo.dm"
 #include "modular_skyrat\modules\sec_haul\code\guns\bullets.dm"
+#include "modular_skyrat\modules\sec_haul\code\guns\gun_spawns.dm"
 #include "modular_skyrat\modules\sec_haul\code\guns\guns.dm"
 #include "modular_skyrat\modules\sec_haul\code\guns\token_system\gunsets.dm"
 #include "modular_skyrat\modules\sec_haul\code\guns\token_system\token_system.dm"