From cb5df3963af51a968a084df7d08e5cee8e4ee556 Mon Sep 17 00:00:00 2001 From: Kelenius Date: Sat, 15 Aug 2015 13:15:52 +0300 Subject: [PATCH] Reverts #10649, fixes #10621 --- .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 0d04d8ad99..fdbac0339e 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -563,7 +563,6 @@ adj_drowsy = -3 adj_sleepy = -2 adj_temp = 25 - overdose = 45 glass_icon_state = "hot_coffee" glass_name = "cup of coffee" @@ -575,11 +574,8 @@ return if(adj_temp > 0) holder.remove_reagent("frostoil", 10 * removed) - -/datum/reagent/drink/coffee/overdose(var/mob/living/carbon/M, var/alien) - if(alien == IS_DIONA) - return - M.make_jittery(5) + if(dose > 45) + M.make_jittery(5) /datum/reagent/drink/coffee/icecoffee name = "Iced Coffee"