From d423caf954547b177ad9557b2fe561d1b994a083 Mon Sep 17 00:00:00 2001 From: Apogee-dev <60533805+Apogee-dev@users.noreply.github.com> Date: Sun, 26 Jan 2025 14:45:23 -0800 Subject: [PATCH] Adjusts shotgun tube size (#4089) ## About The Pull Request Adjusts magazine size for tube-fed shotguns. - Hellfire is the largest of the batch at 8 in the tube plus one in the chamber - Buckmaster has been nerfed to 6 in the tube - Brimstone and Conflagration remain the same at 4 and 5 respectively ## Why It's Good For The Game Hellfire really got left behind after the introduction of the Buckmaster. This update makes the Hellfire a bit better than it ever was, and makes the buckmaster slightly less best-in-class while still being plenty potent. ## Changelog :cl: balance: Nerfed Buckmaster tube size, buffed Hellfire tube /:cl: --- code/modules/cargo/packs/gun.dm | 4 ++-- code/modules/projectiles/boxes_magazines/internal/shotgun.dm | 2 +- .../projectiles/guns/manufacturer/hunter_pride/ballistics.dm | 4 ++-- .../guns/manufacturer/serene_sporting/ballistics.dm | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm index 7131eca5b7e4..cd630bac68c6 100644 --- a/code/modules/cargo/packs/gun.dm +++ b/code/modules/cargo/packs/gun.dm @@ -290,7 +290,7 @@ /datum/supply_pack/gun/hellfire_shotgun name = "Hellfire Shotgun Crate" - desc = "For when you need to deal with 8 hooligans. Contains a pump shotgun, with a 8-round capacity." + desc = "For when you need to deal with a riot's worth of hooligans. Contains a pump shotgun, with a 9-round capacity." cost = 2000 contains = list(/obj/item/storage/guncase/hellfire) crate_name = "shotgun crate" @@ -306,7 +306,7 @@ /datum/supply_pack/gun/buckmaster name = "Buckmaster Shotgun Crate" - desc = "For when you need to deal with 8 hooligans and can't be arsed to pump. Contains a semi-auto shotgun with an 8 round tube." + desc = "For when you need to deal with 7 hooligans and can't be arsed to pump. Contains a semi-auto shotgun with a 7-round capacity." contains = list(/obj/item/storage/guncase/buckmaster) cost = 3000 crate_name = "shotgun crate" diff --git a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm index d0365b09223a..5fb5a594d452 100644 --- a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm +++ b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm @@ -29,7 +29,7 @@ /obj/item/ammo_box/magazine/internal/shot/riot name = "riot shotgun internal magazine" ammo_type = /obj/item/ammo_casing/shotgun/buckshot - max_ammo = 7 + max_ammo = 8 /obj/item/ammo_box/magazine/internal/shot/bounty name = "triple-barrel shotgun internal magazine" diff --git a/code/modules/projectiles/guns/manufacturer/hunter_pride/ballistics.dm b/code/modules/projectiles/guns/manufacturer/hunter_pride/ballistics.dm index c71564052a8c..f391f835032b 100644 --- a/code/modules/projectiles/guns/manufacturer/hunter_pride/ballistics.dm +++ b/code/modules/projectiles/guns/manufacturer/hunter_pride/ballistics.dm @@ -484,7 +484,7 @@ EMPTY_GUN_HELPER(shotgun/brimstone) /obj/item/gun/ballistic/shotgun/hellfire name = "HP Hellfire" - desc = "A hefty pump-action riot shotgun with a seven-round tube, manufactured by Hunter's Pride. Especially popular among the Frontier's police forces. Chambered in 12g." + desc = "A hefty pump-action riot shotgun with an eight-round tube, manufactured by Hunter's Pride. Especially popular among the Frontier's police forces. Chambered in 12g." icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi' lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi' righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi' @@ -505,7 +505,7 @@ EMPTY_GUN_HELPER(shotgun/brimstone) . = ..() if(.) var/obj/item/ammo_box/magazine/internal/tube = magazine - tube.max_ammo = 5 //this makes the gun so much worse + tube.max_ammo = 5 //this makes it so much worse weapon_weight = WEAPON_MEDIUM wield_slowdown = wield_slowdown-0.1 diff --git a/code/modules/projectiles/guns/manufacturer/serene_sporting/ballistics.dm b/code/modules/projectiles/guns/manufacturer/serene_sporting/ballistics.dm index 0bebb8ffcb4e..8f26b01bb7cb 100644 --- a/code/modules/projectiles/guns/manufacturer/serene_sporting/ballistics.dm +++ b/code/modules/projectiles/guns/manufacturer/serene_sporting/ballistics.dm @@ -339,7 +339,7 @@ EMPTY_GUN_HELPER(automatic/m15) /obj/item/ammo_box/magazine/internal/shot/buckmaster name = "Buckmaster internal magazine" ammo_type = /obj/item/ammo_casing/shotgun/buckshot - max_ammo = 8 + max_ammo = 6 EMPTY_GUN_HELPER(shotgun/automatic/m11)