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

Fixed the last word pop up window instantly killing you if you are fu… #26507

Merged
merged 2 commits into from
Aug 19, 2024

Conversation

StudentBlossom
Copy link
Contributor

…ll health

What Does This PR Do

Fixed the last words popup being able to take the player out even if in perfect health

Why It's Good For The Game

Prevent people from dying on accident

Testing

I hit myself into crit, clicked on the succumb button rejuvenated me using admin power then when I clicked "ok" on the last word window I did not die


Declaration

  • I confirm that I either do not require pre-approval for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.

Changelog

🆑
fix: Last Word Window killing perfect health players
/:cl:

Copy link
Member

@DGamerL DGamerL left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💀

@ParadiseSS13-Bot ParadiseSS13-Bot added the -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally label Aug 16, 2024
@SteelSlayer SteelSlayer added the Fix This PR will fix an issue in the game label Aug 16, 2024
Copy link
Contributor

@lewcc lewcc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make sure these are cleared out for the next time they die

code/modules/mob/living/living.dm Show resolved Hide resolved
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Aug 19, 2024
Copy link
Member

@DGamerL DGamerL left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll fix the remaining issue in a different PR, good fix!

@DGamerL DGamerL added this pull request to the merge queue Aug 19, 2024
Merged via the queue into ParadiseSS13:master with commit 348d45f Aug 19, 2024
11 checks passed
Hearstrings pushed a commit to Hearstrings/Paradise-SS220 that referenced this pull request Aug 23, 2024
ParadiseSS13#26507)

* Fixed the last word pop up window instantly killing you if you are full health

* Update code/modules/mob/living/living.dm

Co-authored-by: Luc <[email protected]>
Signed-off-by: DGamerL <[email protected]>

---------

Signed-off-by: DGamerL <[email protected]>
Co-authored-by: DGamerL <[email protected]>
Co-authored-by: Luc <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-Status: Awaiting review This PR is awaiting review from the review team Fix This PR will fix an issue in the game
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants