cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Stimulant allergen for Tajaran

Browse Source
This commit is contained in:
Chompstation Bot
2021-10-22 18:57:48 +00:00
parent 24d867c15f
commit ffadbf101f
9 changed files with 323 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
code/modules/reagents/reactions/instant/drinks.dm
View File

@@ -693,6 +693,13 @@
required_reagents = list("orangejuice" = 2, "cola" = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/brownstar_decaf
name = "Decaf Brown Star"
id = "brownstar_decaf"
result = "brownstar_decaf"
required_reagents = list("orangejuice" = 2, "decafcola" = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/milkshake
name = "Milkshake"
id = "milkshake"
@@ -756,6 +763,13 @@
required_reagents = list("tea" = 5, "mint" = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/minttea_decaf
name = "Decaf Mint Tea"
id = "decafminttea"
result = "decafminttea"
required_reagents = list("decaftea" = 5, "mint" = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/lemontea
name = "Lemon Tea"
id = "lemontea"
@@ -763,6 +777,13 @@
required_reagents = list("tea" = 5, "lemonjuice" = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/lemontea_decaf
name = "Decaf Lemon Tea"
id = "decaflemontea"
result = "decaflemontea"
required_reagents = list("decaftea" = 5, "lemonjuice" = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/limetea
name = "Lime Tea"
id = "limetea"
@@ -770,6 +791,13 @@
required_reagents = list("tea" = 5, "limejuice" = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/limetea_decaf
name = "Decaf Lime Tea"
id = "decaflimetea"
result = "decaflimetea"
required_reagents = list("decaftea" = 5, "limejuice" = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/orangetea
name = "Orange Tea"
id = "orangetea"
@@ -777,6 +805,13 @@
required_reagents = list("tea" = 5, "orangejuice" = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/orangetea_decaf
name = "Decaf Orange Tea"
id = "decaforangetea"
result = "decaforangetea"
required_reagents = list("decaftea" = 5, "orangejuice" = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/berrytea
name = "Berry Tea"
id = "berrytea"
@@ -784,6 +819,13 @@
required_reagents = list("tea" = 5, "berryjuice" = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/berrytea_decaf
name = "Decaf Berry Tea"
id = "decafberrytea"
result = "decafberrytea"
required_reagents = list("decaftea" = 5, "berryjuice" = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/sakebomb
name = "Sake Bomb"
id = "sakebomb"

250
code/modules/reagents/reagents/food_drinks.dm
View File

@@ -384,7 +384,7 @@
taste_mult = 1.3
nutriment_factor = 1
color = "#482000"
allergen_type = ALLERGEN_COFFEE //Again, coffee contains coffee
allergen_type = ALLERGEN_COFFEE | ALLERGEN_STIMULANT //Again, coffee contains coffee
/datum/reagent/nutriment/tea
name = "Tea Powder"
@@ -394,6 +394,16 @@
taste_mult = 1.3
nutriment_factor = 1
color = "#101000"
allergen_type = ALLERGEN_STIMULANT //Strong enough to contain caffeine
/datum/reagent/nutriment/decaf_tea
name = "Decaf Tea Powder"
id = "decafteapowder"
description = "A dark, tart powder made from black tea leaves, treated to remove caffeine content."
taste_description = "tartness"
taste_mult = 1.3
nutriment_factor = 1
color = "#101000"
/datum/reagent/nutriment/coco
name = "Coco Powder"
@@ -636,8 +646,6 @@
color = "#365E30"
overdose = REAGENTS_OVERDOSE
//SYNNONO MEME FOODS EXPANSION - Credit to Synnono
/datum/reagent/spacespice
name = "Wurmwoad"
id = "spacespice"
@@ -1232,6 +1240,7 @@
cup_icon_state = "cup_tea"
cup_name = "cup of tea"
cup_desc = "Tasty black tea, it has antioxidants, it's good for you!"
allergen_type = ALLERGEN_STIMULANT //Black tea strong enough to have significant caffeine content
/datum/reagent/drink/tea/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
@@ -1239,6 +1248,23 @@
return
M.adjustToxLoss(-0.5 * removed)
/datum/reagent/drink/tea/decaf
name = "Decaf Tea"
id = "teadecaf"
description = "Tasty black tea, it has antioxidants, it's good for you, and won't keep you up at night!"
color = "#832700"
adj_dizzy = 0
adj_drowsy = 0 //Decaf won't help you here.
adj_sleepy = 0
glass_name = "cup of decaf tea"
glass_desc = "Tasty black tea, it has antioxidants, it's good for you, and won't keep you up at night!"
cup_name = "cup of decaf tea"
cup_desc = "Tasty black tea, it has antioxidants, it's good for you, and won't keep you up at night!"
allergen_type = null //Certified cat-safe!
/datum/reagent/drink/tea/icetea
name = "Iced Tea"
id = "icetea"
@@ -1273,6 +1299,16 @@
M.bodytemperature += 0.5
//M.adjustToxLoss(5 * removed) //VOREStation Removal
/datum/reagent/drink/tea/icetea/decaf
name = "Decaf Iced Tea"
glass_name = "decaf iced tea"
cup_name = "cup of decaf iced tea"
id = "iceteadecaf"
adj_dizzy = 0
adj_drowsy = 0
adj_sleepy = 0
allergen_type = null
/datum/reagent/drink/tea/minttea
name = "Mint Tea"
id = "minttea"
@@ -1286,6 +1322,16 @@
cup_name = "cup of mint tea"
cup_desc = "A tasty mixture of mint and tea. It's apparently good for you!"
/datum/reagent/drink/tea/minttea/decaf
name = "Decaf Mint Tea"
glass_name = "decaf mint tea"
cup_name = "cup of decaf mint tea"
id = "mintteadecaf"
adj_dizzy = 0
adj_drowsy = 0
adj_sleepy = 0
allergen_type = null
/datum/reagent/drink/tea/lemontea
name = "Lemon Tea"
id = "lemontea"
@@ -1298,7 +1344,17 @@
cup_name = "cup of lemon tea"
cup_desc = "A tasty mixture of lemon and tea. It's apparently good for you!"
allergen_type = ALLERGEN_FRUIT //Made with lemon juice
allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with lemon juice, still tea
/datum/reagent/drink/tea/lemontea/decaf
name = "Decaf Lemon Tea"
glass_name = "decaf lemon tea"
cup_name = "cup of decaf lemon tea"
id = "lemonteadecaf"
adj_dizzy = 0
adj_drowsy = 0
adj_sleepy = 0
allergen_type = ALLERGEN_FRUIT //No caffine, still lemon.
/datum/reagent/drink/tea/limetea
name = "Lime Tea"
@@ -1312,7 +1368,17 @@
cup_name = "cup of lime tea"
cup_desc = "A tasty mixture of lime and tea. It's apparently good for you!"
allergen_type = ALLERGEN_FRUIT //Made with lime juice
allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with lime juice, still tea
/datum/reagent/drink/tea/limetea/decaf
name = "Decaf Lime Tea"
glass_name = "decaf lime tea"
cup_name = "cup of decaf lime tea"
id = "limeteadecaf"
adj_dizzy = 0
adj_drowsy = 0
adj_sleepy = 0
allergen_type = ALLERGEN_FRUIT //No caffine, still lime.
/datum/reagent/drink/tea/orangetea
name = "Orange Tea"
@@ -1326,7 +1392,17 @@
cup_name = "cup of orange tea"
cup_desc = "A tasty mixture of orange and tea. It's apparently good for you!"
allergen_type = ALLERGEN_FRUIT //Made with orange juice
allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with orange juice, still tea
/datum/reagent/drink/tea/orangetea/decaf
name = "Decaf orange Tea"
glass_name = "decaf orange tea"
cup_name = "cup of decaf orange tea"
id = "orangeteadecaf"
adj_dizzy = 0
adj_drowsy = 0
adj_sleepy = 0
allergen_type = ALLERGEN_FRUIT //No caffine, still orange.
/datum/reagent/drink/tea/berrytea
name = "Berry Tea"
@@ -1340,7 +1416,17 @@
cup_name = "cup of berry tea"
cup_desc = "A tasty mixture of berries and tea. It's apparently good for you!"
allergen_type = ALLERGEN_FRUIT //Made with berry juice
allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with berry juice, still tea
/datum/reagent/drink/tea/berrytea/decaf
name = "Decaf Berry Tea"
glass_name = "decaf berry tea"
cup_name = "cup of decaf berry tea"
id = "berryteadecaf"
adj_dizzy = 0
adj_drowsy = 0
adj_sleepy = 0
allergen_type = ALLERGEN_FRUIT //No caffine, still berries.
/datum/reagent/drink/greentea
name = "Green Tea"
@@ -1355,18 +1441,29 @@
cup_name = "cup of green tea"
cup_desc = "A subtle blend of green tea. It's apparently good for you!"
/datum/reagent/drink/chaitea
/datum/reagent/drink/tea/chaitea
name = "Chai Tea"
id = "chaitea"
description = "A tea spiced with cinnamon and cloves."
description = "A milky tea spiced with cinnamon and cloves."
color = "#A8442C"
taste_description = "creamy cinnamon and spice"
glass_name = "chai tea"
glass_desc = "A tea spiced with cinnamon and cloves."
glass_desc = "A milky tea spiced with cinnamon and cloves."
cup_name = "cup of chai tea"
cup_desc = "A tea spiced with cinnamon and cloves."
cup_desc = "A milky tea spiced with cinnamon and cloves."
allergen_type = ALLERGEN_STIMULANT|ALLERGEN_DAIRY //Made with milk and tea.
/datum/reagent/drink/tea/chaitea/decaf
name = "Decaf Chai Tea"
glass_name = "decaf chai tea"
cup_name = "cup of decaf chai tea"
id = "chaiteadecaf"
adj_dizzy = 0
adj_drowsy = 0
adj_sleepy = 0
allergen_type = ALLERGEN_DAIRY //No caffeine, still milk.
/datum/reagent/drink/coffee
name = "Coffee"
@@ -1387,7 +1484,7 @@
glass_name = "coffee"
glass_desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."
allergen_type = ALLERGEN_COFFEE //Apparently coffee contains coffee
allergen_type = ALLERGEN_COFFEE | ALLERGEN_STIMULANT //Apparently coffee contains coffee
/datum/reagent/drink/coffee/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_DIONA)
@@ -1500,7 +1597,7 @@
glass_name = "decaf coffee"
glass_desc = "Basically just brown, bitter water."
allergen_type = ALLERGEN_COFFEE //Decaf coffee would still likely trigger allergy symptoms.
allergen_type = ALLERGEN_COFFEE //Decaf coffee is still coffee, just less stimulating.
/datum/reagent/drink/hot_coco
name = "Hot Chocolate"
@@ -1643,7 +1740,18 @@
glass_name = "Brown Star"
glass_desc = "It's not what it sounds like..."
allergen_type = ALLERGEN_FRUIT //Made with orangejuice and cola
allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with orangejuice and cola
/datum/reagent/drink/soda/brownstar_decaf //For decaf starkist
name = "Decaf Brown Star"
id = "brownstar_decaf"
description = "It's not what it sounds like..."
taste_description = "orange and cola soda"
color = "#9F3400"
adj_temp = -2
glass_name = "Brown Star"
glass_desc = "It's not what it sounds like..."
/datum/reagent/drink/milkshake
name = "Milkshake"
@@ -1742,7 +1850,7 @@
glass_name = "Rewriter"
glass_desc = "The secret of the sanctuary of the Libarian..."
allergen_type = ALLERGEN_FRUIT|ALLERGEN_COFFEE //Made with space mountain wind (Fruit)
allergen_type = ALLERGEN_FRUIT|ALLERGEN_COFFEE|ALLERGEN_STIMULANT //Made with space mountain wind (Fruit, caffeine)
/datum/reagent/drink/rewriter/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
@@ -1761,6 +1869,7 @@
glass_name = "Nuka-Cola"
glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland"
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_STIMULANT
/datum/reagent/drink/soda/nuka_cola/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
@@ -1795,6 +1904,20 @@
glass_name = "Space Cola"
glass_desc = "A glass of refreshing Space Cola"
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_STIMULANT //Cola is typically caffeinated.
/datum/reagent/drink/soda/decaf_cola
name = "Space Cola Free"
id = "decafcola"
description = "A refreshing beverage with none of the jitters."
taste_description = "cola"
reagent_state = LIQUID
color = "#100800"
adj_temp = -5
glass_name = "Space Cola Free"
glass_desc = "A glass of refreshing Space Cola Free"
glass_special = list(DRINK_FIZZ)
/datum/reagent/drink/soda/lemon_soda
name = "Lemon Soda"
@@ -1914,12 +2037,12 @@
glass_name = "Space Mountain Wind"
glass_desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind."
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT //Fruit allergens because citrus is implied to come from limes/lemons
allergen_type = ALLERGEN_FRUIT|ALLERGEN_STIMULANT //Citrus, and caffeination
/datum/reagent/drink/soda/dr_gibb
name = "Dr. Gibb"
id = "dr_gibb"
description = "A delicious blend of 42 different flavors"
description = "A delicious blend of 42 different flavors."
taste_description = "cherry soda"
nutriment_factor = 3 //CHOMPStation addition
color = "#102000"
@@ -1928,6 +2051,7 @@
glass_name = "Dr. Gibb"
glass_desc = "Dr. Gibb. Not as dangerous as the name might imply."
allergen_type = ALLERGEN_STIMULANT
/datum/reagent/drink/soda/space_up
name = "Space-Up"
@@ -1984,7 +2108,7 @@
name = "Diet Dr. Gibb"
id = "diet_dr_gibb"
color = "#102000"
taste_description = "watered down cherry soda"
taste_description = "chemically sweetened cherry soda"
glass_name = "glass of Diet Dr. Gibb"
glass_desc = "Regular Dr.Gibb is probably healthier than this cocktail of artificial flavors."
@@ -2014,7 +2138,7 @@
glass_name = "roy rogers"
glass_desc = "I'm a cowboy, on a steel horse I ride"
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT //Made with lemon lime
allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with lemon lime and cola
/datum/reagent/drink/collins_mix
name = "Collins Mix"
@@ -2042,7 +2166,7 @@
glass_name = "arnold palmer"
glass_desc = "Tastes just like the old man."
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT //Made with lemonade
allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with lemonade and tea
/datum/reagent/drink/doctor_delight
name = "The Doctor's Delight"
@@ -2178,7 +2302,7 @@
glass_name = "Vile Lemon"
glass_desc = "A sour, fizzy drink with lemonade and lemonlime."
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT //Made from lemonade
allergen_type = ALLERGEN_FRUIT|ALLERGEN_STIMULANT //Made from lemonade and mtn wind(caffeine)
/datum/reagent/drink/entdraught
name = "Ent's Draught"
@@ -2525,7 +2649,7 @@
//Base type for alchoholic drinks containing coffee
/datum/reagent/ethanol/coffee
overdose = 45
allergen_type = ALLERGEN_COFFEE //Contains coffee or is made from coffee
allergen_type = ALLERGEN_COFFEE|ALLERGEN_STIMULANT //Contains coffee or is made from coffee
/datum/reagent/ethanol/coffee/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_DIONA)
@@ -2653,6 +2777,7 @@
glass_name = "Thirteen Loko"
glass_desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass."
allergen_type = ALLERGEN_STIMULANT //Holy shit dude.
/datum/reagent/ethanol/thirteenloko/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
@@ -2895,7 +3020,7 @@
glass_name = "Atomic Bomb"
glass_desc = "We cannot take legal responsibility for your actions after imbibing."
allergen_type = ALLERGEN_COFFEE|ALLERGEN_DAIRY|ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from b52 which contains kahlua(coffee), cognac(fruit), and irish cream(Whiskey(grains),cream(dairy))
allergen_type = ALLERGEN_COFFEE|ALLERGEN_DAIRY|ALLERGEN_FRUIT|ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from b52 which contains kahlua(coffee/caffeine), cognac(fruit), and irish cream(Whiskey(grains),cream(dairy))
/datum/reagent/ethanol/coffee/b52
name = "B-52"
@@ -2909,7 +3034,7 @@
glass_name = "B-52"
glass_desc = "Kahlua, Irish cream, and cognac. You will get bombed."
allergen_type = ALLERGEN_COFFEE|ALLERGEN_DAIRY|ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from kahlua(coffee), cognac(fruit), and irish cream(Whiskey(grains),cream(dairy))
allergen_type = ALLERGEN_COFFEE|ALLERGEN_DAIRY|ALLERGEN_FRUIT|ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from kahlua(coffee/caffeine), cognac(fruit), and irish cream(Whiskey(grains),cream(dairy))
/datum/reagent/ethanol/bahama_mama
name = "Bahama mama"
@@ -2995,7 +3120,7 @@
glass_name = "Black Russian"
glass_desc = "For the lactose-intolerant. Still as classy as a White Russian."
allergen_type = ALLERGEN_COFFEE|ALLERGEN_GRAINS //Made from vodka(grains) and kahlua(coffee)
allergen_type = ALLERGEN_COFFEE|ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from vodka(grains) and kahlua(coffee/caffeine)
/datum/reagent/ethanol/bloody_mary
name = "Bloody Mary"
@@ -3023,7 +3148,7 @@
allergen_type = ALLERGEN_DAIRY|ALLERGEN_FRUIT //Made from cream(dairy), banana juice(fruit), and watermelon juice(fruit)
/datum/reagent/ethanol/coffee/brave_bull //Since it's under the /coffee subtype, it already has coffee allergens.
/datum/reagent/ethanol/coffee/brave_bull //Since it's under the /coffee subtype, it already has coffee and caffeine allergens.
name = "Brave Bull"
id = "bravebull"
description = "It's just as effective as Dutch-Courage!"
@@ -3064,7 +3189,47 @@
/datum/reagent/ethanol/cuba_libre
name = "Cuba Libre"
id = "cubalibre"
<<<<<<< HEAD
description = "Rum, mixed with cola. Viva la revolucion."
||||||| parent of 147dddcf38... Merge pull request #11579 from VOREStation/upstream-merge-8283
description = "Rum, mixed with cola and a splash of lime. Viva la revolucion."
taste_description = "cola with lime"
color = "#3E1B00"
strength = 30
glass_name = "Cuba Libre"
glass_desc = "A classic mix of rum, cola, and lime."
/datum/reagent/ethanol/rum_and_cola
name = "Rum and Cola"
id = "rumandcola"
description = "A classic mix of sugar with more sugar."
=======
description = "Rum, mixed with cola and a splash of lime. Viva la revolucion."
taste_description = "cola with lime"
color = "#3E1B00"
strength = 30
glass_name = "Cuba Libre"
glass_desc = "A classic mix of rum, cola, and lime."
allergen_type = ALLERGEN_STIMULANT //Cola
/datum/reagent/ethanol/rum_and_cola
name = "Rum and Cola"
id = "rumandcola"
description = "A classic mix of sugar with more sugar."
taste_description = "cola"
color = "#3E1B00"
strength = 30
glass_name = "Cuba Libre"
glass_desc = "A classic mix of rum, cola, and lime."
/datum/reagent/ethanol/rum_and_cola
name = "Rum and Cola"
id = "rumandcola"
description = "A classic mix of sugar with more sugar."
>>>>>>> 147dddcf38... Merge pull request #11579 from VOREStation/upstream-merge-8283
taste_description = "cola"
nutriment_factor = 1.5 //CHOMPStation addition
color = "#3E1B00"
@@ -3072,6 +3237,7 @@
glass_name = "Cuba Libre"
glass_desc = "A classic mix of rum and cola."
allergen_type = ALLERGEN_STIMULANT // Cola
/datum/reagent/ethanol/demonsblood
name = "Demons Blood"
@@ -3085,7 +3251,7 @@
glass_name = "Demons' Blood"
glass_desc = "Just looking at this thing makes the hair on the back of your neck stand up."
allergen_type = ALLERGEN_FRUIT //Made from space mountain wind(fruit)
allergen_type = ALLERGEN_FRUIT|ALLERGEN_STIMULANT //Made from space mountain wind(fruit) and dr.gibb(caffeine)
/datum/reagent/ethanol/devilskiss
name = "Devils Kiss"
@@ -3097,7 +3263,7 @@
glass_name = "Devil's Kiss"
glass_desc = "Creepy time!"
allergen_type = ALLERGEN_COFFEE //Made from kahlua (Coffee)
allergen_type = ALLERGEN_COFFEE|ALLERGEN_STIMULANT //Made from kahlua (Coffee)
/datum/reagent/ethanol/driestmartini
name = "Driest Martini"
@@ -3260,7 +3426,7 @@
glass_name = "Irish coffee"
glass_desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning."
allergen_type = ALLERGEN_COFFEE|ALLERGEN_DAIRY|ALLERGEN_GRAINS //Made from Coffee(coffee) and irish cream(whiskey(grains), cream(dairy))
allergen_type = ALLERGEN_COFFEE|ALLERGEN_DAIRY|ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from Coffee(coffee/caffeine) and irish cream(whiskey(grains), cream(dairy))
/datum/reagent/ethanol/irish_cream
name = "Irish Cream"
@@ -3286,7 +3452,7 @@
glass_name = "Long Island iced tea"
glass_desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from vodka(grains) and gin(fruit)
allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT|ALLERGEN_STIMULANT //Made from vodka(grains), cola(caffeine) and gin(fruit)
/datum/reagent/ethanol/manhattan
name = "Manhattan"
@@ -3474,7 +3640,7 @@
glass_name = "Snow White"
glass_desc = "A cold refreshment."
allergen_type = ALLERGEN_COFFEE|ALLERGEN_FRUIT //made from Pineapple juice(fruit), lemon_lime(fruit), and kahlua(coffee)
allergen_type = ALLERGEN_COFFEE|ALLERGEN_FRUIT|ALLERGEN_STIMULANT //made from Pineapple juice(fruit), lemon_lime(fruit), and kahlua(coffee/caffine)
/datum/reagent/ethanol/suidream
name = "Sui Dream"
@@ -3501,7 +3667,7 @@
glass_name = "Syndicate Bomb"
glass_desc = "Tastes like terrorism!"
allergen_type = ALLERGEN_GRAINS //Made from beer(grain) and whiskeycola(whiskey(grain))
allergen_type = ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from beer(grain) and whiskeycola(whiskey(grain) and cola(caffeine))
/datum/reagent/ethanol/tequilla_sunrise
name = "Tequila Sunrise"
@@ -3581,7 +3747,7 @@
glass_name = "White Russian"
glass_desc = "A very nice looking drink. But that's just, like, your opinion, man."
allergen_type = ALLERGEN_COFFEE|ALLERGEN_GRAINS|ALLERGEN_DAIRY //Made from black russian(vodka(grains), kahlua(coffee)) and cream(dairy)
allergen_type = ALLERGEN_COFFEE|ALLERGEN_GRAINS|ALLERGEN_DAIRY|ALLERGEN_STIMULANT //Made from black russian(vodka(grains), kahlua(coffee/caffeine)) and cream(dairy)
/datum/reagent/ethanol/whiskey_cola
name = "Whiskey Cola"
@@ -3595,7 +3761,7 @@
glass_name = "whiskey cola"
glass_desc = "An innocent-looking mixture of cola and Whiskey. Delicious."
allergen_type = ALLERGEN_GRAINS //Made from whiskey(grains)
allergen_type = ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from whiskey(grains) and cola(caffeine)
/datum/reagent/ethanol/whiskeysoda
name = "Whiskey Soda"
@@ -3725,7 +3891,7 @@
glass_name = "Elysium Facepunch"
glass_desc = "A loathesome cocktail favored by Heaven's skeleton shift workers."
allergen_type = ALLERGEN_COFFEE|ALLERGEN_FRUIT //Made from kahlua(Coffee) and lemonjuice(fruit)
allergen_type = ALLERGEN_COFFEE|ALLERGEN_FRUIT|ALLERGEN_STIMULANT //Made from kahlua(Coffee/caffeine) and lemonjuice(fruit)
/datum/reagent/ethanol/erebusmoonrise
name = "Erebus Moonrise"
@@ -3792,7 +3958,7 @@
glass_name = "Xanadu Cannon"
glass_desc = "Common in the entertainment districts of Titan."
allergen_type = ALLERGEN_GRAINS //Made from ale(grain)
allergen_type = ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from ale(grain) and dr.gibb(caffeine)
/datum/reagent/ethanol/debugger
name = "Debugger"
@@ -3819,7 +3985,7 @@
glass_name = "Spacer's Brew"
glass_desc = "Ethanol and orange soda. A common emergency drink on frontier colonies."
allergen_type = ALLERGEN_FRUIT //Made from brownstar(orange juice(fruit))
allergen_type = ALLERGEN_FRUIT|ALLERGEN_STIMULANT //Made from brownstar(orange juice(fruit) + cola(caffeine)
/datum/reagent/ethanol/binmanbliss
name = "Binman Bliss"
@@ -3899,7 +4065,7 @@
glass_name = "Morning After"
glass_desc = "The finest hair of the dog, coming up!"
allergen_type = ALLERGEN_GRAINS|ALLERGEN_COFFEE //Made from sbiten(vodka(grain)) and coffee(coffee)
allergen_type = ALLERGEN_GRAINS|ALLERGEN_COFFEE|ALLERGEN_STIMULANT //Made from sbiten(vodka(grain)) and coffee(coffee/caffine)
/datum/reagent/ethanol/vesper
name = "Vesper"
@@ -3926,7 +4092,7 @@
glass_name = "Rotgut Fever Dream"
glass_desc = "Why are you doing this to yourself?"
allergen_type = ALLERGEN_GRAINS //Made from whiskey(grains) and vodka(grains)
allergen_type = ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from whiskey(grains), cola (caffeine) and vodka(grains)
/datum/reagent/ethanol/voxdelight
name = "Vox's Delight"
@@ -4138,7 +4304,7 @@
glass_name = "Cold Front"
glass_desc = "Minty, rich, and painfully cold. It's a blizzard in a cup."
allergen_type = ALLERGEN_COFFEE //Made from iced coffee(coffee)
allergen_type = ALLERGEN_COFFEE|ALLERGEN_STIMULANT //Made from iced coffee(coffee)
/datum/reagent/ethanol/mintjulep
name = "Mint Julep"
@@ -4235,7 +4401,7 @@
glass_icon = DRINK_ICON_NOISY
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_FRUIT //Made from space mountain wind(fruit), and holy wine(fruit)
allergen_type = ALLERGEN_FRUIT|ALLERGEN_STIMULANT //Made from space mountain wind(fruit), dr.gibb(caffine) and holy wine(fruit)
/datum/reagent/ethanol/angelskiss
name = "Angels Kiss"
@@ -4248,7 +4414,7 @@
glass_name = "Angel's Kiss"
glass_desc = "Miracle time!"
allergen_type = ALLERGEN_FRUIT|ALLERGEN_COFFEE //Made from holy wine(fruit), and kahlua(coffee)
allergen_type = ALLERGEN_FRUIT|ALLERGEN_COFFEE|ALLERGEN_STIMULANT //Made from holy wine(fruit), and kahlua(coffee)
/datum/reagent/ethanol/ichor_mead
name = "Ichor Mead"