From ed3a5252c8f9920b6d9c07570351fef381f0121f Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sat, 26 Nov 2016 16:09:00 -0500 Subject: [PATCH] Fixes Faint and Mickey Finn --- code/modules/mob/living/carbon/human/emote.dm | 2 +- code/modules/reagents/chemistry/reagents/toxins.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index bd0c3538462..37826ae0a10 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -378,7 +378,7 @@ message = "[src] faints." if(src.sleeping) return //Can't faint while asleep - AdjustSleeping(1) + AdjustSleeping(2) m_type = 1 if("cough", "coughs") diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm index 8b575be41a5..3b59ff8e0b7 100644 --- a/code/modules/reagents/chemistry/reagents/toxins.dm +++ b/code/modules/reagents/chemistry/reagents/toxins.dm @@ -326,9 +326,9 @@ /datum/reagent/beer2/on_mob_life(mob/living/M) switch(current_cycle) if(1 to 50) - M.AdjustSleeping(1) + M.Sleeping(2) if(51 to INFINITY) - M.AdjustSleeping(1) + M.Sleeping(2) M.adjustToxLoss((current_cycle - 50)*REAGENTS_EFFECT_MULTIPLIER) ..()