From 8191e9f1fe76a32137575b2c0764545c8558f314 Mon Sep 17 00:00:00 2001 From: firebudgy <153147550+firebudgy@users.noreply.github.com> Date: Sat, 11 Jan 2025 15:46:20 -0800 Subject: [PATCH 1/3] initial commit --- code/modules/cargo/packs/ammo.dm | 6 +++--- .../ammo_stacks/prefab_stacks/premade_pistol_stacks.dm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm index d3b87bb2aed9..3f4abd95c860 100644 --- a/code/modules/cargo/packs/ammo.dm +++ b/code/modules/cargo/packs/ammo.dm @@ -246,15 +246,15 @@ /datum/supply_pack/ammo/a4570_box name = ".45-70 Ammo Box Crate" - desc = "Contains a 20-round box containing devastatingly powerful .45-70 caliber ammunition." + desc = "Contains a 24-round box containing devastatingly powerful .45-70 caliber ammunition." contains = list(/obj/item/storage/box/ammo/a4570) cost = 400 /datum/supply_pack/ammo/a4570_box/match name = ".45-70 Match Crate" - desc = "Contains a 20-round box containing devastatingly powerful .45-70 caliber ammunition, that travels faster, pierces armour better, and ricochets off targets." + desc = "Contains a 24-round box containing devastatingly powerful .45-70 caliber ammunition, that travels faster, pierces armour better, and ricochets off targets." contains = list(/obj/item/storage/box/ammo/a4570_match) - cost = 800 + cost = 600 /* 7.62 */ diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm index 5a783652a7e3..2f1c9cf07659 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm @@ -323,7 +323,7 @@ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a4570 ammo_type = /obj/item/ammo_casing/a4570 - max_ammo = 5 + max_ammo = 6 /obj/item/storage/box/ammo/a4570 name = "box of .45-70 ammo" From 8ed69dd92a83270e4227d7c4d548a514f8a7cbf0 Mon Sep 17 00:00:00 2001 From: firebudgy <153147550+firebudgy@users.noreply.github.com> Date: Sat, 11 Jan 2025 15:51:33 -0800 Subject: [PATCH 2/3] undo --- code/modules/cargo/packs/ammo.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm index 3f4abd95c860..2e3913802a07 100644 --- a/code/modules/cargo/packs/ammo.dm +++ b/code/modules/cargo/packs/ammo.dm @@ -254,7 +254,7 @@ name = ".45-70 Match Crate" desc = "Contains a 24-round box containing devastatingly powerful .45-70 caliber ammunition, that travels faster, pierces armour better, and ricochets off targets." contains = list(/obj/item/storage/box/ammo/a4570_match) - cost = 600 + cost = 800 /* 7.62 */ From 893ccff2ceb0dabe0cacc1bcbe30c5324119de91 Mon Sep 17 00:00:00 2001 From: firebudgy <153147550+firebudgy@users.noreply.github.com> Date: Sat, 11 Jan 2025 15:59:54 -0800 Subject: [PATCH 3/3] nevermind --- code/modules/cargo/packs/ammo.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm index 2e3913802a07..077d5f49a683 100644 --- a/code/modules/cargo/packs/ammo.dm +++ b/code/modules/cargo/packs/ammo.dm @@ -248,13 +248,13 @@ name = ".45-70 Ammo Box Crate" desc = "Contains a 24-round box containing devastatingly powerful .45-70 caliber ammunition." contains = list(/obj/item/storage/box/ammo/a4570) - cost = 400 + cost = 300 /datum/supply_pack/ammo/a4570_box/match name = ".45-70 Match Crate" desc = "Contains a 24-round box containing devastatingly powerful .45-70 caliber ammunition, that travels faster, pierces armour better, and ricochets off targets." contains = list(/obj/item/storage/box/ammo/a4570_match) - cost = 800 + cost = 400 /* 7.62 */