Skip to content
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

Gives the lever-action rifle a gunslinger ability and removes the gunslinger damage buff from the shadow. #3135

Merged
merged 3 commits into from
Jun 26, 2024
Merged

Gives the lever-action rifle a gunslinger ability and removes the gunslinger damage buff from the shadow. #3135

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
036c4aa
first one :3
Martinpachu Jun 21, 2024
c814cbe
Merge remote-tracking branch 'upstream/master' into leverbuff
Martinpachu Jun 21, 2024
4b56cdc
Merge remote-tracking branch 'upstream/master' into leverbuff
Martinpachu Jun 24, 2024
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
7 changes: 0 additions & 7 deletions code/modules/projectiles/guns/ballistic/revolver.dm
View file
Open in desktop
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
View file
Open in desktop
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
Loading