Skip to content

Moves forced whisper from "always while in soft crit" to "when you're suffocating" #744

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

Draft
MrMelbert wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −4
Draft

Moves forced whisper from "always while in soft crit" to "when you're suffocating" #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/carbon.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,13 +687,13 @@
if(crit_percent() < 100 || HAS_TRAIT(src, TRAIT_NOSOFTCRIT)) // melbert todo
if(HAS_TRAIT_FROM(src, TRAIT_SOFT_CRIT, PAINCRIT))
Paralyze(2 SECONDS)
remove_traits(list(TRAIT_SOFT_CRIT, TRAIT_INCAPACITATED, TRAIT_IMMOBILIZED, TRAIT_FLOORED, TRAIT_HANDS_BLOCKED), PAINCRIT)
remove_traits(list(TRAIT_SOFT_CRIT, TRAIT_LABOURED_BREATHING, TRAIT_INCAPACITATED, TRAIT_IMMOBILIZED, TRAIT_FLOORED, TRAIT_HANDS_BLOCKED), PAINCRIT)
return

if(HAS_TRAIT_FROM(src, TRAIT_SOFT_CRIT, PAINCRIT))
return
var/is_standing = body_position == STANDING_UP
add_traits(list(TRAIT_SOFT_CRIT, TRAIT_INCAPACITATED, TRAIT_IMMOBILIZED, TRAIT_FLOORED, TRAIT_HANDS_BLOCKED), PAINCRIT)
add_traits(list(TRAIT_SOFT_CRIT, TRAIT_LABOURED_BREATHING, TRAIT_INCAPACITATED, TRAIT_IMMOBILIZED, TRAIT_FLOORED, TRAIT_HANDS_BLOCKED), PAINCRIT)
if(stat == DEAD)
return
if(buckled)
Expand Down
5 changes: 3 additions & 2 deletions code/modules/mob/living/living_say.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,9 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
return

switch(stat)
if(SOFT_CRIT)
message_mods[WHISPER_MODE] = MODE_WHISPER
// NON-MODULE CHANGE
// if(SOFT_CRIT)
// message_mods[WHISPER_MODE] = MODE_WHISPER
if(UNCONSCIOUS)
return
if(HARD_CRIT)
Expand Down
6 changes: 6 additions & 0 deletions code/modules/mob/mob_say.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,4 +237,10 @@
return
return message

/mob/living/carbon/human/get_message_mods(message, list/mods)
// NON-MODULE CHANGE
if(losebreath > 2 || failed_last_breath)
mods[WHISPER_MODE] = MODE_WHISPER
return ..()

#undef MESSAGE_MODS_LENGTH
Loading