Skip to content

Commit

Permalink
Gives the lever-action rifle a gunslinger ability and removes the gun…
Browse files Browse the repository at this point in the history
…slinger damage buff from the shadow. (#3135)

<!-- 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

Gives the lever-action rifle an effect similar to revolver fanning, but
slower and while wielded. ALSO removes the +5 damage and AP
## Why It's Good For The Game

The lever action rifle right now is very underwhelming and i think this
would be a fun way to use it. Also, the +5 damage and AP bonus is stupid
and unneeded now that the .44 roumain round is merged.
## Changelog

:cl:
add: A technique for gunslinger with the lever-action flaming arrow!
Firing it while wielded will quickly and automatically rack the lever,
less quickly than a .38 revolver or fanned shadow though.
del: The +5 damage and AP bonus on the shadow while using it as a
gunslinger.

/: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
Martinpachu authored Jun 26, 2024
1 parent ce97caa commit 4e85335
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
7 changes: 0 additions & 7 deletions code/modules/projectiles/guns/ballistic/revolver.dm
Original file line number Diff line number Diff line change
Expand Up @@ -730,12 +730,5 @@ EMPTY_GUN_HELPER(revolver/detective)
. = ..()
AddComponent(/datum/component/ammo_hud/revolver)

/obj/item/gun/ballistic/revolver/shadow/before_firing(atom/target, mob/user)
. = ..()
// if you go through the pain of not only using this shitty gun, but also with the fucking gunslinger quirk, you deserve this bonus. not a BIG bonus, but enough as an incentive to make people actually take the quirk.
if(chambered.BB && (HAS_TRAIT(user, TRAIT_GUNSLINGER)))
chambered.BB.damage += 5
chambered.BB.armour_penetration += 5

/obj/item/gun/ballistic/revolver/shadow/no_mag
spawnwithmagazine = FALSE
12 changes: 12 additions & 0 deletions code/modules/projectiles/guns/ballistic/shotgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,18 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
if(!wielded)
SpinAnimation(7,1)

/obj/item/gun/ballistic/shotgun/flamingarrow/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
var/fan = FALSE
if(HAS_TRAIT(user, TRAIT_GUNSLINGER) && !semi_auto && wielded_fully && loc == user && !safety)
fan = TRUE
fire_delay = 0.35 SECONDS
. = ..()
fire_delay = src::fire_delay
if(fan)
rack()
to_chat(user, "<span class='notice'>You quickly rack the [bolt_wording] of \the [src]!</span>")
balloon_alert_to_viewers("quickly racks!")
fire_delay = 0 SECONDS

/obj/item/gun/ballistic/shotgun/flamingarrow/sawoff(mob/user)
. = ..()
Expand Down

0 comments on commit 4e85335

Please sign in to comment.