Skip to content

Commit

Permalink
Xeno ammo no longer pushes items (#7635)
Browse files Browse the repository at this point in the history
# About the pull request

This PR makes it so XENO_AMMO that is brute type no longer pushes items
(namely Oppressor Tail Seize). There may be other ways items are
pushed/pulled, but this is all I could find.

# Explain why it's good for the game

Behaviors like pushing weapons around to hide them need to be
discouraged.

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl: Drathek
balance: Xeno ammo can no longer push items (e.g. Oppressor Tail Seize)
/:cl:
  • Loading branch information
Drulikar authored Nov 21, 2024
1 parent ca87e9e commit c0bc971
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 @@ -1205,7 +1205,7 @@

/obj/item/bullet_act(obj/projectile/P)
bullet_ping(P)
if(P.ammo.damage_type == BRUTE)
if(P.ammo.damage_type == BRUTE && !(P.ammo.flags_ammo_behavior & AMMO_XENO))
explosion_throw(P.damage/2, P.dir, 4)
return TRUE

Expand Down

0 comments on commit c0bc971

Please sign in to comment.