From 2cb5ac701df3cea786bab013a6cee0a576fe96d7 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Fri, 19 Feb 2021 12:42:25 -0800 Subject: [PATCH] Diet/Allergy System Rework --- code/__defines/species_languages.dm | 13 + .../living/carbon/human/species/species.dm | 2 + .../carbon/human/species/station/station.dm | 2 + .../Chemistry-Reagents-Dispenser.dm | 8 + .../Chemistry-Reagents-Food-Drinks.dm | 335 ++++++++++++++++-- 5 files changed, 340 insertions(+), 20 deletions(-) diff --git a/code/__defines/species_languages.dm b/code/__defines/species_languages.dm index f6ca0ea5655..9b9c83d2569 100644 --- a/code/__defines/species_languages.dm +++ b/code/__defines/species_languages.dm @@ -24,6 +24,19 @@ #define EMP_TOX_DMG 0x80 // EMPs inflict toxin damage #define EMP_OXY_DMG 0x100 // EMPs inflict oxy damage +// Species allergens +#define MEAT 0x1 // Skrell won't like this. +#define FISH 0x2 // Seperate for completion's sake. Still bad for skrell. +#define FRUIT 0x4 // An apple a day only keeps the doctor away if they're allergic. +#define VEGETABLE 0x8 // Taters 'n' carrots. Potato allergy is a thing, apparently. +#define GRAINS 0x10 // Wheat, oats, etc. +#define BEANS 0x20 // The musical fruit! Includes soy. +#define SEEDS 0x40 // Hope you don't have a nut allergy. +#define DAIRY 0x80 // Lactose intolerance, ho! Also bad for skrell. +#define FUNGI 0x100 // Delicious shrooms. +#define COFFEE 0x200 // Mostly here for tajara. +#define GENERIC 0x400 // Catchall for stuff that doesn't fall into the groups above. You shouldn't be allergic to this type, ever. + // Species spawn flags #define SPECIES_IS_WHITELISTED 0x1 // Must be whitelisted to play. #define SPECIES_IS_RESTRICTED 0x2 // Is not a core/normally playable species. (castes, mutantraces) diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 9860b0c0113..de182ae8299 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -52,6 +52,8 @@ var/active_regen_mult = 1 // Multiplier for 'Regenerate' power speed, in human_powers.dm var/taste_sensitivity = TASTE_NORMAL // How sensitive the species is to minute tastes. + var/allergens = null // Things that will make this species very sick + var/allergen_severity = 0.5 // How bad are reactions to the allergen? This is raw toxin damage per metabolism tick, multiplied by the amount metabolized var/min_age = 17 var/max_age = 70 diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index 882a8b8e6d9..d509c9832d8 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -225,6 +225,7 @@ base_color = "#333333" reagent_tag = IS_TAJARA + allergens = COFFEE move_trail = /obj/effect/decal/cleanable/blood/tracks/paw @@ -312,6 +313,7 @@ breath_heat_level_3 = 1350 //Default 1250 reagent_tag = IS_SKRELL + allergens = MEAT|FISH|DAIRY has_limbs = list( BP_TORSO = list("path" = /obj/item/organ/external/chest), diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm index 15f846706b8..6ab4c055cdf 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm @@ -82,6 +82,8 @@ var/nutriment_factor = 0 var/strength = 10 // This is, essentially, units between stages - the lower, the stronger. Less fine tuning, more clarity. + var/allergen_type = GENERIC // What potential allergens does this contain? + var/allergen_factor = 0.5 // If the potential allergens are mixed and low-volume, they're a bit less dangerous. Needed for drinks because they're a single reagent compared to food which contains multiple seperate reagents. var/toxicity = 1 var/druggy = 0 @@ -139,6 +141,9 @@ if(halluci) M.hallucination = max(M.hallucination, halluci*3) + + if(M.species.allergens & allergen_type) + M.adjustToxLoss(((M.species.allergen_severity*allergen_factor)*4) * removed) /datum/reagent/ethanol/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) if(issmall(M)) removed *= 2 @@ -183,6 +188,9 @@ if(halluci) M.hallucination = max(M.hallucination, halluci) + + if(M.species.allergens & allergen_type) + M.adjustToxLoss((M.species.allergen_severity*allergen_factor) * removed) /datum/reagent/ethanol/touch_obj(var/obj/O) if(istype(O, /obj/item/weapon/paper)) 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 e8c39d05b0f..be5f13bc723 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -9,6 +9,7 @@ metabolism = REM * 4 ingest_met = REM * 4 var/nutriment_factor = 30 // Per unit + var/allergen_type = GENERIC // What potential allergens does this contain? var/injectable = 0 color = "#664330" @@ -40,7 +41,11 @@ if(!injectable && alien != IS_SLIME && alien != IS_CHIMERA) //VOREStation Edit M.adjustToxLoss(0.1 * removed) return + if(M.species.allergens & allergen_type) + M.adjustToxLoss((M.species.allergen_severity*4) * removed) + return affect_ingest(M, alien, removed) + ..() /datum/reagent/nutriment/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) switch(alien) @@ -48,10 +53,20 @@ if(IS_UNATHI) removed *= 0.5 if(IS_CHIMERA) removed *= 0.25 //VOREStation Edit if(issmall(M)) removed *= 2 // Small bodymass, more effect from lower volume. +<<<<<<< HEAD M.heal_organ_damage(0.5 * removed, 0) if(M.species.gets_food_nutrition) //VOREStation edit. If this is set to 0, they don't get nutrition from food. M.adjust_nutrition(nutriment_factor * removed) // For hunger and fatness M.add_chemical_effect(CE_BLOODRESTORE, 4 * removed) +======= + if(M.species.allergens & allergen_type) //uhoh, we can't digest this! + M.adjustToxLoss(M.species.allergen_severity * removed) + else //delicious + M.heal_organ_damage(0.5 * removed, 0) + M.adjust_nutrition(nutriment_factor * removed) + M.add_chemical_effect(CE_BLOODRESTORE, 4 * removed) + +>>>>>>> 2fcec80... Merge pull request #7864 from KillianKirilenko/kk-diet // Aurora Cooking Port Insertion Begin @@ -228,6 +243,7 @@ id = "cornoil" description = "An oil derived from various types of corn." reagent_state = LIQUID + allergen_type = VEGETABLE /datum/reagent/nutriment/triglyceride/oil/peanut name = "Peanut Oil" @@ -237,6 +253,7 @@ taste_mult = 0.3 nutriment_factor = 15 color = "#4F3500" + allergen_type = SEEDS // Aurora Cooking Port Insertion End @@ -253,11 +270,10 @@ id = "protein" taste_description = "some sort of meat" color = "#440000" + allergen_type = MEAT /datum/reagent/nutriment/protein/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) switch(alien) - if(IS_SKRELL) - M.adjustToxLoss(0.5 * removed) if(IS_TESHARI) ..(M, alien, removed*1.2) // Teshari get a bit more nutrition from meat. if(IS_UNATHI) @@ -269,41 +285,40 @@ else ..() -/datum/reagent/nutriment/protein/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - if(alien && alien == IS_SKRELL) - M.adjustToxLoss(2 * removed) - return - ..() - /datum/reagent/nutriment/protein/tofu name = "tofu protein" id = "tofu" color = "#fdffa8" taste_description = "tofu" + allergen_type = BEANS /datum/reagent/nutriment/protein/seafood name = "seafood protein" id = "seafood" color = "#f5f4e9" taste_description = "fish" + allergen_type = FISH -/datum/reagent/nutriment/protein/cheese // Also bad for skrell. +/datum/reagent/nutriment/protein/cheese name = "cheese" id = "cheese" color = "#EDB91F" taste_description = "cheese" + allergen_type = DAIRY -/datum/reagent/nutriment/protein/egg // Also bad for skrell. +/datum/reagent/nutriment/protein/egg name = "egg yolk" id = "egg" taste_description = "egg" color = "#FFFFAA" + allergen_type = DAIRY /datum/reagent/nutriment/protein/murk name = "murkfin protein" id = "murk_protein" taste_description = "mud" color = "#664330" + allergen_type = FISH /datum/reagent/nutriment/honey name = "Honey" @@ -341,6 +356,7 @@ taste_description = "unmistakably mayonnaise" nutriment_factor = 10 color = "#FFFFFF" + allergen_type = DAIRY //because egg /datum/reagent/nutriment/yeast name = "Yeast" @@ -358,6 +374,7 @@ reagent_state = SOLID nutriment_factor = 1 color = "#FFFFFF" + allergen_type = GRAINS /datum/reagent/nutriment/flour/touch_turf(var/turf/simulated/T) if(!istype(T, /turf/space)) @@ -371,6 +388,7 @@ taste_mult = 1.3 nutriment_factor = 1 color = "#482000" + allergen_type = COFFEE /datum/reagent/nutriment/tea name = "Tea Powder" @@ -397,6 +415,7 @@ description = "Dehydrated, powdered juice of some kind." taste_mult = 1.3 nutriment_factor = 1 + allergen_type = FRUIT /datum/reagent/nutriment/instantjuice/grape name = "Grape Juice Powder" @@ -473,6 +492,7 @@ reagent_state = LIQUID nutriment_factor = 1 color = "#801E28" + allergen_type = FRUIT /datum/reagent/nutriment/peanutbutter name = "Peanut Butter" @@ -483,6 +503,7 @@ reagent_state = LIQUID nutriment_factor = 30 color = "#4F3500" + allergen_type = SEEDS /datum/reagent/nutriment/vanilla name = "Vanilla Extract" @@ -528,6 +549,7 @@ reagent_state = LIQUID nutriment_factor = 2 color = "#899613" + allergen_type = DAIRY //incase anyone is dumb enough to drink it - it does contain milk! /datum/reagent/nutriment/sprinkles name = "Sprinkles" @@ -859,16 +881,23 @@ var/adj_sleepy = 0 var/adj_temp = 0 var/water_based = TRUE + var/allergen_type = GENERIC // What potential allergens does this contain? + var/allergen_factor = 1 // If the potential allergens are mixed and low-volume, they're a bit less dangerous. Needed for drinks because they're a single reagent compared to food which contains multiple seperate reagents. /datum/reagent/drink/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) var/strength_mod = 1 if(alien == IS_SLIME && water_based) strength_mod = 3 M.adjustToxLoss(removed * strength_mod) // Probably not a good idea; not very deadly though + if(M.species.allergens & allergen_type) // Unless you're allergic, in which case... + M.adjustToxLoss(((M.species.allergen_severity*allergen_factor)*2) * removed) return /datum/reagent/drink/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) - M.adjust_nutrition(nutrition * removed) + if(M.species.allergens & allergen_type) + M.adjustToxLoss((M.species.allergen_severity*allergen_factor) * removed) + else //delicious + M.adjust_nutrition(nutrition * removed) M.dizziness = max(0, M.dizziness + adj_dizzy) M.drowsyness = max(0, M.drowsyness + adj_drowsy) M.AdjustSleeping(adj_sleepy) @@ -925,6 +954,7 @@ glass_name = "carrot juice" glass_desc = "It is just like a carrot but without crunching." + allergen_type = VEGETABLE /datum/reagent/drink/juice/carrot/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() @@ -939,6 +969,7 @@ glass_name = "grape juice" glass_desc = "It's grrrrrape!" + allergen_type = FRUIT /datum/reagent/drink/juice/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() @@ -1039,6 +1070,7 @@ glass_name = "potato juice" glass_desc = "Juice from a potato. Bleh." + allergen_type = VEGETABLE /datum/reagent/drink/juice/tomato name = "Tomato Juice" @@ -1081,6 +1113,7 @@ cup_icon_state = "cup_cream" cup_name = "cup of milk" cup_desc = "White and nutritious goodness!" + allergen_type = DAIRY /datum/reagent/drink/milk/chocolate name = "Chocolate Milk" @@ -1096,7 +1129,6 @@ glass_name = "chocolate milk" glass_desc = "Deliciously fattening!" - /datum/reagent/drink/milk/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() if(alien == IS_DIONA) @@ -1117,6 +1149,7 @@ cup_icon_state = "cup_cream" cup_name = "cup of cream" cup_desc = "Ewwww..." + allergen_type = DAIRY /datum/reagent/drink/milk/soymilk name = "Soy Milk" @@ -1131,6 +1164,7 @@ cup_icon_state = "cup_cream" cup_name = "cup of milk" cup_desc = "White and nutritious goodness!" + allergen_type = FRUIT /datum/reagent/drink/tea name = "Tea" @@ -1215,6 +1249,7 @@ cup_name = "cup of lemon tea" cup_desc = "A tasty mixture of lemon and tea. It's apparently good for you!" + allergen_type = FRUIT /datum/reagent/drink/tea/limetea name = "Lime Tea" @@ -1228,6 +1263,7 @@ cup_name = "cup of lime tea" cup_desc = "A tasty mixture of lime and tea. It's apparently good for you!" + allergen_type = FRUIT /datum/reagent/drink/tea/orangetea name = "Orange Tea" @@ -1241,6 +1277,7 @@ cup_name = "cup of orange tea" cup_desc = "A tasty mixture of orange and tea. It's apparently good for you!" + allergen_type = FRUIT /datum/reagent/drink/tea/berrytea name = "Berry Tea" @@ -1254,6 +1291,7 @@ cup_name = "cup of berry tea" cup_desc = "A tasty mixture of berries and tea. It's apparently good for you!" + allergen_type = FRUIT /datum/reagent/drink/greentea name = "Green Tea" @@ -1300,24 +1338,35 @@ glass_name = "coffee" glass_desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere." - + allergen_type = COFFEE /datum/reagent/drink/coffee/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) if(alien == IS_DIONA) return ..() +<<<<<<< HEAD //if(alien == IS_TAJARA) //VOREStation Edit Begin //M.adjustToxLoss(0.5 * removed) //M.make_jittery(4) //extra sensitive to caffine +======= + if(alien == IS_TAJARA) + M.make_jittery(4) //extra sensitive to caffine +>>>>>>> 2fcec80... Merge pull request #7864 from KillianKirilenko/kk-diet if(adj_temp > 0) holder.remove_reagent("frostoil", 10 * removed) /datum/reagent/drink/coffee/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) ..() +<<<<<<< HEAD //if(alien == IS_TAJARA) //M.adjustToxLoss(2 * removed) //M.make_jittery(4) //return +======= + if(alien == IS_TAJARA) + M.make_jittery(4) + return +>>>>>>> 2fcec80... Merge pull request #7864 from KillianKirilenko/kk-diet /datum/reagent/drink/coffee/overdose(var/mob/living/carbon/M, var/alien) if(alien == IS_DIONA) @@ -1366,11 +1415,11 @@ glass_desc = "A nice and refreshing beverage while you are reading." glass_name = "soy latte" - glass_desc = "A nice and refrshing beverage while you are reading." cup_icon_state = "cup_latte" cup_name = "cup of soy latte" cup_desc = "A nice and refreshing beverage while you are reading." + allergen_type = COFFEE|BEANS /datum/reagent/drink/coffee/soy_latte/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() @@ -1390,6 +1439,7 @@ cup_icon_state = "cup_latte" cup_name = "cup of cafe latte" cup_desc = "A nice and refreshing beverage while you are reading." + allergen_type = COFFEE|DAIRY /datum/reagent/drink/coffee/cafe_latte/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() @@ -1453,6 +1503,7 @@ glass_name = "grape soda" glass_desc = "Looks like a delicious drink!" glass_special = list(DRINK_FIZZ) + allergen_type = FRUIT /datum/reagent/drink/soda/tonic name = "Tonic Water" @@ -1480,6 +1531,7 @@ glass_name = "lemonade" glass_desc = "Oh the nostalgia..." glass_special = list(DRINK_FIZZ) + allergen_type = FRUIT /datum/reagent/drink/soda/melonade name = "Melonade" @@ -1492,6 +1544,7 @@ glass_name = "melonade" glass_desc = "Oh the.. nostalgia?" glass_special = list(DRINK_FIZZ) + allergen_type = FRUIT /datum/reagent/drink/soda/appleade name = "Appleade" @@ -1504,6 +1557,7 @@ glass_name = "appleade" glass_desc = "Applejuice, improved." glass_special = list(DRINK_FIZZ) + allergen_type = FRUIT /datum/reagent/drink/soda/pineappleade name = "Pineappleade" @@ -1516,6 +1570,7 @@ glass_name = "pineappleade" glass_desc = "Pineapple, juiced up." glass_special = list(DRINK_FIZZ) + allergen_type = FRUIT /datum/reagent/drink/soda/kiraspecial name = "Kira Special" @@ -1539,6 +1594,7 @@ glass_name = "Brown Star" glass_desc = "It's not what it sounds like..." + allergen_type = FRUIT /datum/reagent/drink/milkshake name = "Milkshake" @@ -1550,6 +1606,7 @@ glass_name = "milkshake" glass_desc = "Glorious brainfreezing mixture." + allergen_type = DAIRY /datum/reagent/milkshake/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() @@ -1582,6 +1639,7 @@ glass_name = "Chocolate Milkshake" glass_desc = "A refreshing chocolate milkshake, just like mom used to make." + allergen_type = DAIRY /datum/reagent/drink/milkshake/berryshake name = "Berry Milkshake" @@ -1593,6 +1651,7 @@ glass_name = "Berry Milkshake" glass_desc = "A refreshing berry milkshake, just like mom used to make." + allergen_type = FRUIT|DAIRY /datum/reagent/drink/milkshake/coffeeshake name = "Coffee Milkshake" @@ -1605,9 +1664,9 @@ adj_drowsy = -3 adj_sleepy = -2 - glass_name = "Coffee Milkshake" glass_desc = "An energizing coffee milkshake, perfect for hot days at work.." + allergen_type = DAIRY|COFFEE /datum/reagent/drink/milkshake/coffeeshake/overdose(var/mob/living/carbon/M, var/alien) M.make_jittery(5) @@ -1621,6 +1680,7 @@ glass_name = "Peanut Milkshake" glass_desc = "Savory cream in an ice-cold stature." + allergen_type = SEEDS|DAIRY /datum/reagent/drink/rewriter name = "Rewriter" @@ -1632,6 +1692,7 @@ glass_name = "Rewriter" glass_desc = "The secret of the sanctuary of the Libarian..." + allergen_type = FRUIT|COFFEE /datum/reagent/drink/rewriter/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() @@ -1696,6 +1757,7 @@ 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 = FRUIT /datum/reagent/drink/soda/dr_gibb name = "Dr. Gibb" @@ -1720,6 +1782,7 @@ glass_name = "Space-up" glass_desc = "Space-up. It helps keep your cool." glass_special = list(DRINK_FIZZ) + allergen_type = FRUIT /datum/reagent/drink/soda/lemon_lime name = "Lemon-Lime" @@ -1732,6 +1795,7 @@ glass_name = "lemon lime soda" glass_desc = "A tangy substance made of 0.5% natural citrus!" glass_special = list(DRINK_FIZZ) + allergen_type = FRUIT /datum/reagent/drink/soda/gingerale name = "Ginger Ale" @@ -1788,6 +1852,7 @@ glass_name = "roy rogers" glass_desc = "I'm a cowboy, on a steel horse I ride" glass_special = list(DRINK_FIZZ) + allergen_type = FRUIT /datum/reagent/drink/collins_mix name = "Collins Mix" @@ -1800,6 +1865,7 @@ glass_name = "collins mix" glass_desc = "Best hope it isn't a hoax." glass_special = list(DRINK_FIZZ) + allergen_type = FRUIT /datum/reagent/drink/arnold_palmer name = "Arnold Palmer" @@ -1812,6 +1878,7 @@ glass_name = "arnold palmer" glass_desc = "Tastes just like the old man." glass_special = list(DRINK_FIZZ) + allergen_type = FRUIT /datum/reagent/drink/doctor_delight name = "The Doctor's Delight" @@ -1824,6 +1891,7 @@ glass_name = "The Doctor's Delight" glass_desc = "A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place." + allergen_type = FRUIT /datum/reagent/drink/doctor_delight/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() @@ -1932,6 +2000,7 @@ glass_name = "Dream Cream" glass_desc = "A smoothy, silky mix of honey and dairy." + allergen_type = FRUIT|DAIRY /datum/reagent/drink/soda/vilelemon name = "Vile Lemon" @@ -1943,6 +2012,7 @@ glass_name = "Vile Lemon" glass_desc = "A sour, fizzy drink with lemonade and lemonlime." glass_special = list(DRINK_FIZZ) + allergen_type = FRUIT /datum/reagent/drink/entdraught name = "Ent's Draught" @@ -1953,6 +2023,7 @@ glass_name = "Ent's Draught" glass_desc = "You can almost smell the tranquility emanating from this." + allergen_type = FRUIT /datum/reagent/drink/lovepotion name = "Love Potion" @@ -1963,6 +2034,7 @@ glass_name = "Love Potion" glass_desc = "Love me tender, love me sweet." + allergen_type = FRUIT|DAIRY /datum/reagent/drink/oilslick name = "Oil Slick" @@ -1975,6 +2047,7 @@ glass_name = "Oil Slick" glass_desc = "A concoction that should probably be in an engine, rather than your stomach." glass_icon = DRINK_ICON_NOISY + allergen_type = VEGETABLE|FRUIT /datum/reagent/drink/slimeslammer name = "Slick Slimes Slammer" @@ -1987,6 +2060,7 @@ glass_name = "Slick Slime Slammer" glass_desc = "A concoction that should probably be in an engine, rather than your stomach. Still." glass_icon = DRINK_ICON_NOISY + allergen_type = VEGETABLE|SEEDS /datum/reagent/drink/eggnog name = "Eggnog" @@ -1997,6 +2071,7 @@ glass_name = "Eggnog" glass_desc = "You can't egg-nore the holiday cheer all around you" + allergen_type = DAIRY /datum/reagent/drink/nuclearwaste name = "Nuclear Waste" @@ -2035,6 +2110,7 @@ glass_desc = "A pitiful sludge that looks vaguely like a soda.. if you look at it a certain way." glass_icon = DRINK_ICON_NOISY glass_special = list(DRINK_FIZZ) + allergen_type = VEGETABLE /datum/reagent/drink/sodaoil/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) ..() @@ -2074,6 +2150,7 @@ glass_name = "sex on the beach" glass_desc = "A secret combination of orange juice and pomegranate." + allergen_type = FRUIT /datum/reagent/drink/driverspunch name = "Driver's Punch" @@ -2085,6 +2162,7 @@ glass_name = "driver`s punch" glass_desc = "A fruity punch!" glass_special = list(DRINK_FIZZ) + allergen_type = FRUIT /datum/reagent/drink/mintapplesparkle name = "Mint Apple Sparkle" @@ -2096,6 +2174,7 @@ glass_name = "mint apple sparkle" glass_desc = "Delicious appleade with a touch of mint." glass_special = list(DRINK_FIZZ) + allergen_type = FRUIT /datum/reagent/drink/berrycordial name = "Berry Cordial" @@ -2107,6 +2186,7 @@ glass_name = "berry cordial" glass_desc = "How berry cordial of you." glass_icon = DRINK_ICON_NOISY + allergen_type = FRUIT /datum/reagent/drink/tropicalfizz name = "Tropical Fizz" @@ -2119,6 +2199,7 @@ glass_desc = "One sip and you're in the bahamas." glass_icon = DRINK_ICON_NOISY glass_special = list(DRINK_FIZZ) + allergen_type = FRUIT /datum/reagent/drink/fauxfizz name = "Faux Fizz" @@ -2131,6 +2212,7 @@ glass_desc = "One sip and you're in the bahamas... maybe." glass_icon = DRINK_ICON_NOISY glass_special = list(DRINK_FIZZ) + allergen_type = FRUIT /* Alcohol */ @@ -2160,6 +2242,8 @@ glass_name = "ale" glass_desc = "A freezing pint of delicious ale" + allergen_type = GRAINS + /datum/reagent/ethanol/beer name = "Beer" id = "beer" @@ -2172,6 +2256,8 @@ glass_name = "beer" glass_desc = "A freezing pint of beer" + allergen_type = GRAINS + /datum/reagent/ethanol/beer/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() if(alien == IS_DIONA) @@ -2190,6 +2276,8 @@ glass_name = "lite beer" glass_desc = "A freezing pint of lite beer" + allergen_type = GRAINS + /datum/reagent/ethanol/bluecuracao name = "Blue Curacao" id = "bluecuracao" @@ -2202,6 +2290,8 @@ glass_name = "blue curacao" glass_desc = "Exotically blue, fruity drink, distilled from oranges." + allergen_type = FRUIT + /datum/reagent/ethanol/cognac name = "Cognac" id = "cognac" @@ -2214,6 +2304,8 @@ glass_name = "cognac" glass_desc = "Damn, you feel like some kind of French aristocrat just by holding this." + allergen_type = FRUIT + /datum/reagent/ethanol/deadrum name = "Deadrum" id = "deadrum" @@ -2254,9 +2346,12 @@ glass_name = "gin" glass_desc = "A crystal clear glass of Griffeater gin." + allergen_type = FRUIT + //Base type for alchoholic drinks containing coffee /datum/reagent/ethanol/coffee overdose = 45 + allergen_type = COFFEE /datum/reagent/ethanol/coffee/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) if(alien == IS_DIONA) @@ -2267,6 +2362,7 @@ M.AdjustSleeping(-2) if(M.bodytemperature > 310) M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) +<<<<<<< HEAD //if(alien == IS_TAJARA) //M.adjustToxLoss(0.5 * removed) //M.make_jittery(4) //extra sensitive to caffine @@ -2276,6 +2372,15 @@ //M.adjustToxLoss(2 * removed) //M.make_jittery(4) //return +======= + if(alien == IS_TAJARA) + M.make_jittery(4) //extra sensitive to caffine + +/datum/reagent/ethanol/coffee/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + if(alien == IS_TAJARA) + M.make_jittery(4) + return +>>>>>>> 2fcec80... Merge pull request #7864 from KillianKirilenko/kk-diet ..() /datum/reagent/ethanol/coffee/overdose(var/mob/living/carbon/M, var/alien) @@ -2310,6 +2415,8 @@ glass_name = "melon liquor" glass_desc = "A relatively sweet and fruity 46 proof liquor." + allergen_type = FRUIT + /datum/reagent/ethanol/melonspritzer name = "Melon Spritzer" id = "melonspritzer" @@ -2322,6 +2429,8 @@ glass_desc = "Melons: Citrus style." glass_special = list(DRINK_FIZZ) + allergen_type = FRUIT + /datum/reagent/ethanol/rum name = "Rum" id = "rum" @@ -2356,6 +2465,8 @@ glass_name = "sex on the beach" glass_desc = "A concoction of vodka and a secret combination of orange juice and pomegranate." + allergen_type = FRUIT + /datum/reagent/ethanol/tequila name = "Tequila" id = "tequilla" @@ -2411,6 +2522,8 @@ glass_name = "vodka" glass_desc = "The glass contain wodka. Xynta." + allergen_type = GRAINS + /datum/reagent/ethanol/vodka/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() M.apply_effect(max(M.radiation - 1 * removed, 0), IRRADIATE, check_protection = 0) @@ -2426,6 +2539,8 @@ glass_name = "whiskey" glass_desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy." + allergen_type = GRAINS + /datum/reagent/ethanol/wine name = "Wine" id = "wine" @@ -2437,6 +2552,8 @@ glass_name = "wine" glass_desc = "A very classy looking drink." + allergen_type = FRUIT + /datum/reagent/ethanol/wine/champagne name = "Champagne" id = "champagne" @@ -2447,6 +2564,7 @@ glass_name = "champagne" glass_desc = "An even classier looking drink." + allergen_type = FRUIT /datum/reagent/ethanol/cider name = "Cider" @@ -2460,6 +2578,8 @@ glass_desc = "The second most Irish drink." glass_special = list(DRINK_FIZZ) + allergen_type = FRUIT + // Cocktails @@ -2475,6 +2595,8 @@ glass_name = "Acid Spit" glass_desc = "A drink from the company archives. Made from live aliens." + allergen_type = FRUIT + /datum/reagent/ethanol/alliescocktail name = "Allies Cocktail" id = "alliescocktail" @@ -2486,6 +2608,8 @@ glass_name = "Allies cocktail" glass_desc = "A drink made from your allies." + allergen_type = GRAINS + /datum/reagent/ethanol/aloe name = "Aloe" id = "aloe" @@ -2497,6 +2621,8 @@ glass_name = "Aloe" glass_desc = "Very, very, very good." + allergen_type = FRUIT|DAIRY|GRAINS + /datum/reagent/ethanol/amasec name = "Amasec" id = "amasec" @@ -2509,6 +2635,8 @@ glass_name = "Amasec" glass_desc = "Always handy before combat!" + allergen_type = FRUIT|GRAINS + /datum/reagent/ethanol/andalusia name = "Andalusia" id = "andalusia" @@ -2520,6 +2648,8 @@ glass_name = "Andalusia" glass_desc = "A nice, strange named drink." + allergen_type = GRAINS|FRUIT + /datum/reagent/ethanol/antifreeze name = "Anti-freeze" id = "antifreeze" @@ -2533,6 +2663,8 @@ glass_name = "Anti-freeze" glass_desc = "The ultimate refreshment." + allergen_type = GRAINS|DAIRY + /datum/reagent/ethanol/atomicbomb name = "Atomic Bomb" id = "atomicbomb" @@ -2546,6 +2678,8 @@ glass_name = "Atomic Bomb" glass_desc = "We cannot take legal responsibility for your actions after imbibing." + allergen_type = COFFEE|DAIRY + /datum/reagent/ethanol/coffee/b52 name = "B-52" id = "b52" @@ -2558,6 +2692,8 @@ glass_name = "B-52" glass_desc = "Kahlua, Irish cream, and cognac. You will get bombed." + allergen_type = COFFEE|DAIRY + /datum/reagent/ethanol/bahama_mama name = "Bahama mama" id = "bahama_mama" @@ -2569,6 +2705,8 @@ glass_name = "Bahama Mama" glass_desc = "Tropical cocktail." + allergen_type = FRUIT + /datum/reagent/ethanol/bananahonk name = "Banana Mama" id = "bananahonk" @@ -2581,6 +2719,8 @@ glass_name = "Banana Honk" glass_desc = "A drink from Banana Heaven." + allergen_type = FRUIT|DAIRY + /datum/reagent/ethanol/barefoot name = "Barefoot" id = "barefoot" @@ -2592,6 +2732,8 @@ glass_name = "Barefoot" glass_desc = "Barefoot and pregnant." + allergen_type = DAIRY|FRUIT + /datum/reagent/ethanol/beepsky_smash name = "Beepsky Smash" id = "beepskysmash" @@ -2605,6 +2747,8 @@ glass_name = "Beepsky Smash" glass_desc = "Heavy, hot and strong. Just like the Iron fist of the LAW." + allergen_type = FRUIT|GRAINS + /datum/reagent/ethanol/beepsky_smash/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() M.Stun(2) @@ -2621,6 +2765,8 @@ glass_name = "bilk" glass_desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis." + allergen_type = GRAINS|DAIRY + /datum/reagent/ethanol/black_russian name = "Black Russian" id = "blackrussian" @@ -2632,6 +2778,8 @@ glass_name = "Black Russian" glass_desc = "For the lactose-intolerant. Still as classy as a White Russian." + allergen_type = COFFEE|GRAINS + /datum/reagent/ethanol/bloody_mary name = "Bloody Mary" id = "bloodymary" @@ -2643,6 +2791,8 @@ glass_name = "Bloody Mary" glass_desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder." + allergen_type = GRAINS|FRUIT + /datum/reagent/ethanol/booger name = "Booger" id = "booger" @@ -2654,6 +2804,8 @@ glass_name = "Booger" glass_desc = "Ewww..." + allergen_type = DAIRY|FRUIT + /datum/reagent/ethanol/coffee/brave_bull name = "Brave Bull" id = "bravebull" @@ -2677,6 +2829,8 @@ glass_name = "Changeling Sting" glass_desc = "A stingy drink." + allergen_type = FRUIT|GRAINS + /datum/reagent/ethanol/martini name = "Classic Martini" id = "martini" @@ -2688,6 +2842,8 @@ glass_name = "classic martini" glass_desc = "Damn, the bartender even stirred it, not shook it." + allergen_type = FRUIT + /datum/reagent/ethanol/cuba_libre name = "Cuba Libre" id = "cubalibre" @@ -2745,6 +2901,8 @@ glass_name = "gin fizz" glass_desc = "Refreshingly lemony, deliciously dry." + allergen_type = FRUIT + /datum/reagent/ethanol/grog name = "Grog" id = "grog" @@ -2754,7 +2912,6 @@ color = "#FFBB00" strength = 100 - glass_name = "grog" glass_desc = "A fine and cepa drink for Space." @@ -2769,6 +2926,8 @@ glass_name = "Erika Surprise" glass_desc = "The surprise is, it's green!" + allergen_type = GRAINS|FRUIT + /datum/reagent/ethanol/gargle_blaster name = "Pan-Galactic Gargle Blaster" id = "gargleblaster" @@ -2783,6 +2942,8 @@ glass_name = "Pan-Galactic Gargle Blaster" glass_desc = "Does... does this mean that Arthur and Ford are on the station? Oh joy." + allergen_type = FRUIT|GRAINS + /datum/reagent/ethanol/gintonic name = "Gin and Tonic" id = "gintonic" @@ -2794,6 +2955,8 @@ glass_name = "gin and tonic" glass_desc = "A mild but still great cocktail. Drink up, like a true Englishman." + allergen_type = FRUIT + /datum/reagent/ethanol/goldschlager name = "Goldschlager" id = "goldschlager" @@ -2806,6 +2969,8 @@ glass_name = "Goldschlager" glass_desc = "100 proof that teen girls will drink anything with gold in it." + allergen_type = GRAINS + /datum/reagent/ethanol/hippies_delight name = "Hippies' Delight" id = "hippiesdelight" @@ -2819,6 +2984,8 @@ glass_name = "Hippie's Delight" glass_desc = "A drink enjoyed by people during the 1960's." + allergen_type = FRUIT|GRAINS|FUNGI + /datum/reagent/ethanol/hooch name = "Hooch" id = "hooch" @@ -2856,6 +3023,8 @@ glass_name = "Irish Car Bomb" glass_desc = "An irish car bomb." + allergen_type = DAIRY|GRAINS + /datum/reagent/ethanol/coffee/irishcoffee name = "Irish Coffee" id = "irishcoffee" @@ -2867,6 +3036,8 @@ glass_name = "Irish coffee" glass_desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning." + allergen_type = COFFEE|DAIRY + /datum/reagent/ethanol/irish_cream name = "Irish Cream" id = "irishcream" @@ -2878,6 +3049,8 @@ glass_name = "Irish cream" glass_desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?" + allergen_type = DAIRY + /datum/reagent/ethanol/longislandicedtea name = "Long Island Iced Tea" id = "longislandicedtea" @@ -2889,6 +3062,8 @@ 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 = GRAINS|FRUIT + /datum/reagent/ethanol/manhattan name = "Manhattan" id = "manhattan" @@ -2900,6 +3075,8 @@ glass_name = "Manhattan" glass_desc = "The Detective's undercover drink of choice. He never could stomach gin..." + allergen_type = GRAINS + /datum/reagent/ethanol/manhattan_proj name = "Manhattan Project" id = "manhattan_proj" @@ -2923,6 +3100,8 @@ glass_name = "The Manly Dorf" glass_desc = "A manly concotion made from Ale and Beer. Intended for true men only." + allergen_type = GRAINS + /datum/reagent/ethanol/margarita name = "Margarita" id = "margarita" @@ -2934,6 +3113,8 @@ glass_name = "margarita" glass_desc = "On the rocks with salt on the rim. Arriba~!" + allergen_type = FRUIT + /datum/reagent/ethanol/mead name = "Mead" id = "mead" @@ -2973,6 +3154,8 @@ glass_icon = DRINK_ICON_NOISY glass_special = list("neuroright") + allergen_type = FRUIT|GRAINS + /datum/reagent/ethanol/neurotoxin/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() M.Weaken(3) @@ -3037,6 +3220,8 @@ glass_name = "Sbiten" glass_desc = "A spicy mix of Vodka and Spice. Very hot." + allergen_type = GRAINS + /datum/reagent/ethanol/screwdrivercocktail name = "Screwdriver" id = "screwdrivercocktail" @@ -3048,6 +3233,8 @@ glass_name = "Screwdriver" glass_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer." + allergen_type = FRUIT|GRAINS + /datum/reagent/ethanol/silencer name = "Silencer" id = "silencer" @@ -3072,6 +3259,8 @@ glass_name = "Singulo" glass_desc = "A blue-space beverage." + allergen_type = GRAINS|FRUIT + /datum/reagent/ethanol/snowwhite name = "Snow White" id = "snowwhite" @@ -3083,6 +3272,8 @@ glass_name = "Snow White" glass_desc = "A cold refreshment." + allergen_type = GRAINS|FRUIT + /datum/reagent/ethanol/suidream name = "Sui Dream" id = "suidream" @@ -3094,6 +3285,8 @@ glass_name = "Sui Dream" glass_desc = "A froofy, fruity, and sweet mixed drink. Understanding the name only brings shame." + allergen_type = FRUIT + /datum/reagent/ethanol/syndicatebomb name = "Syndicate Bomb" id = "syndicatebomb" @@ -3105,6 +3298,8 @@ glass_name = "Syndicate Bomb" glass_desc = "Tastes like terrorism!" + allergen_type = GRAINS + /datum/reagent/ethanol/tequilla_sunrise name = "Tequila Sunrise" id = "tequillasunrise" @@ -3116,6 +3311,8 @@ glass_name = "Tequilla Sunrise" glass_desc = "Oh great, now you feel nostalgic about sunrises back on Earth..." + allergen_type = FRUIT + /datum/reagent/ethanol/threemileisland name = "Three Mile Island Iced Tea" id = "threemileisland" @@ -3128,6 +3325,8 @@ glass_name = "Three Mile Island iced tea" glass_desc = "A glass of this is sure to prevent a meltdown." + allergen_type = GRAINS|FRUIT + /datum/reagent/ethanol/toxins_special name = "Toxins Special" id = "phoronspecial" @@ -3153,6 +3352,7 @@ glass_name = "vodka martini" glass_desc ="A bastardization of the classic martini. Still great." + allergen_type = GRAINS /datum/reagent/ethanol/vodkatonic name = "Vodka and Tonic" @@ -3165,6 +3365,7 @@ glass_name = "vodka and tonic" glass_desc = "For when a gin and tonic isn't Russian enough." + allergen_type = GRAINS /datum/reagent/ethanol/white_russian name = "White Russian" @@ -3177,6 +3378,7 @@ glass_name = "White Russian" glass_desc = "A very nice looking drink. But that's just, like, your opinion, man." + allergen_type = COFFEE|GRAINS|DAIRY /datum/reagent/ethanol/whiskey_cola name = "Whiskey Cola" @@ -3189,6 +3391,7 @@ glass_name = "whiskey cola" glass_desc = "An innocent-looking mixture of cola and Whiskey. Delicious." + allergen_type = GRAINS /datum/reagent/ethanol/whiskeysoda name = "Whiskey Soda" @@ -3201,6 +3404,8 @@ glass_name = "whiskey soda" glass_desc = "Ultimate refreshment." + allergen_type = GRAINS + /datum/reagent/ethanol/specialwhiskey // I have no idea what this is and where it comes from name = "Special Blend Whiskey" id = "specialwhiskey" @@ -3212,6 +3417,8 @@ glass_name = "special blend whiskey" glass_desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything." + allergen_type = GRAINS + /datum/reagent/ethanol/unathiliquor name = "Redeemer's Brew" id = "unathiliquor" @@ -3248,6 +3455,8 @@ glass_name = "Sake Bomb" glass_desc = "Some sake mixed into a pint of beer." + allergen_type = GRAINS + /datum/reagent/ethanol/tamagozake name = "Tamagozake" id = "tamagozake" @@ -3260,6 +3469,8 @@ glass_name = "Tamagozake" glass_desc = "An egg cracked into sake and sugar." + allergen_type = GRAINS|DAIRY + /datum/reagent/ethanol/ginzamary name = "Ginza Mary" id = "ginzamary" @@ -3271,6 +3482,8 @@ glass_name = "Ginza Mary" glass_desc = "Tomato juice, vodka, and sake make something not quite completely unlike a Bloody Mary." + allergen_type = FRUIT|GRAINS + /datum/reagent/ethanol/tokyorose name = "Tokyo Rose" id = "tokyorose" @@ -3282,6 +3495,8 @@ glass_name = "Tokyo Rose" glass_desc = "It's kinda pretty!" + allergen_type = GRAINS|FRUIT + /datum/reagent/ethanol/saketini name = "Saketini" id = "saketini" @@ -3293,16 +3508,20 @@ glass_name = "Saketini" glass_desc = "What are you doing drinking this outside of New Kyoto?" + allergen_type = GRAINS + /datum/reagent/ethanol/coffee/elysiumfacepunch name = "Elysium Facepunch" id = "elysiumfacepunch" - description = "A lothesome cocktail favored by Heaven's skeleton shift workers." + description = "A loathesome cocktail favored by Heaven's skeleton shift workers." taste_description = "sour coffee" color = "#8f7729" strength = 20 glass_name = "Elysium Facepunch" - glass_desc = "A lothesome cocktail favored by Heaven's skeleton shift workers." + glass_desc = "A loathesome cocktail favored by Heaven's skeleton shift workers." + + allergen_type = COFFEE|FRUIT /datum/reagent/ethanol/erebusmoonrise name = "Erebus Moonrise" @@ -3315,6 +3534,8 @@ glass_name = "Erebus Moonrise" glass_desc = "A deeply alcoholic mix, popular in Nyx." + allergen_type = GRAINS + /datum/reagent/ethanol/balloon name = "Balloon" id = "balloon" @@ -3326,6 +3547,8 @@ glass_name = "Balloon" glass_desc = "A strange drink invented in the aerostats of Venus." + allergen_type = DAIRY|FRUIT + /datum/reagent/ethanol/natunabrandy name = "Natuna Brandy" id = "natunabrandy" @@ -3338,6 +3561,8 @@ glass_desc = "On Natuna, they do the best with what they have." glass_special = list(DRINK_FIZZ) + allergen_type = GRAINS + /datum/reagent/ethanol/euphoria name = "Euphoria" id = "euphoria" @@ -3349,6 +3574,8 @@ glass_name = "Euphoria" glass_desc = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existence." + allergen_type = GRAINS|FRUIT + /datum/reagent/ethanol/xanaducannon name = "Xanadu Cannon" id = "xanaducannon" @@ -3360,6 +3587,8 @@ glass_name = "Xanadu Cannon" glass_desc = "Common in the entertainment districts of Titan." + allergen_type = GRAINS + /datum/reagent/ethanol/debugger name = "Debugger" id = "debugger" @@ -3382,6 +3611,8 @@ glass_name = "Spacer's Brew" glass_desc = "Ethanol and orange soda. A common emergency drink on frontier colonies." + allergen_type = FRUIT + /datum/reagent/ethanol/binmanbliss name = "Binman Bliss" id = "binmanbliss" @@ -3393,6 +3624,8 @@ glass_name = "Binman Bliss" glass_desc = "A dry cocktail popular on Binma." + allergen_type = GRAINS + /datum/reagent/ethanol/chrysanthemum name = "Chrysanthemum" id = "chrysanthemum" @@ -3404,6 +3637,8 @@ glass_name = "Chrysanthemum" glass_desc = "An exotic cocktail from New Kyoto." + allergen_type = GRAINS|FRUIT + /datum/reagent/ethanol/bitters name = "Bitters" id = "bitters" @@ -3415,6 +3650,8 @@ glass_name = "Bitters" glass_desc = "A blend of fermented fruits and herbs, commonly used in cocktails." + allergen_type = FRUIT + /datum/reagent/ethanol/soemmerfire name = "Soemmer Fire" id = "soemmerfire" @@ -3426,6 +3663,8 @@ glass_name = "Soemmer Fire" glass_desc = "A painfully hot mixed drink, for when you absolutely need to hurt right now." + allergen_type = GRAINS + /datum/reagent/drink/soemmerfire/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() if(alien == IS_DIONA) @@ -3443,6 +3682,8 @@ glass_name = "Wine Brandy" glass_desc = "A very classy looking after-dinner drink." + allergen_type = FRUIT + /datum/reagent/ethanol/morningafter name = "Morning After" id = "morningafter" @@ -3454,6 +3695,8 @@ glass_name = "Morning After" glass_desc = "The finest hair of the dog, coming up!" + allergen_type = GRAINS + /datum/reagent/ethanol/vesper name = "Vesper" id = "vesper" @@ -3465,6 +3708,8 @@ glass_name = "Vesper" glass_desc = "A dry martini, ice cold and well shaken." + allergen_type = FRUIT|GRAINS + /datum/reagent/ethanol/rotgut name = "Rotgut Fever Dream" id = "rotgut" @@ -3476,6 +3721,8 @@ glass_name = "Rotgut Fever Dream" glass_desc = "Why are you doing this to yourself?" + allergen_type = GRAINS + /datum/reagent/ethanol/voxdelight name = "Vox's Delight" id = "voxdelight" @@ -3507,6 +3754,8 @@ glass_name = "Screaming Viking" glass_desc = "A boozy, citrus-packed brew." + allergen_type = FRUIT|GRAINS + /datum/reagent/ethanol/robustin name = "Robustin" id = "robustin" @@ -3518,6 +3767,8 @@ glass_name = "Robustin" glass_desc = "A bootleg brew of all the worst things on station." + allergen_type = GRAINS|DAIRY + /datum/reagent/ethanol/virginsip name = "Virgin Sip" id = "virginsip" @@ -3540,6 +3791,8 @@ glass_name = "Jelly Shot" glass_desc = "A thick and vibrant alcoholic gel, perfect for the night life." + allergen_type = FRUIT + /datum/reagent/ethanol/slimeshot name = "Named Bullet" id = "slimeshot" @@ -3560,13 +3813,15 @@ /datum/reagent/ethanol/cloverclub name = "Clover Club" id = "cloverclub" - description = "A light and refreshing rasberry cocktail." + description = "A light and refreshing raspberry cocktail." taste_description = "sweet raspberry" color = "#dd00a6" // rgb(221, 0, 166) strength = 30 glass_name = "Clover Club" - glass_desc = "A light and refreshing rasberry cocktail." + glass_desc = "A light and refreshing raspberry cocktail." + + allergen_type = FRUIT /datum/reagent/ethanol/negroni name = "Negroni" @@ -3579,6 +3834,8 @@ glass_name = "Negroni" glass_desc = "A dark, complicated blend, perfect for relaxing nights by the fire." + allergen_type = FRUIT + /datum/reagent/ethanol/whiskeysour name = "Whiskey Sour" id = "whiskeysour" @@ -3590,6 +3847,8 @@ glass_name = "Whiskey Sour" glass_desc = "A smokey, refreshing lemoned whiskey." + allergen_type = GRAINS|FRUIT + /datum/reagent/ethanol/oldfashioned name = "Old Fashioned" id = "oldfashioned" @@ -3601,6 +3860,8 @@ glass_name = "Old Fashioned" glass_desc = "A classic mix of whiskey and sugar... simple and direct." + allergen_type = GRAINS + /datum/reagent/ethanol/daiquiri name = "Daiquiri" id = "daiquiri" @@ -3612,6 +3873,8 @@ glass_name = "Daiquiri" glass_desc = "Refeshing rum and citrus. Time for a tropical get away." + allergen_type = FRUIT + /datum/reagent/ethanol/mojito name = "Mojito" id = "mojito" @@ -3624,6 +3887,8 @@ glass_desc = "Minty rum and citrus, made for sailing." glass_special = list(DRINK_FIZZ) + allergen_type = FRUIT + /datum/reagent/ethanol/paloma name = "Paloma" id = "paloma" @@ -3636,6 +3901,8 @@ glass_desc = "Tequila and citrus, iced just right..." glass_special = list(DRINK_FIZZ) + allergen_type = FRUIT + /datum/reagent/ethanol/piscosour name = "Pisco Sour" id = "piscosour" @@ -3647,6 +3914,8 @@ glass_name = "Pisco Sour" glass_desc = "South American bliss, served ice cold." + allergen_type = FRUIT + /datum/reagent/ethanol/coldfront name = "Cold Front" id = "coldfront" @@ -3660,6 +3929,8 @@ glass_name = "Cold Front" glass_desc = "Minty, rich, and painfully cold. It's a blizzard in a cup." + allergen_type = GRAINS + /datum/reagent/ethanol/mintjulep name = "Mint Julep" id = "mintjulep" @@ -3672,6 +3943,8 @@ glass_name = "Mint Julep" glass_desc = "Minty and refreshing, perfect for a hot day." + allergen_type = GRAINS + /datum/reagent/ethanol/godsake name = "Gods Sake" id = "godsake" @@ -3683,6 +3956,8 @@ glass_name = "God's Sake" glass_desc = "A glass of sake." + allergen_type = GRAINS + /datum/reagent/ethanol/godka name = "Godka" id = "godka" @@ -3695,6 +3970,8 @@ glass_desc = "The glass is barely able to contain the wodka. Xynta." glass_special = list(DRINK_FIZZ) + allergen_type = GRAINS + /datum/reagent/ethanol/godka/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() M.apply_effect(max(M.radiation - 5 * removed, 0), IRRADIATE, check_protection = 0) @@ -3723,6 +4000,8 @@ glass_desc = "A very pious looking drink." glass_icon = DRINK_ICON_NOISY + allergen_type = FRUIT + /datum/reagent/ethanol/holy_mary name = "Holy Mary" id = "holymary" @@ -3734,6 +4013,8 @@ glass_name = "Holy Mary" glass_desc = "Angel's Ichor, mixed with Vodka and a lil' bit of lime. Tastes like liquid ascension." + allergen_type = FRUIT|GRAINS + /datum/reagent/ethanol/angelswrath name = "Angels Wrath" id = "angelswrath" @@ -3748,6 +4029,8 @@ glass_icon = DRINK_ICON_NOISY glass_special = list(DRINK_FIZZ) + allergen_type = FRUIT|GRAINS + /datum/reagent/ethanol/angelskiss name = "Angels Kiss" id = "angelskiss" @@ -3759,6 +4042,8 @@ glass_name = "Angel's Kiss" glass_desc = "Miracle time!" + allergen_type = FRUIT|GRAINS + /datum/reagent/ethanol/ichor_mead name = "Ichor Mead" id = "ichor_mead" @@ -3770,6 +4055,8 @@ glass_name = "Ichor Mead" glass_desc = "A trip to Valhalla." + allergen_type = FRUIT|GRAINS + /datum/reagent/ethanol/schnapps_pep name = "Peppermint Schnapps" id = "schnapps_pep" @@ -3792,6 +4079,8 @@ glass_name = "peach schnapps" glass_desc = "A glass of peach schnapps. It seems like it'd be better, mixed." + allergen_type = FRUIT + /datum/reagent/ethanol/schnapps_lem name = "Lemonade Schnapps" id = "schnapps_lem" @@ -3803,6 +4092,8 @@ glass_name = "lemonade schnapps" glass_desc = "A glass of lemonade schnapps. It seems like it'd be better, mixed." + allergen_type = FRUIT + /datum/reagent/ethanol/fusionnaire name = "Fusionnaire" id = "fusionnaire" @@ -3814,6 +4105,8 @@ glass_name = "fusionnaire" glass_desc = "A relatively new cocktail, mostly served in the bars of NanoTrasen owned stations." + allergen_type = FRUIT|GRAINS + /datum/reagent/ethanol/deathbell name = "Deathbell" id = "deathbell" @@ -3828,6 +4121,8 @@ glass_name = "Deathbell" glass_desc = "The perfect blend of the most alcoholic things a bartender can get their hands on." + allergen_type = GRAINS|DAIRY|FRUIT + /datum/reagent/ethanol/deathbell/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..()