Skip to content

Commit ec01128

Browse files
authored
Makes the beacon have two shots (#4851)
## About The Pull Request makes the beacon able to shoot two rounds. removes the alof tube from cargo ## Why It's Good For The Game beacon is kind of a sad weapon and i remember there being talk of redesigning this thing to be two shots. no sprite update in this pr (perspective makes it believable, for now at least) alofs would make this too jank so its out of cargo. likely be better for the improv shotgun if that shitty thing ever gets a touchup wanted to throw some other stuff in like .45-70 tweaks for better goliath crunching or adding the burst firemode but it was either out of scope or too broken (burst made it so there was no reason to ever use the single shot) ## Changelog :cl: del: Removed alofs tube from cargo balance: Beacon now can fire two rounds. Sprite unchanged /:cl:
1 parent 9dff0f4 commit ec01128

File tree

3 files changed

+6
-15
lines changed

3 files changed

+6
-15
lines changed

code/modules/cargo/packs/weapon_attachments.dm

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,6 @@
3838
faction_discount = 0
3939
faction_locked = TRUE
4040

41-
/datum/supply_pack/attachment/alof
42-
name = "Alof Tube Crate"
43-
desc = "Contains an antiquated spring operated magazine attachment for the HP Beacon. Has a capacity of three rounds."
44-
cost = 1000
45-
contains = list(/obj/item/attachment/alof)
46-
crate_name = "alof crate"
47-
faction = /datum/faction/srm
48-
faction_discount = 10
49-
5041
/datum/supply_pack/attachment/silencer
5142
name = "Suppressor Crate"
5243
desc = "Contains a single suppressor to be mounted on a firearm."

code/modules/projectiles/boxes_magazines/internal/shotgun.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
name = "beacon internal magazine"
5959
ammo_type = /obj/item/ammo_casing/a4570
6060
caliber = ".45-70"
61-
max_ammo = 1
61+
max_ammo = 2
6262
multiload = FALSE
6363

6464
/obj/item/ammo_box/magazine/internal/shot/underbarrel

code/modules/projectiles/guns/manufacturer/hunter_pride/ballistics.dm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -969,8 +969,8 @@ EMPTY_GUN_HELPER(shotgun/flamingarrow)
969969
//Break-Action Rifle
970970
/obj/item/gun/ballistic/shotgun/doublebarrel/beacon
971971
name = "HP Beacon"
972-
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."
973-
sawn_desc= "A single-shot break-action pistol chambered in .45-70. A bit difficult to aim."
972+
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."
973+
sawn_desc= "A break-action pistol chambered in .45-70. A bit difficult to aim."
974974
base_icon_state = "beacon"
975975
icon_state = "beacon"
976976
item_state = "beacon"
@@ -1040,8 +1040,8 @@ EMPTY_GUN_HELPER(shotgun/flamingarrow)
10401040
EMPTY_GUN_HELPER(shotgun/doublebarrel/beacon)
10411041

10421042
/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/factory
1043-
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."
1044-
sawn_desc= "A single-shot break-action pistol chambered in .45-70. A bit difficult to aim."
1043+
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."
1044+
sawn_desc= "A break-action pistol chambered in .45-70. A bit difficult to aim."
10451045
base_icon_state = "beacon_factory"
10461046
icon_state = "beacon_factory"
10471047
item_state = "beacon_factory"
@@ -1055,7 +1055,7 @@ EMPTY_GUN_HELPER(shotgun/doublebarrel/beacon)
10551055
//pre sawn off beacon
10561056
/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/presawn
10571057
name = "HP Beacon"
1058-
sawn_desc= "A single-shot break-action pistol chambered in .45-70. A bit difficult to aim."
1058+
sawn_desc= "A break-action pistol chambered in .45-70. A bit difficult to aim."
10591059
sawn_off = TRUE
10601060
w_class = WEIGHT_CLASS_NORMAL
10611061
slot_flags = ITEM_SLOT_BELT

0 commit comments

Comments
 (0)