Merge pull request #10649 from mwerezak/coffee-fix

Fixes #10621
This commit is contained in:
Snapshot
2015-08-14 22:51:43 -07:00

View File

@@ -563,6 +563,7 @@
adj_drowsy = -3
adj_sleepy = -2
adj_temp = 25
overdose = 45
glass_icon_state = "hot_coffee"
glass_name = "cup of coffee"
@@ -572,10 +573,14 @@
..()
if(alien == IS_DIONA)
return
M.make_jittery(5)
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)
/datum/reagent/drink/coffee/icecoffee
name = "Iced Coffee"
id = "icecoffee"