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

Xenos no longer have capped damage #7619

Merged
merged 1 commit into from
Nov 19, 2024

Conversation

Drulikar
Copy link
Contributor

@Drulikar Drulikar commented Nov 18, 2024

About the pull request

This PR fixes an oversight where /mob/living/proc/adjustBruteLoss and /mob/living/proc/adjustFireLoss caps brute/fire damage at 2x max health, but warding changes their effective max health resulting in edge cases where the xenomorph is immortal (though forever in crit). Now xenos do not cap their brute or fire damage.

Explain why it's good for the game

Fixes #7082

Testing Photographs and Procedure

Screenshots & Videos

https://youtu.be/I2h1qd5sN8I

Changelog

🆑 Drathek
fix: Fixed xenos sometimes becoming immortal with warding pheros (xenos do not cap brute/fire damage now)
/:cl:

@cmss13-ci cmss13-ci bot added the Fix Fix one bug, make ten more label Nov 18, 2024
@Drulikar Drulikar added the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Nov 18, 2024
cm13-github added a commit that referenced this pull request Nov 18, 2024
cm13-github added a commit that referenced this pull request Nov 18, 2024
cm13-github added a commit that referenced this pull request Nov 19, 2024
cm13-github added a commit that referenced this pull request Nov 19, 2024
@harryob harryob added this pull request to the merge queue Nov 19, 2024
Merged via the queue into cmss13-devs:master with commit 2125c98 Nov 19, 2024
28 checks passed
cmss13-ci bot added a commit that referenced this pull request Nov 19, 2024
@Drulikar Drulikar deleted the Fix_Warding_Immortality branch November 20, 2024 05:35
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.

larvas are inmortal
2 participants