Skip to content

Makes the beacon have two shots #4851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 3, 2025
Merged

Makes the beacon have two shots #4851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8168c4d
beacon two barrel
generalthrax May 20, 2025
351f12b
burst firemode was a mistake
generalthrax May 20, 2025
da6dc15
desc
generalthrax May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions code/modules/cargo/packs/weapon_attachments.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,6 @@
faction_discount = 0
faction_locked = TRUE

/datum/supply_pack/attachment/alof
name = "Alof Tube Crate"
desc = "Contains an antiquated spring operated magazine attachment for the HP Beacon. Has a capacity of three rounds."
cost = 1000
contains = list(/obj/item/attachment/alof)
crate_name = "alof crate"
faction = /datum/faction/srm
faction_discount = 10

/datum/supply_pack/attachment/silencer
name = "Suppressor Crate"
desc = "Contains a single suppressor to be mounted on a firearm."
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/boxes_magazines/internal/shotgun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
name = "beacon internal magazine"
ammo_type = /obj/item/ammo_casing/a4570
caliber = ".45-70"
max_ammo = 1
max_ammo = 2
multiload = FALSE

/obj/item/ammo_box/magazine/internal/shot/underbarrel
Expand Down
10 changes: 5 additions & 5 deletions code/modules/projectiles/guns/manufacturer/hunter_pride/ballistics.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,8 +969,8 @@ EMPTY_GUN_HELPER(shotgun/flamingarrow)
//Break-Action Rifle
/obj/item/gun/ballistic/shotgun/doublebarrel/beacon
name = "HP Beacon"
desc = "A single-shot break-action rifle made by Hunter's Pride and sold to civilian hunters. Boasts excellent accuracy and stopping power. Uses .45-70 ammo."
sawn_desc= "A single-shot break-action pistol chambered in .45-70. A bit difficult to aim."
desc = "A break-action rifle made by Hunter's Pride and sold to civilian hunters. Boasts excellent accuracy and stopping power. Uses .45-70 ammo."
sawn_desc= "A break-action pistol chambered in .45-70. A bit difficult to aim."
base_icon_state = "beacon"
icon_state = "beacon"
item_state = "beacon"
Expand Down Expand Up @@ -1040,8 +1040,8 @@ EMPTY_GUN_HELPER(shotgun/flamingarrow)
EMPTY_GUN_HELPER(shotgun/doublebarrel/beacon)

/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/factory
desc = "A single-shot break-action rifle made by Hunter's Pride and sold to civilian hunters. This example has been kept in excellent shape and may as well be fresh out of the workshop. Uses .45-70 ammo."
sawn_desc= "A single-shot break-action pistol chambered in .45-70. A bit difficult to aim."
desc = "A break-action rifle made by Hunter's Pride and sold to civilian hunters. This example has been kept in excellent shape and may as well be fresh out of the workshop. Uses .45-70 ammo."
sawn_desc= "A break-action pistol chambered in .45-70. A bit difficult to aim."
base_icon_state = "beacon_factory"
icon_state = "beacon_factory"
item_state = "beacon_factory"
Expand All @@ -1055,7 +1055,7 @@ EMPTY_GUN_HELPER(shotgun/doublebarrel/beacon)
//pre sawn off beacon
/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/presawn
name = "HP Beacon"
sawn_desc= "A single-shot break-action pistol chambered in .45-70. A bit difficult to aim."
sawn_desc= "A break-action pistol chambered in .45-70. A bit difficult to aim."
sawn_off = TRUE
w_class = WEIGHT_CLASS_NORMAL
slot_flags = ITEM_SLOT_BELT
Expand Down
Loading