diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/_premade_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/_premade_stacks.dm
index 635ae96faf38..0ebc20b3a5ef 100644
--- a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/_premade_stacks.dm
+++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/_premade_stacks.dm
@@ -12,6 +12,7 @@
 
 /obj/item/storage/box/ammo //base type, don't use this!
 	name = "box of default ammo"
+	icon = 'icons/obj/ammunition/ammo_boxes.dmi'
 	icon_state = "9mmbox"
 	illustration = null
 	foldable = null
diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_smg_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_smg_stacks.dm
index 041c4ac00c2c..9bf8a48bff52 100644
--- a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_smg_stacks.dm
+++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_smg_stacks.dm
@@ -10,20 +10,20 @@
 
 // 4.73x33mm caseless (Solar)
 /obj/item/ammo_box/magazine/ammo_stack/prefilled/c47x33mm
-	ammo_type = /obj/item/ammo_casing/c47x33mm
+	ammo_type = /obj/item/ammo_casing/caseless/c47x33mm
 
 // 5.56mm HITP caseless (Pistole C)
 /obj/item/ammo_box/magazine/ammo_stack/prefilled/c556mm
-	ammo_type = /obj/item/ammo_casing/c556mm
+	ammo_type = /obj/item/ammo_casing/caseless/c556mm
 
 /obj/item/ammo_box/magazine/ammo_stack/prefilled/c556mm/surplus
-	ammo_type = /obj/item/ammo_casing/c556mm/surplus
+	ammo_type = /obj/item/ammo_casing/caseless/c556mm/surplus
 
 /obj/item/ammo_box/magazine/ammo_stack/prefilled/c556mm/ap
-	ammo_type = /obj/item/ammo_casing/c556mm/ap
+	ammo_type = /obj/item/ammo_casing/caseless/c556mm/ap
 
 /obj/item/ammo_box/magazine/ammo_stack/prefilled/c556mm/hp
-	ammo_type = /obj/item/ammo_casing/c556mm/hp
+	ammo_type = /obj/item/ammo_casing/caseless/c556mm/hp
 
 /obj/item/ammo_box/magazine/ammo_stack/prefilled/c556mm/rubbershot
-	ammo_type = /obj/item/ammo_casing/c556mm/rubbershot
+	ammo_type = /obj/item/ammo_casing/caseless/c556mm/rubbershot
diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm
index 3dfb8f625c0d..1930e17de897 100644
--- a/code/modules/vending/security.dm
+++ b/code/modules/vending/security.dm
@@ -12,8 +12,6 @@
 		/obj/item/assembly/flash/handheld = 5,
 		/obj/item/storage/box/evidence = 6,
 		/obj/item/flashlight/seclite = 4,
-		/obj/item/storage/box/ammo/9mm/rubber = 3,
-		/obj/item/storage/box/ammo/9mm = 1,
 		/obj/item/stock_parts/cell/gun = 3,
 		/obj/item/clothing/glasses/sunglasses = 2)
 	premium = list(
diff --git a/shiptest.dme b/shiptest.dme
index 24cabf11110b..ca55661e5662 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -3022,14 +3022,8 @@
 #include "code\modules\projectiles\ammunition\special\syringe.dm"
 #include "code\modules\projectiles\boxes_magazines\_box_magazine.dm"
 #include "code\modules\projectiles\boxes_magazines\ammo_boxes.dm"
+#include "code\modules\projectiles\boxes_magazines\ammo_stack.dm"
 #include "code\modules\projectiles\boxes_magazines\generic_ammo_box.dm"
-#include "code\modules\projectiles\boxes_magazines\ammo_stacks\_ammo_stack.dm"
-#include "code\modules\projectiles\boxes_magazines\ammo_stacks\prefab_stacks\_premade_stacks.dm"
-#include "code\modules\projectiles\boxes_magazines\ammo_stacks\prefab_stacks\premade_lmg_stacks.dm"
-#include "code\modules\projectiles\boxes_magazines\ammo_stacks\prefab_stacks\premade_pistol_stacks.dm"
-#include "code\modules\projectiles\boxes_magazines\ammo_stacks\prefab_stacks\premade_rifle_stacks.dm"
-#include "code\modules\projectiles\boxes_magazines\ammo_stacks\prefab_stacks\premade_smg_stacks.dm"
-#include "code\modules\projectiles\boxes_magazines\ammo_stacks\prefab_stacks\shotshell_stacks.dm"
 #include "code\modules\projectiles\boxes_magazines\external\gauss.dm"
 #include "code\modules\projectiles\boxes_magazines\external\grenade.dm"
 #include "code\modules\projectiles\boxes_magazines\external\lmg.dm"