From c4963c02daef4df9507bd01b6dd1d1814e47f83c Mon Sep 17 00:00:00 2001 From: That0nePerson <63219222+That0nePerson@users.noreply.github.com> Date: Fri, 18 Feb 2022 14:55:59 -0500 Subject: [PATCH] Bajabljast (#11) * Added Baja Blast as a Mixed Drink * Recipe Change as Requested by TeaTree 2 parts soda water 1 part oxycodone 1 part space drugs * Requested Effects of Drinking Baja Blast from TeaTree * Increased Stumbling Odds * Increased Painkilling Power * Increased Prominence of the Effects * Increases Potency again * Baja Blast not available within the loadout screen Co-authored-by: Tim --- .../Chemistry-Reagents-Drinks.dm | 25 ++++++++++++++++++- code/modules/reagents/Chemistry-Recipes.dm | 9 +++++++ .../reagents/reagent_containers/food/lunch.dm | 3 ++- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drinks.dm index a6a1da6ea5b..5eee4f0b382 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drinks.dm @@ -1417,4 +1417,27 @@ taste_description = "bitter energising tea" color = "#0e0900" glass_name = "skrianhi tea" - glass_desc = "A blend of teas from Moghes, commonly drank by Unathi." \ No newline at end of file + glass_desc = "A blend of teas from Moghes, commonly drank by Unathi." + +//ITS BAJA BLAST BABEY!!!!!!!!!!!!1!!!! +/datum/reagent/drink/bajablast + name = "Baja Blast" + description = "A Tropical Lime Flavored Soda. Dangerously Tasty." + taste_description = "Dangerously Good Tropical Lime" + color = "#63FFE0" + glass_name = "Baja Blast" + glass_desc = "A Tropical Lime Flavored Soda. Dangerously Tasty." + glass_special = list(DRINK_FIZZ) + var/pain_power = 120 //Painkilling Effect + +/datum/reagent/drink/bajablast/affect_ingest(mob/living/carbon/M, alien, removed) + var/drug_strength = 15 + + M.druggy = max(M.druggy, drug_strength) + M.hallucination(50, 50) + M.SelfMove(pick(GLOB.cardinal)) + if(prob(65)) + M.emote(pick("twitch", "drool", "moan", "giggle")) + M.add_chemical_effect(CE_PULSE, -1) + M.add_chemical_effect(CE_PAINKILLER, pain_power) + M.add_chemical_effect(CE_MIND, -1) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 78089cf8bfd..019a2ea4346 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -3122,3 +3122,12 @@ catalysts = list( /datum/reagent/enzyme = 1 ) + +//BajaBlast is apparently an InterStellar Delicacy. It's exact makeup however, has changed over the years. +/datum/chemical_reaction/bajablast + name = "Baja Blast" + result = /datum/reagent/drink/bajablast + result_amount = 1 + required_reagents = list(/datum/reagent/space_drugs=1, + /datum/reagent/tramadol/oxycodone=1, + /datum/reagent/drink/sodawater=2) diff --git a/code/modules/reagents/reagent_containers/food/lunch.dm b/code/modules/reagents/reagent_containers/food/lunch.dm index 3f12c7ab603..d96acc50c13 100644 --- a/code/modules/reagents/reagent_containers/food/lunch.dm +++ b/code/modules/reagents/reagent_containers/food/lunch.dm @@ -81,7 +81,8 @@ var/list/lunchables_drink_reagents_ = list( /datum/reagent/drink/dry_ramen, /datum/reagent/drink/hell_ramen, /datum/reagent/drink/hot_ramen, - /datum/reagent/drink/nuka_cola + /datum/reagent/drink/nuka_cola, + /datum/reagent/drink/bajablast ) // This default list is a bit different, it contains items we don't want