From a59960f91f35312dc4ee8f37256264900a62b3d1 Mon Sep 17 00:00:00 2001 From: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Date: Sun, 17 Jul 2022 11:06:55 +1000 Subject: [PATCH] Fixes speedloaders and stripper clips only being able to load their initial ammo subtype, and not their matching caliber as intended. (#68394) Allows speedloaders for the .357 and .38 to load any matching caliber. Allows stripper clips for 7.62 to do the same. --- code/modules/projectiles/boxes_magazines/ammo_boxes.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index 8ffa5b51a7a..c41ddb9fa1a 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -4,6 +4,7 @@ icon_state = "357" ammo_type = /obj/item/ammo_casing/a357 max_ammo = 7 + caliber = CALIBER_357 multiple_sprites = AMMO_BOX_PER_BULLET item_flags = NO_MAT_REDEMPTION @@ -18,6 +19,7 @@ icon_state = "38" ammo_type = /obj/item/ammo_casing/c38 max_ammo = 6 + caliber = CALIBER_38 multiple_sprites = AMMO_BOX_PER_BULLET custom_materials = list(/datum/material/iron = 20000) @@ -82,6 +84,7 @@ icon_state = "762" ammo_type = /obj/item/ammo_casing/a762 max_ammo = 5 + caliber = CALIBER_A762 multiple_sprites = AMMO_BOX_PER_BULLET /obj/item/ammo_box/n762