diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
index 38e1b7f34fe..dbf2a39fe65 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
@@ -51,6 +51,6 @@
 	name = "anti-materiel weapons platform cabinet"
 
 /obj/structure/closet/secure_closet/guncabinet/peac/fill()
-	new /obj/item/gun/projectile/peac(src)
-	for(var/i = 1 to 3)
+	new /obj/item/gun/projectile/peac/unloaded(src)
+	for(var/i = 1 to 4)
 		new /obj/item/ammo_casing/peac(src)
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 91623d2e96d..8cfb5b30233 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -136,6 +136,9 @@
 	suppressor_x_offset = 10
 	suppressor_y_offset = -1
 
+/obj/item/gun/projectile/automatic/wt550/unloaded
+	magazine_type = null
+
 /obj/item/gun/projectile/automatic/wt550/lethal
 	magazine_type = /obj/item/ammo_magazine/mc9mmt
 
@@ -434,6 +437,9 @@
 		list(mode_name="2-round bursts", burst=2, burst_accuracy=list(1, 1))
 	)
 
+/obj/item/gun/projectile/automatic/rifle/jingya/unloaded
+	magazine_type = null
+
 /obj/item/gun/projectile/automatic/rifle/jingya/update_icon()
 	..()
 	if(ammo_magazine)
diff --git a/code/modules/projectiles/guns/projectile/cannon.dm b/code/modules/projectiles/guns/projectile/cannon.dm
index f2809ac8bd1..c3fa530d366 100644
--- a/code/modules/projectiles/guns/projectile/cannon.dm
+++ b/code/modules/projectiles/guns/projectile/cannon.dm
@@ -148,3 +148,6 @@
 		to_chat(user, SPAN_WARNING("You can't fire without stabilizing \the [src]!"))
 		return 0
 	return ..()
+
+/obj/item/gun/projectile/peac/unloaded
+	ammo_type = null
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 20012905d24..8ef3ee34965 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -113,6 +113,9 @@
 	else
 		icon_state = "secgun-e"
 
+/obj/item/gun/projectile/sec/unloaded
+	magazine_type = null
+
 /obj/item/gun/projectile/sec/lethal
 	magazine_type = /obj/item/ammo_magazine/c45m
 
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index d92774ba305..f2d50aa4e66 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -111,6 +111,9 @@
 		loaded -= AC //Remove casing from loaded list.
 		chambered = AC
 
+/obj/item/gun/projectile/shotgun/pump/unloaded
+	ammo_type = null
+
 /obj/item/gun/projectile/shotgun/pump/combat
 	name = "combat shotgun"
 	desc = "Built for close quarters combat, the Hephaestus Industries KS-40 is widely regarded as a weapon of choice for repelling boarders."
diff --git a/html/changelogs/geeves-armory_soul.yml b/html/changelogs/geeves-armory_soul.yml
new file mode 100644
index 00000000000..72af9b08c31
--- /dev/null
+++ b/html/changelogs/geeves-armory_soul.yml
@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - rscadd: "All the ballistic weapons in the armory now start unloaded. Magazines and rounds that would've spawned in the weapon now spawns in the ammo lockers. In effect, two beanbags shells have been added to the armory."
diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm
index e53807561c1..546b493813a 100644
--- a/maps/sccv_horizon/sccv_horizon.dmm
+++ b/maps/sccv_horizon/sccv_horizon.dmm
@@ -16008,6 +16008,8 @@
 /obj/item/ammo_magazine/mc9mmt,
 /obj/item/ammo_magazine/mc9mmt,
 /obj/item/ammo_magazine/mc9mmt,
+/obj/item/ammo_casing/a556,
+/obj/item/ammo_casing/a556,
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/security/armoury)
 "ckj" = (
@@ -54244,8 +54246,6 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/outpost/mining_main/eva)
 "hPu" = (
-/obj/item/gun/projectile/automatic/rifle/jingya,
-/obj/item/gun/projectile/automatic/rifle/jingya,
 /obj/effect/floor_decal/corner_wide/paleblue{
 	dir = 10
 	},
@@ -54254,6 +54254,8 @@
 	name = "Ballistics Rack"
 	},
 /obj/effect/floor_decal/industrial/outline/red,
+/obj/item/gun/projectile/automatic/rifle/jingya/unloaded,
+/obj/item/gun/projectile/automatic/rifle/jingya/unloaded,
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/security/armoury)
 "hPx" = (
@@ -73530,8 +73532,6 @@
 /turf/simulated/floor/carpet,
 /area/crew_quarters/captain)
 "kDT" = (
-/obj/item/gun/projectile/shotgun/pump,
-/obj/item/gun/projectile/shotgun/pump,
 /obj/effect/floor_decal/corner_wide/paleblue{
 	dir = 10
 	},
@@ -73540,6 +73540,8 @@
 	name = "Shotguns Rack"
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
+/obj/item/gun/projectile/shotgun/pump/unloaded,
+/obj/item/gun/projectile/shotgun/pump/unloaded,
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/security/armoury)
 "kDU" = (
@@ -123896,9 +123898,9 @@
 	req_one_access = list(3);
 	name = "Small Arms Rack"
 	},
-/obj/item/gun/projectile/automatic/wt550,
-/obj/item/gun/projectile/automatic/wt550,
 /obj/effect/floor_decal/industrial/outline/yellow,
+/obj/item/gun/projectile/automatic/wt550/unloaded,
+/obj/item/gun/projectile/automatic/wt550/unloaded,
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/security/armoury)
 "sbH" = (
@@ -132526,11 +132528,11 @@
 /obj/structure/closet/secure_closet/guncabinet{
 	name = "Pistols"
 	},
-/obj/item/gun/projectile/sec,
-/obj/item/gun/projectile/sec,
-/obj/item/gun/projectile/sec,
-/obj/item/gun/projectile/sec,
 /obj/effect/floor_decal/industrial/outline/yellow,
+/obj/item/gun/projectile/sec/unloaded,
+/obj/item/gun/projectile/sec/unloaded,
+/obj/item/gun/projectile/sec/unloaded,
+/obj/item/gun/projectile/sec/unloaded,
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/security/armoury)
 "tsn" = (
@@ -144605,6 +144607,14 @@
 	pixel_y = 4
 	},
 /obj/item/storage/box/stunshells,
+/obj/item/storage/box/beanbags,
+/obj/item/storage/box/beanbags,
+/obj/item/ammo_magazine/mc9mmt/rubber,
+/obj/item/ammo_magazine/mc9mmt/rubber,
+/obj/item/ammo_magazine/c45m/rubber,
+/obj/item/ammo_magazine/c45m/rubber,
+/obj/item/ammo_magazine/c45m/rubber,
+/obj/item/ammo_magazine/c45m/rubber,
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/security/armoury)
 "vdh" = (