357box (#17186)

code/modules/projectiles/boxes_magazines/ammo_boxes.dm

@@ -6,6 +6,13 @@
 	max_ammo = 7
 	multiple_sprites = AMMO_BOX_PER_BULLET
 
+// Cannot be directly loaded into guns with internal magazines, but can load magazines/cylinders
+/obj/item/ammo_box/no_direct/a357
+	name = "ammo box (.357)"
+	icon_state = "357box"
+	ammo_type = /obj/item/ammo_casing/a357
+	max_ammo = 20
+
 /obj/item/ammo_box/a357/ironfeather
 	name = "speed loader (.357 Ironfeather)"
 	desc = "A seven-shot speed loader designed for .357 revolvers. \

code/modules/projectiles/guns/ballistic.dm

@@ -354,7 +354,7 @@
 			else
 				to_chat(user, span_notice("There's already a [magazine_wording] in \the [src]."))
 		return
-	if (istype(A, /obj/item/ammo_casing) || istype(A, /obj/item/ammo_box))
+	if ((istype(A, /obj/item/ammo_casing) || istype(A, /obj/item/ammo_box)) && !istype(A, /obj/item/ammo_box/no_direct))
 		if (bolt_type == BOLT_TYPE_NO_BOLT || internal_magazine)
 			if (chambered && !chambered.BB)
 				chambered.forceMove(drop_location())

code/modules/research/designs/autolathe_designs.dm

@@ -916,7 +916,7 @@
 	name = ".357 Bullet"
 	id = "a357"
 	build_type = AUTOLATHE
-	materials = list(/datum/material/iron = 4000)
+	materials = list(/datum/material/iron = 2000)
 	build_path = /obj/item/ammo_casing/a357
 	category = list("hacked", "Security")
 
@@ -944,6 +944,14 @@
 	build_path = /obj/item/ammo_box/c9mm
 	category = list("hacked", "Security")
 
+/datum/design/box_a357
+	name = "Ammo Box (.357)"
+	id = "box_a357"
+	build_type = AUTOLATHE
+	materials = list(/datum/material/iron = 40000)
+	build_path = /obj/item/ammo_box/no_direct/a357
+	category = list("hacked", "Security")
+
 /datum/design/cleaver
 	name = "Butcher's Cleaver"
 	id = "cleaver"