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.

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

Mirror: Fix tranq rounds injecting when reflected #215

Conversation

SimpleStation14
Copy link
Member

Mirror of PR #26141: Fix tranq rounds injecting when reflected from space-wizards space-wizards/space-station-14

f0dfe3f6fb10e1b1f4e1a4b40c860fc0bac8427b

PR opened by Tayrtahn at 2024-03-15 13:11:00 UTC


PR changed 2 files with 5 additions and 11 deletions.

The PR had the following labels:


Original Body

About the PR

Tranquilizer rounds no longer inject their target when they are successfully reflected.

Why / Balance

Fixes #26137

Technical details

Changed SolutionInjectOnCollideSystem to subscribe to ProjectileHitEvent instead of StartCollideEvent. This also simplifies the logic a little and removes a component field (FixtureId), since SolutionInjectOnCollideSystem no longer has to check for fixture match or fixture hardness (these are already checked by ProjectileSystem before raising ProjectileHitEvent).

Media

Screen.Recording.2024-03-15.at.9.07.28.AM.mp4
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑

  • fix: Reflected tranquilizer rounds no longer inject the character who reflected them.

@SimpleStation14 SimpleStation14 added the Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot label Apr 22, 2024
@SimpleStation14 SimpleStation14 marked this pull request as draft May 4, 2024 21:13
@VMSolidus VMSolidus marked this pull request as ready for review May 9, 2024 05:18
@VMSolidus VMSolidus merged commit 852fae4 into Simple-Station:master May 9, 2024
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants