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.

Sign up for GitHub

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
Merged

Fixes dead people spamming "drowning" messages #9888

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b4bf8a
fix
CydiaLamiales Sep 24, 2023
6836770
better-logic
CydiaLamiales Sep 25, 2023
3b074b0
move-this-here
CydiaLamiales Sep 25, 2023
20e26b7
emote-logic
CydiaLamiales Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions code/modules/pool/components/swimming.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 •
edited
Loading

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?

return //Unconscious/dead people shouldn't emote
ticks_drowned ++
if(prob(20))
victim.emote("cough")
CydiaLamiales marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
Loading