Merge pull request #5071 from Cameron653/patch-1

Makes coffee milkshakes STOP KILLING PEOPLE
This commit is contained in:
Neerti
2018-03-22 22:31:13 -04:00
committed by GitHub
@@ -450,6 +450,9 @@
if(adj_temp < 0 && M.bodytemperature > 310)
M.bodytemperature = min(310, M.bodytemperature - (adj_temp * TEMPERATURE_DAMAGE_COEFFICIENT))
/datum/reagent/drink/overdose(var/mob/living/carbon/M, var/alien) //Add special interactions here in the future if desired.
..()
// Juices
/datum/reagent/drink/juice/banana
@@ -1044,11 +1047,14 @@
adj_dizzy = -5
adj_drowsy = -3
adj_sleepy = -2
overdose = 45
glass_name = "Coffee Milkshake"
glass_desc = "An energizing coffee milkshake, perfect for hot days at work.."
/datum/reagent/drink/milkshake/coffeeshake/overdose(var/mob/living/carbon/M, var/alien)
M.make_jittery(5)
/datum/reagent/drink/rewriter
name = "Rewriter"
id = "rewriter"
@@ -2844,4 +2850,4 @@
adj_temp = -5
glass_name = "Mint Julep"
glass_desc = "Minty and refreshing, perfect for a hot day."
glass_desc = "Minty and refreshing, perfect for a hot day."