From b02ffcd6a8b25f630a4e672e5f0954b118c64f51 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Sat, 2 Feb 2019 00:15:52 -0500 Subject: [PATCH] Lack of Breath Incurs Silence --- code/modules/mob/living/carbon/human/say.dm | 3 +++ code/modules/reagents/chemistry/reagents/medicine.dm | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index d0abb658333..ff8083f8093 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -91,6 +91,9 @@ var/obj/item/organ/internal/L = get_organ_slot("lungs") if((breathes && !L) || breathes && L && (L.status & ORGAN_DEAD)) return FALSE + if(oxyloss > 10 || losebreath >= 4) + emote("gasp") + return FALSE if(mind) return !mind.miming return TRUE diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm index 89a4755fae0..c925b828d41 100644 --- a/code/modules/reagents/chemistry/reagents/medicine.dm +++ b/code/modules/reagents/chemistry/reagents/medicine.dm @@ -430,7 +430,6 @@ update_flags |= M.adjustOxyLoss(-25*REAGENTS_EFFECT_MULTIPLIER, FALSE) if(volume >= 4) M.LoseBreath(6) - M.Silence(6) if(prob(33)) update_flags |= M.adjustBruteLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE) update_flags |= M.adjustFireLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)