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

Fix sentry additional shots and sentry flamer cause_data #7471

Merged
merged 2 commits into from
Nov 3, 2024

Conversation

Drulikar
Copy link
Contributor

@Drulikar Drulikar commented Nov 2, 2024

About the pull request

This PR is a follow-up to #7406 correcting an issue where sentries swapped the shooter and firer vars to fix #7045. It also corrects the erroneous initialization for flamer sentries so now they will actually attribute kills to the sentry and explain in the death message both the sentry and owner.

Explain why it's good for the game

Fixes additional projectiles being fired from humans that placed a shotgun sentry; the shots are supposed to be from the sentry not magically from the player somewhere else. Also improves the death messages for flamer sentry kills and actually attributes kills to the sentry.

Testing Photographs and Procedure

Screenshots & Videos

sentry
image

Changelog

🆑 Drathek
fix: Fixes additional projectiles being fired from humans that placed a shotgun sentry instead of the sentry.
fix: Fixes cause_data for flamer sentries so now kills they make are explained in the message and attributed to the kill counter for the sentry.
/:cl:

@Drulikar Drulikar added the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Nov 2, 2024
@cmss13-ci cmss13-ci bot added the Fix Fix one bug, make ten more label Nov 2, 2024
cm13-github added a commit that referenced this pull request Nov 2, 2024
cm13-github added a commit that referenced this pull request Nov 2, 2024
This was referenced Nov 3, 2024
cm13-github added a commit that referenced this pull request Nov 3, 2024
@harryob harryob added this pull request to the merge queue Nov 3, 2024
Merged via the queue into cmss13-devs:master with commit 33e952c Nov 3, 2024
28 checks passed
cmss13-ci bot added a commit that referenced this pull request Nov 3, 2024
@Drulikar Drulikar deleted the Fix_Turret_Attacks branch November 3, 2024 18:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more Testmerge Candidate we'll test this while you're asleep and the server has 10 players
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Shotgun Sentry Bug
2 participants