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

Fixes dead people spamming "drowning" messages #9888

Merged
merged 4 commits into from
Oct 21, 2023

Conversation

CydiaLamiales
Copy link
Contributor

About The Pull Request

Why It's Good For The Game

Doesn't make sense that the body keeps "fainting" after dying.

Testing Photographs and Procedure

Screenshots&Videos

image

Changelog

🆑
fix: Fixed dead bodies continuing to make the "drowning" message
/:cl:

Copy link
Member

@EvilDragonfiend EvilDragonfiend left a comment

Choose a reason for hiding this comment

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

Add a comment why you check dead status in the if line. It would look like a random check.

code/modules/pool/components/swimming.dm Outdated Show resolved Hide resolved
@@ -125,6 +125,8 @@
/datum/component/swimming/proc/drown(mob/living/victim)
if(victim.losebreath < 1)
victim.losebreath += 1
if(victim.stat > CONSCIOUS)
Copy link
Member

@PowerfulBacon PowerfulBacon Sep 29, 2023

Choose a reason for hiding this comment

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

This needs to be >= if you want unconcious or dead people to not emote. Also this removes the victim being made unconcious while unconcious when drowning which makes drowning trivial to escape.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Tried a different approach, could you take a look?

Copy link
Member

@PowerfulBacon PowerfulBacon left a comment

Choose a reason for hiding this comment

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

Could wrap the shouldemote = FALSE if check into one line but this works and is fine

@PowerfulBacon PowerfulBacon dismissed stale reviews from itsmeow and EvilDragonfiend October 21, 2023 07:59

Stale review

@PowerfulBacon PowerfulBacon added this pull request to the merge queue Oct 21, 2023
Merged via the queue into BeeStation:master with commit ae7dedb Oct 21, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Pools will display drowning messages on dead people
4 participants