Skip to content

Commit

Permalink
Fixes guns occasionally ceasing to work (#4882)
Browse files Browse the repository at this point in the history
# About the pull request

tgstation/TerraGov-Marine-Corps#10691

Credit to BraveMole for the original PR and thegamer01 for letting me
know about the PR, I made some changes to make it work better

# Changelog
:cl: BraveMole, Zonespace
fix: Guns should no longer very rarely jam mid-burst.
/:cl:
  • Loading branch information
Zonespace27 committed Nov 13, 2023
1 parent 982bf88 commit c5e1407
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions code/datums/components/autofire/autofire.dm
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@
/datum/component/automatedfire/autofire/proc/initiate_shot()
SIGNAL_HANDLER
if(shooting)//if we are already shooting, it means the shooter is still on cooldown
if(bursting && (world.time > (next_fire + (burstfire_shot_delay * burst_shots_to_fire))))
hard_reset()
return
shooting = TRUE
process_shot()
Expand Down

0 comments on commit c5e1407

Please sign in to comment.