From 946329df87700f11509524a13419f313cad1b031 Mon Sep 17 00:00:00 2001 From: Neopatra <31169558+Neopatra@users.noreply.github.com> Date: Thu, 2 Nov 2017 21:14:18 -0400 Subject: [PATCH 1/3] Adds Deathbell Drinks Adds Serana Te'saln's Deathbells to the code. --- .../Chemistry-Reagents-Food-Drinks_vr.dm | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm index 181f103b55..cf681da0de 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm @@ -5,4 +5,26 @@ M.nutrition = max(M.nutrition - 20 * removed, 0) M.overeatduration = 0 if(M.nutrition < 0) - M.nutrition = 0 \ No newline at end of file + M.nutrition = 0 + +/datum/reagent/ethanol/deathbell + name = "Deathbell" + id = "deathbell" + description = "A successful experiment to make the most alcoholic thing possible." + taste_description = "your brains smashed out by a smooth brick of hard, ice cold alcohol" + color = "#809CD5" + taste_mult = 5 + strength = 10 + adj_temp = 10 + targ_temp = 330 + + glass_name = "Deathbell" + glass_desc = "The perfect blend of the most alcoholic things a bartender can get their hands on." + +/datum/reagent/ethanol/deathbell/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + ..() + + if(dose * strength >= strength) // Early warning + M.make_dizzy(24) // Intentionally higher than normal to compensate for it's previous effects. + if(dose * strength >= strength * 2.5) // Slurring takes longer. Again, intentional. + M.slurring = max(M.slurring, 30) From 6e864d649208ff7fa05ddc7308f7014a9de3529e Mon Sep 17 00:00:00 2001 From: Neopatra <31169558+Neopatra@users.noreply.github.com> Date: Thu, 2 Nov 2017 21:21:13 -0400 Subject: [PATCH 2/3] Adds Deathbell Recipie Makes Deathbells mixable. --- code/modules/reagents/Chemistry-Recipes_vr.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/reagents/Chemistry-Recipes_vr.dm b/code/modules/reagents/Chemistry-Recipes_vr.dm index 5679c4b6ec..2071e54172 100644 --- a/code/modules/reagents/Chemistry-Recipes_vr.dm +++ b/code/modules/reagents/Chemistry-Recipes_vr.dm @@ -89,6 +89,13 @@ result = "grubshake" required_reagents = list("shockchem" = 5, "water" = 25) result_amount = 30 + +/datum/chemical_reaction/drinks/deathbell + name = "Deathbell" + id = "deathbell" + result = "deathbell" + required_reagents = list("antifreeze" = 1, "gargleblaster" = 1, "syndicatebomb" =1) + result_amount = 3 /////////////////////////////// //SLIME CORES BELOW HERE/////// From 2f575ce971685fb699ad56c25d9225c5d1766ea5 Mon Sep 17 00:00:00 2001 From: Neopatra <31169558+Neopatra@users.noreply.github.com> Date: Thu, 2 Nov 2017 21:38:00 -0400 Subject: [PATCH 3/3] Fixed Deathbell Color Does that. Fixes Color. --- .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm index cf681da0de..b530b9834e 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm @@ -12,7 +12,7 @@ id = "deathbell" description = "A successful experiment to make the most alcoholic thing possible." taste_description = "your brains smashed out by a smooth brick of hard, ice cold alcohol" - color = "#809CD5" + color = "#9f6aff" taste_mult = 5 strength = 10 adj_temp = 10