Skip to content

Commit

Permalink
Match bullets no longer have a highly above-average chance to ricoche…
Browse files Browse the repository at this point in the history
…t into their user's foot (#2944)

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

Nothing is stopping the only person in ricochet range from being the
person shooting the gun. Which looks really stupid if you are trying to
do something funny and shoot yourself in the foot 6 times.

## Why It's Good For The Game

"bullet that shoots the person who shot it" isn't an ammo type

## Changelog

:cl:
tweak: match rounds will no longer consider the person firing them as a
viable target when ricocheting
/: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. -->

Signed-off-by: Theos <[email protected]>
  • Loading branch information
SomeguyManperson authored May 5, 2024
1 parent 8b9d3ed commit 57321dc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/modules/projectiles/projectile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
if(firer && HAS_TRAIT(firer, TRAIT_NICE_SHOT))
best_angle += NICE_SHOT_RICOCHET_BONUS
for(var/mob/living/L in range(ricochet_auto_aim_range, src.loc))
if(L.stat == DEAD || !isInSight(src, L))
if(L.stat == DEAD || !isInSight(src, L) || L == firer)
continue
var/our_angle = abs(closer_angle_difference(Angle, Get_Angle(src.loc, L.loc)))
if(our_angle < best_angle)
Expand Down

0 comments on commit 57321dc

Please sign in to comment.