Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bajabljast #11

Merged
merged 8 commits into from
Feb 18, 2022
Merged

Bajabljast #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9fefe11
Added Baja Blast as a Mixed Drink
DatBoiTim Aug 30, 2021
df5d2b5
Recipe Change as Requested by TeaTree
DatBoiTim Aug 30, 2021
0d557ef
Requested Effects of Drinking Baja Blast from TeaTree
DatBoiTim Aug 30, 2021
9377c2f
Increased Stumbling Odds
DatBoiTim Aug 30, 2021
24d80f1
Increased Painkilling Power
DatBoiTim Aug 30, 2021
f0c0b9b
Increased Prominence of the Effects
DatBoiTim Aug 30, 2021
089a0e4
Increases Potency again
DatBoiTim Aug 30, 2021
c8fb6aa
Baja Blast not available within the loadout screen
DatBoiTim Sep 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drinks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
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)
9 changes: 9 additions & 0 deletions code/modules/reagents/Chemistry-Recipes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
3 changes: 2 additions & 1 deletion code/modules/reagents/reagent_containers/food/lunch.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down