diff --git a/code/game/objects/items/storage/ammo_can.dm b/code/game/objects/items/storage/ammo_can.dm
index b25a80b410c8..db0f12fc1284 100644
--- a/code/game/objects/items/storage/ammo_can.dm
+++ b/code/game/objects/items/storage/ammo_can.dm
@@ -1,5 +1,5 @@
 //No idea why this is a toolbox but I'm not fixing that right now
-/obj/item/storage/toolbox/ammo
+/obj/item/storage/ammo_can
 	name = "ammo can"
 	desc = "A metal container for storing multiple boxes of ammunition or grenades."
 	icon_state = "ammobox"
@@ -7,52 +7,63 @@
 	drop_sound = 'sound/items/handling/ammobox_drop.ogg'
 	pickup_sound =  'sound/items/handling/ammobox_pickup.ogg'
 	material_flags = NONE
-	has_latches = FALSE
+	drop_sound = 'sound/items/handling/toolbox_drop.ogg'
+	pickup_sound =  'sound/items/handling/toolbox_pickup.ogg'
 	w_class = WEIGHT_CLASS_BULKY
 
-/obj/item/storage/toolbox/ammo/ComponentInitialize()
+/obj/item/storage/ammo_can/ComponentInitialize()
 	. = ..()
 	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
 	STR.max_volume = STORAGE_VOLUME_BACKPACK
 	STR.max_w_class = MAX_WEIGHT_CLASS_BACKPACK
+	STR.set_holdable(list(
+		/obj/item/storage/box/ammo,
+		/obj/item/mine,
+		/obj/item/grenade,
+		/obj/item/ammo_casing/caseless/rocket,
+		/obj/item/ammo_box/magazine/ammo_stack,
+		/obj/item/ammo_casing,
+		/obj/item/mine,
+		/obj/item/grenade
+		))
 
-/obj/item/storage/toolbox/ammo/a850r/PopulateContents()
+/obj/item/storage/ammo_can/a850r/PopulateContents()
 	name = "ammo can (8x50mmR)"
 	icon_state = "ammobox_850"
 	for(var/i in 1 to 4)
 		new /obj/item/storage/box/ammo/a8_50r(src)
 
-/obj/item/storage/toolbox/ammo/a762_40/PopulateContents()
+/obj/item/storage/ammo_can/a762_40/PopulateContents()
 	name = "ammo can (7.62x40mm CLIP)"
 	icon_state = "ammobox_762"
 	for (var/i in 1 to 4)
 		new /obj/item/storage/box/ammo/a762_40(src)
 
-/obj/item/storage/toolbox/ammo/a308/PopulateContents()
+/obj/item/storage/ammo_can/a308/PopulateContents()
 	name = "ammo can (.308)"
 	icon_state = "ammobox_308"
 	for (var/i in 1 to 4)
 		new /obj/item/storage/box/ammo/a308(src)
 
-/obj/item/storage/toolbox/ammo/c45/PopulateContents()
+/obj/item/storage/ammo_can/c45/PopulateContents()
 	name = "ammo can (.45)"
 	icon_state = "ammobox_45"
 	for (var/i in 1 to 4)
 		new /obj/item/storage/box/ammo/c45(src)
 
-/obj/item/storage/toolbox/ammo/c9mm/PopulateContents()
+/obj/item/storage/ammo_can/c9mm/PopulateContents()
 	name = "ammo can (9mm)"
 	icon_state = "ammobox_9mm"
 	for (var/i in 1 to 4)
 		new /obj/item/storage/box/ammo/c9mm(src)
 
-/obj/item/storage/toolbox/ammo/c10mm/PopulateContents()
+/obj/item/storage/ammo_can/c10mm/PopulateContents()
 	name = "ammo can (10mm)"
 	icon_state = "ammobox_10mm"
 	for (var/i in 1 to 4)
 		new /obj/item/storage/box/ammo/c10mm(src)
 
-/obj/item/storage/toolbox/ammo/shotgun/PopulateContents()
+/obj/item/storage/ammo_can/shotgun/PopulateContents()
 	name = "ammo can (12ga)"
 	icon_state = "ammobox_12ga"
 	for (var/i in 1 to 4)
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 5ac2370dc694..bf52b809c9db 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -857,7 +857,7 @@
 	id = "ammo-can"
 	build_type = AUTOLATHE | PROTOLATHE
 	materials = list(/datum/material/iron = 500)
-	build_path = /obj/item/storage/toolbox/ammo
+	build_path = /obj/item/storage/ammo_can
 	category = list("initial", "Security", "Ammo")
 
 /datum/design/cleaver