From ee56ba476280c4b319d637c3665d0f42481b524f Mon Sep 17 00:00:00 2001 From: MrMelbert Date: Wed, 7 Feb 2024 18:51:48 -0600 Subject: [PATCH] Whisper and Tinacusiate fix too --- code/modules/mob/living/living_say.dm | 2 ++ .../impure_reagents/impure_medicine_reagents.dm | 14 +++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm index 339755ce6454..e86c9792f273 100644 --- a/code/modules/mob/living/living_say.dm +++ b/code/modules/mob/living/living_say.dm @@ -206,6 +206,8 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list( message = "[randomnote] [message] [randomnote]" spans |= SPAN_SINGING + if(LAZYACCESS(message_mods,WHISPER_MODE)) // whisper away + spans |= SPAN_ITALICS if(!message) if(succumbed) diff --git a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm index 6d09d82815ec..a81b0e21a9db 100644 --- a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm @@ -770,18 +770,18 @@ Basically, we fill the time between now and 2s from now with hands based off the liver_damage = 0.1 metabolization_rate = 0.04 * REM ///The random span we start hearing in - var/randomSpan + var/random_span /datum/reagent/impurity/inacusiate/on_mob_metabolize(mob/living/affected_mob, seconds_per_tick, times_fired) . = ..() - randomSpan = pick(list("clown", "small", "big", "hypnophrase", "alien", "cult", "alert", "danger", "emote", "yell", "brass", "sans", "papyrus", "robot", "his_grace", "phobia")) + random_span = pick(list("clown", "small", "big", "hypnophrase", "alien", "cult", "alert", "danger", "emote", "yell", "brass", "sans", "papyrus", "robot", "his_grace", "phobia")) RegisterSignal(affected_mob, COMSIG_MOVABLE_HEAR, PROC_REF(owner_hear)) - to_chat(affected_mob, span_warning("Your hearing seems to be a bit off!")) + to_chat(affected_mob, span_warning("Your hearing seems to be a bit off[affected_mob.can_hear() ? "!" : " - wait, that's normal."]")) /datum/reagent/impurity/inacusiate/on_mob_end_metabolize(mob/living/affected_mob) . = ..() UnregisterSignal(affected_mob, COMSIG_MOVABLE_HEAR) - to_chat(affected_mob, span_notice("You start hearing things normally again.")) + to_chat(affected_mob, span_notice("You start hearing things normally again[affected_mob.can_hear() ? "" : " - no, wait, no you don't"].")) /datum/reagent/impurity/inacusiate/proc/owner_hear(mob/living/owner, list/hearing_args) SIGNAL_HANDLER @@ -789,8 +789,12 @@ Basically, we fill the time between now and 2s from now with hands based off the // don't skip messages that the owner says or can't understand (since they still make sounds) if(!owner.can_hear()) return + // not technically hearing + var/atom/movable/speaker = hearing_args[HEARING_SPEAKER] + if(!isnull(speaker) && HAS_TRAIT(speaker, TRAIT_SIGN_LANG)) + return - hearing_args[HEARING_RAW_MESSAGE] = "[hearing_args[HEARING_RAW_MESSAGE]]" + hearing_args[HEARING_SPANS] |= random_span /datum/reagent/inverse/sal_acid name = "Benzoic Acid"