From 981b76832098adaf761adcc65178df32bd4744d0 Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Fri, 16 Mar 2018 13:35:20 -0400 Subject: [PATCH 1/2] Makes a failsafe drink overdose proc --- .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 8695f36c51..2dddebe9e2 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -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) //Added this is a failsafe, as coffee milkshakes were FUCKING KILLING PEOPLE + M.make_jittery(5) + // Juices /datum/reagent/drink/juice/banana @@ -2844,4 +2847,4 @@ adj_temp = -5 glass_name = "Mint Julep" - glass_desc = "Minty and refreshing, perfect for a hot day." \ No newline at end of file + glass_desc = "Minty and refreshing, perfect for a hot day." From 36097cb31d88816371523c4a754d21dda5272ed9 Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Sat, 17 Mar 2018 00:52:07 -0400 Subject: [PATCH 2/2] Changes --- .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 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 2dddebe9e2..853fe1cab0 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -450,8 +450,8 @@ 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) //Added this is a failsafe, as coffee milkshakes were FUCKING KILLING PEOPLE - M.make_jittery(5) +/datum/reagent/drink/overdose(var/mob/living/carbon/M, var/alien) //Add special interactions here in the future if desired. + ..() // Juices @@ -1047,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"