Skip to content

Commit

Permalink
Adjusts shotgun tube size (#4089)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## 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:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Apogee-dev authored Jan 26, 2025
1 parent bcc6802 commit d423caf
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions code/modules/cargo/packs/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit d423caf

Please sign in to comment.