diff --git a/code/__defines/species_languages.dm b/code/__defines/species_languages.dm index 268b5d3253..ca8d02f19c 100644 --- a/code/__defines/species_languages.dm +++ b/code/__defines/species_languages.dm @@ -37,9 +37,10 @@ #define ALLERGEN_COFFEE 0x200 // Mostly here for tajara. #define ALLERGEN_SUGARS 0x400 // For unathi-like reactions #define ALLERGEN_EGGS 0x800 // For Skrell eggs allergy +#define ALLERGEN_STIMULANT 0x1000 // Stimulants are what makes the Tajaran heart go ruh roh - not just coffee! // Allergen reactions -#define AG_TOX_DMG 0x1 // the classic +#define AG_TOX_DMG 0x1 // the classic #define AG_OXY_DMG 0x2 // intense airway reactions #define AG_EMOTE 0x4 // general emote reactions based on affect type #define AG_PAIN 0x8 // short-lived hurt diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index 327dbb4590..3a4b912f16 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -91,6 +91,7 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/milk = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/cola = 5, + /obj/item/weapon/reagent_containers/food/drinks/bottle/decaf_cola = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/space_up = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/dr_gibb = 5, @@ -139,6 +140,7 @@ products = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 25, /obj/item/weapon/reagent_containers/food/drinks/decaf = 15, /obj/item/weapon/reagent_containers/food/drinks/tea = 25, + /obj/item/weapon/reagent_containers/food/drinks/decaf_tea = 25, /obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 25, /obj/item/weapon/reagent_containers/food/drinks/greentea = 15, /obj/item/weapon/reagent_containers/food/drinks/chaitea = 15) @@ -146,6 +148,7 @@ prices = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 2, /obj/item/weapon/reagent_containers/food/drinks/decaf = 3, /obj/item/weapon/reagent_containers/food/drinks/tea = 2, + /obj/item/weapon/reagent_containers/food/drinks/decaf_tea = 2, /obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 2, /obj/item/weapon/reagent_containers/food/drinks/greentea = 10, /obj/item/weapon/reagent_containers/food/drinks/chaitea = 5) // VOREStation Edit - Lowers Coffee/Hot Chocolate/Tea Prices from 3 -> 2. @@ -233,10 +236,12 @@ product_slogans = "Robust Softdrinks: More robust than a toolbox to the head!" product_ads = "Refreshing!;Hope you're thirsty!;Over 1 million drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks in the galaxy." products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/decaf_cola = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb_diet = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/starkist = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/starkistdecaf = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 10, @@ -247,10 +252,12 @@ contraband = list(/obj/item/weapon/reagent_containers/food/drinks/cans/thirteenloko = 5, /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 6) prices = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 1, + /obj/item/weapon/reagent_containers/food/drinks/cans/decaf_cola = 2, /obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind = 1, /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb = 1, /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb_diet = 1, /obj/item/weapon/reagent_containers/food/drinks/cans/starkist = 1, + /obj/item/weapon/reagent_containers/food/drinks/cans/starkistdecaf = 1, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 2, /obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 1, /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 1, diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm index 75018e8683..31384df17b 100644 --- a/code/modules/food/food/cans.dm +++ b/code/modules/food/food/cans.dm @@ -9,7 +9,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/cola name = "\improper Space Cola" - desc = "Reassuringly artificial." + desc = "Reassuringly artificial. Contains caffeine." description_fluff = "The 'Space' branding was originally added to the 'Alpha Cola' product line in order to justify selling cans for 50% higher prices to 'off-world' retailers. Despite being chemically identical, Space Cola proved so popular that Centauri Provisions eventually applied the name to the entire product line - price hike and all." icon_state = "cola" center_of_mass = list("x"=16, "y"=10) @@ -18,6 +18,17 @@ . = ..() reagents.add_reagent("cola", 30) +/obj/item/weapon/reagent_containers/food/drinks/cans/decaf_cola + name = "\improper Space Cola Free" + desc = "More reassuringly artificial than ever before." + description_fluff = "The 'Space' branding was originally added to the 'Alpha Cola' product line in order to justify selling cans for 50% higher prices to 'off-world' retailers. Despite being chemically identical, Space Cola proved so popular that Centauri Provisions eventually applied the name to the entire product line - price hike and all." + icon_state = "decafcola" + center_of_mass = list("x"=16, "y"=10) + +/obj/item/weapon/reagent_containers/food/drinks/cans/decaf_cola/Initialize() + . = ..() + reagents.add_reagent("decafcola", 30) + /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle name = "bottled water" desc = "Ice cold and utterly tasteless, this 'all-natural' mineral water comes 'fresh' from one of NanoTrasen's heavy-duty bottling plants in the Sivian poles." @@ -32,7 +43,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind name = "\improper Space Mountain Wind" - desc = "Blows right through you like a space wind." + desc = "Blows right through you like a space wind. Contains caffeine." description_fluff = "The 'Space' branding was originally added to the 'Alpha Cola' product line in order to justify selling cans for 50% higher prices to 'off-world' retailers. Despite being chemically identical, Space Cola proved so popular that Centauri Provisions eventually applied the name to the entire product line - price hike and all." icon_state = "space_mountain_wind" center_of_mass = list("x"=16, "y"=8) @@ -53,7 +64,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb name = "\improper Dr. Gibb" - desc = "A delicious mixture of 42 different flavors." + desc = "A delicious mixture of 42 different flavors. Contains caffine." description_fluff = "Following a 2490 lawsuit and a spate of deaths, Gilthari Exports reminds customers that the 'Dr.' legally stands for 'Drink'." icon_state = "dr_gibb" center_of_mass = list("x"=16, "y"=8) @@ -64,7 +75,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb_diet name = "\improper Diet Dr. Gibb" - desc = "A delicious mixture of 42 different flavors, one of which is water." + desc = "A delicious mixture of 42 different flavors, one of which is water. Contains caffeine." description_fluff = "Following a 2490 lawsuit and a spate of deaths, Gilthari Exports reminds customers that the 'Dr.' legally stands for 'Drink'." icon_state = "dr_gibb_diet" center_of_mass = list("x"=16, "y"=8) @@ -75,7 +86,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/starkist name = "\improper Star-kist" - desc = "The taste of a star in liquid form. And, a bit of tuna...?" + desc = "The taste of a star in liquid form. And, a bit of tuna...? Contains caffeine." description_fluff = "Brought back by popular demand in 2515 after a limited-run release in 2510, the cult success of this bizarre tasting soda has never truly been accounted for by economists." icon_state = "starkist" center_of_mass = list("x"=16, "y"=8) @@ -84,6 +95,17 @@ . = ..() reagents.add_reagent("brownstar", 30) +/obj/item/weapon/reagent_containers/food/drinks/cans/starkistdecaf + name = "\improper Star-kist Classic" + desc = "The taste of a star in liquid form, in a special decaffineated blend. Still tastes faintly of tuna?" + description_fluff = "A special variant of the Starkist brand soda introduced after popular outcry following a reformulation of the basic drink decades ago. This decaffineated variant outsells 'New' Starkist in many markets." + icon_state = "decafstarkist" + center_of_mass = list("x"=16, "y"=8) + +/obj/item/weapon/reagent_containers/food/drinks/cans/starkistdecaf/Initialize() + . = ..() + reagents.add_reagent("brownstar_decaf", 30) + /obj/item/weapon/reagent_containers/food/drinks/cans/space_up name = "\improper Space-Up" desc = "Tastes like a hull breach in your mouth." @@ -108,7 +130,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea name = "\improper Vrisk Serket Iced Tea" - desc = "That sweet, refreshing southern earthy flavor. That's where it's from, right? South Earth?" + desc = "That sweet, refreshing southern earthy flavor. That's where it's from, right? South Earth? Contains caffeine." description_fluff = "Produced exclusively on the planet Oasis, Vrisk Serket Iced Tea is not sold outside of the Golden Crescent, let alone Earth." icon_state = "ice_tea_can" center_of_mass = list("x"=16, "y"=8) diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm index d6bf82f0a3..ca9dc49115 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -221,6 +221,21 @@ . = ..() reagents.add_reagent("tea", 30) +/obj/item/weapon/reagent_containers/food/drinks/decaf_tea + name = "cup of Count Mauve decaffeinated tea" + desc = "Why should bedtime stop you from enjoying a nice cuppa?" + description_fluff = "Count Mauve is a milder strain of NanoPasture's proprietary black tea, noted for its strong but otherwise completely non-distinctive flavour and total lack of caffeination." + icon_state = "chai_vended" + item_state = "coffee" + trash = /obj/item/trash/coffee + center_of_mass = list("x"=16, "y"=14) + drop_sound = 'sound/items/drop/papercup.ogg' + pickup_sound = 'sound/items/pickup/papercup.ogg' + +/obj/item/weapon/reagent_containers/food/drinks/decaf_tea/Initialize() + . = ..() + reagents.add_reagent("teadecaf", 30) + /obj/item/weapon/reagent_containers/food/drinks/ice name = "cup of ice" desc = "Careful, cold ice, do not chew." diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/food/drinks/bottle.dm index 26775c90db..df16e4960b 100644 --- a/code/modules/food/food/drinks/bottle.dm +++ b/code/modules/food/food/drinks/bottle.dm @@ -466,9 +466,9 @@ //////////////////////////JUICES AND STUFF/////////////////////// -/obj/item/weapon/reagent_containers/food/drinks/bottle/cola //MODIFIED ON 04/21/2021 +/obj/item/weapon/reagent_containers/food/drinks/bottle/cola name = "\improper two-liter Space Cola" - desc = "Cola. In space." + desc = "Cola. In space. Contains caffeine." icon_state = "colabottle" center_of_mass = list("x"=16, "y"=6) @@ -476,7 +476,17 @@ . = ..() reagents.add_reagent("cola", 100) -/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up //MODIFIED ON 04/21/2021 +/obj/item/weapon/reagent_containers/food/drinks/bottle/decaf_cola + name = "\improper two-liter Space Cola Free" + desc = "Cola. In space. Caffeine free." + icon_state = "decafcolabottle" + center_of_mass = list("x"=16, "y"=6) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/decaf_cola/Initialize() + . = ..() + reagents.add_reagent("decafcola", 100) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up name = "\improper two-liter Space-Up" desc = "Tastes like a hull breach in your mouth." icon_state = "space-up_bottle" @@ -486,9 +496,9 @@ . = ..() reagents.add_reagent("space_up", 100) -/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind //MODIFIED ON 04/21/2021 +/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind name = "\improper two-liter Space Mountain Wind" - desc = "Blows right through you like a space wind." + desc = "Blows right through you like a space wind. Contains caffeine." icon_state = "space_mountain_wind_bottle" center_of_mass = list("x"=16, "y"=6) @@ -496,9 +506,9 @@ . = ..() reagents.add_reagent("spacemountainwind", 100) -/obj/item/weapon/reagent_containers/food/drinks/bottle/dr_gibb //ADDED ON 04/21/2021 +/obj/item/weapon/reagent_containers/food/drinks/bottle/dr_gibb name = "\improper two-liter Dr. Gibb" - desc = "A delicious mixture of 42 different flavors." + desc = "A delicious mixture of 42 different flavors. Contains caffeine." icon_state = "dr_gibb_bottle" center_of_mass = list("x"=16, "y"=6) diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 1d97b543fb..9252725489 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -6128,6 +6128,7 @@ /obj/item/weapon/reagent_containers/food/snacks/cb06/Initialize() . = ..() reagents.add_reagent("sugar", 1) + reagents.add_reagent("coffee", 1) /obj/item/weapon/reagent_containers/food/snacks/cb07 name = "\improper TaroMilk Bar" @@ -6177,6 +6178,7 @@ . = ..() reagents.add_reagent("sugar", 1) reagents.add_reagent("milk", 1) + reagents.add_reagent("peanutoil", 1) /obj/item/weapon/reagent_containers/food/snacks/cb10 name = "\improper Shantak Bar" @@ -6194,6 +6196,7 @@ . = ..() reagents.add_reagent("sugar", 1) reagents.add_reagent("protein", 1) + reagents.add_reagent("peanutoil", 1) ////////////////////Misc Vend Items//////////////////////////////////////////////////////////////// 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 5d5112acf0..870ac0e97d 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -235,7 +235,7 @@ base_color = "#333333" reagent_tag = IS_TAJARA - allergens = ALLERGEN_COFFEE + allergens = ALLERGEN_STIMULANT move_trail = /obj/effect/decal/cleanable/blood/tracks/paw diff --git a/code/modules/reagents/reactions/instant/drinks.dm b/code/modules/reagents/reactions/instant/drinks.dm index 97dba281e5..a9cfd88817 100644 --- a/code/modules/reagents/reactions/instant/drinks.dm +++ b/code/modules/reagents/reactions/instant/drinks.dm @@ -700,6 +700,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" @@ -763,6 +770,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" @@ -770,6 +784,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" @@ -777,6 +798,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" @@ -784,6 +812,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" @@ -791,6 +826,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" diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm index 82ad0d5c92..1428b4e14a 100644 --- a/code/modules/reagents/reagents/food_drinks.dm +++ b/code/modules/reagents/reagents/food_drinks.dm @@ -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" @@ -1228,6 +1236,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) ..() @@ -1235,6 +1244,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" @@ -1269,6 +1295,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" @@ -1282,6 +1318,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" @@ -1294,7 +1340,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" @@ -1308,7 +1364,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" @@ -1322,7 +1388,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" @@ -1336,7 +1412,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" @@ -1351,18 +1437,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" @@ -1383,7 +1480,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) @@ -1496,7 +1593,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" @@ -1632,7 +1729,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" @@ -1730,7 +1838,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) ..() @@ -1748,6 +1856,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) ..() @@ -1781,6 +1890,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" @@ -1899,12 +2022,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" color = "#102000" adj_drowsy = -6 @@ -1912,6 +2035,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" @@ -1965,7 +2089,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." @@ -1994,7 +2118,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" @@ -2020,7 +2144,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" @@ -2154,7 +2278,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" @@ -2495,7 +2619,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) @@ -2623,6 +2747,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) ..() @@ -2865,7 +2990,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" @@ -2879,7 +3004,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" @@ -2965,7 +3090,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" @@ -2993,7 +3118,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!" @@ -3041,6 +3166,18 @@ 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" @@ -3052,6 +3189,7 @@ glass_name = "rum and cola" glass_desc = "A classic mix of rum and cola." + allergen_type = ALLERGEN_STIMULANT // Cola /datum/reagent/ethanol/demonsblood name = "Demons Blood" @@ -3064,7 +3202,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" @@ -3076,7 +3214,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" @@ -3239,7 +3377,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" @@ -3265,7 +3403,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" @@ -3452,7 +3590,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" @@ -3478,7 +3616,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" @@ -3558,7 +3696,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" @@ -3571,7 +3709,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" @@ -3700,7 +3838,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" @@ -3766,7 +3904,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" @@ -3791,7 +3929,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" @@ -3871,7 +4009,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" @@ -3897,7 +4035,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" @@ -4109,7 +4247,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" @@ -4205,7 +4343,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" @@ -4218,7 +4356,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" diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index e7aebe140f..c138e6093e 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ