Merge pull request #5916 from Fox-McCloud/status-fixes

Fixes Faint and Mickey Finn
This commit is contained in:
Crazy Lemon
2016-11-26 13:41:44 -08:00
committed by GitHub
2 changed files with 3 additions and 3 deletions
@@ -378,7 +378,7 @@
message = "<B>[src]</B> faints."
if(src.sleeping)
return //Can't faint while asleep
AdjustSleeping(1)
AdjustSleeping(2)
m_type = 1
if("cough", "coughs")
@@ -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)
..()