cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10649 from mwerezak/coffee-fix

Browse Source 
Fixes #10621
This commit is contained in:
Snapshot
2015-08-14 22:51:43 -07:00
parent 5f5671d21f 3163de7a50
commit 3b7ed9bdc4
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
View File

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