Merge remote-tracking branch 'upstream/master' into food-rework

This commit is contained in:
Fox-McCloud
2016-12-05 12:40:32 -05:00
67 changed files with 836 additions and 312 deletions
@@ -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)
..()