shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tea Party

Browse Source
This commit is contained in:
TrilbySpaceClone
2020-08-04 09:15:44 -04:00
parent 625fa368e7
commit 0f29235e6a
5 changed files with 187 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
code/modules/food_and_drinks/drinks/drinks.dm
View File

@@ -299,6 +299,31 @@
desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
list_reagents = list(/datum/reagent/consumable/tea = 30)
/obj/item/reagent_containers/food/drinks/mug/tea/red
name = "Dutchess Red tea"
icon_state = "tea"
desc = "Dutchess Red personal blend of red tea leaves and hot water. Grate addtion for any meal."
list_reagents = list(/datum/reagent/consumable/tea/red = 30)
/obj/item/reagent_containers/food/drinks/mug/tea/green
name = "Prince Green tea"
icon_state = "tea"
desc = "Prince Green's brew of tea. Well the blend may be different from time to time, Prince Green swares by it!"
list_reagents = list(/datum/reagent/consumable/tea/green = 30)
/obj/item/reagent_containers/food/drinks/mug/tea/forest
name = "Royal Forest tea"
icon_state = "tea"
desc = "Tea fit for anyone with a sweet thooth like Royal Forest."
list_reagents = list(/datum/reagent/consumable/tea/forest = 30)
/obj/item/reagent_containers/food/drinks/mug/tea/mush
name = "Rebel Mush tea"
icon_state = "tea"
desc = "Rebel Mush, hallucinogenic tea to help people fine their inner self."
list_reagents = list(/datum/reagent/consumable/tea/mush = 30)
/obj/item/reagent_containers/food/drinks/mug/coco
name = "Dutch hot coco"
desc = "Made in Space South America."

95
code/modules/food_and_drinks/recipes/drinks_recipes.dm
View File

@@ -18,12 +18,6 @@
results = list(/datum/reagent/consumable/ethanol/bilk = 2)
required_reagents = list(/datum/reagent/consumable/milk = 1, /datum/reagent/consumable/ethanol/beer = 1)
/datum/chemical_reaction/icetea
name = "Iced Tea"
id = /datum/reagent/consumable/icetea
results = list(/datum/reagent/consumable/icetea = 4)
required_reagents = list(/datum/reagent/consumable/ice = 1, /datum/reagent/consumable/tea = 3)
/datum/chemical_reaction/icecoffee
name = "Iced Coffee"
id = /datum/reagent/consumable/icecoffee
@@ -581,13 +575,6 @@
required_reagents = list(/datum/reagent/consumable/lemonjuice = 2, /datum/reagent/water = 2, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/ice = 1)
mix_message = "You're suddenly reminded of home."
/datum/chemical_reaction/arnold_palmer
name = "Arnold Palmer"
id = /datum/reagent/consumable/tea/arnold_palmer
results = list(/datum/reagent/consumable/tea/arnold_palmer = 2)
required_reagents = list(/datum/reagent/consumable/tea = 1, /datum/reagent/consumable/lemonade = 1)
mix_message = "The smells of fresh green grass and sand traps waft through the air as the mixture turns a friendly yellow-orange."
/datum/chemical_reaction/chocolate_milk
name = "chocolate milk"
id = /datum/reagent/consumable/milk/chocolate_milk
@@ -756,12 +743,6 @@
results = list(/datum/reagent/consumable/pinkmilk = 2)
required_reagents = list(/datum/reagent/consumable/strawberryjuice = 1, /datum/reagent/consumable/milk = 1)
/datum/chemical_reaction/pinktea
name = "Strawberry Tea"
id = /datum/reagent/consumable/pinktea
results = list(/datum/reagent/consumable/pinktea = 5)
required_reagents = list(/datum/reagent/consumable/strawberryjuice = 1, /datum/reagent/consumable/tea/arnold_palmer = 1, /datum/reagent/consumable/sugar = 1)
/datum/chemical_reaction/blank_paper
name = "Blank Paper"
id = /datum/reagent/consumable/ethanol/blank_paper
@@ -903,12 +884,6 @@
results = list(/datum/reagent/consumable/ethanol/mauna_loa = 5)
required_reagents = list(/datum/reagent/consumable/capsaicin = 2, /datum/reagent/consumable/ethanol/kahlua = 1, /datum/reagent/consumable/ethanol/bahama_mama = 2)
/datum/chemical_reaction/catnip_tea
name = "Catnip Tea"
id = /datum/reagent/consumable/catnip_tea
results = list(/datum/reagent/consumable/catnip_tea = 3)
required_reagents = list(/datum/reagent/consumable/tea = 5, /datum/reagent/pax/catnip = 2)
/datum/chemical_reaction/commander_and_chief
name = "Commander and Chief"
id = /datum/reagent/consumable/ethanol/commander_and_chief
@@ -916,6 +891,76 @@
required_reagents = list(/datum/reagent/consumable/ethanol/alliescocktail = 50, /datum/reagent/consumable/ethanol/champagne = 20, /datum/reagent/consumable/doctor_delight = 10, /datum/reagent/consumable/ethanol/quintuple_sec = 10, /datum/reagent/consumable/ethanol/screwdrivercocktail = 10)
mix_message = "When your powers combine, I am Captain Pl-..."
////////////////////////////////////////// Tea Base Drinks //////////////////////////////////////
/datum/chemical_reaction/mush
name = "Mush Tea"
id = /datum/reagent/consumable/tea/mush
results = list(/datum/reagent/consumable/tea/mush = 3)
required_reagents = list(/datum/reagent/drug/mushroomhallucinogen = 3, /datum/reagent/consumable/tea = 3)
/datum/chemical_reaction/foresttea1
name = "Forest Tea"
id = /datum/reagent/consumable/tea/forest
results = list(/datum/reagent/consumable/tea/forest = 3)
required_reagents = list(/datum/reagent/consumable/buzz_fuzz= 3, /datum/reagent/consumable/tea = 3)
/datum/chemical_reaction/foresttea2
name = "Forest Tea"
id = /datum/reagent/consumable/tea/forest
results = list(/datum/reagent/consumable/tea/forest = 3)
required_reagents = list(/datum/reagent/consumable/honey = 1, /datum/reagent/consumable/tea = 3)
/datum/chemical_reaction/redtea1
name = "Red Tea"
id = /datum/reagent/consumable/tea/red
results = list(/datum/reagent/consumable/tea/red = 3)
required_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/red = 1, /datum/reagent/consumable/tea = 3)
/datum/chemical_reaction/greentea1
name = "Green Tea"
id = /datum/reagent/consumable/tea/green
results = list(/datum/reagent/consumable/tea/green = 3)
required_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/green = 1, /datum/reagent/consumable/tea = 3)
/datum/chemical_reaction/redtea2
name = "Red Tea"
id = /datum/reagent/consumable/tea/red
results = list(/datum/reagent/consumable/tea/red = 3)
required_reagents = list(/datum/reagent/toxin/teapowder/red = 1, /datum/reagent/water = 3)
/datum/chemical_reaction/greentea2
name = "Green Tea"
id = /datum/reagent/consumable/tea/green
results = list(/datum/reagent/consumable/tea/green = 3)
required_reagents = list(/datum/reagent/toxin/teapowder/green = 1, /datum/reagent/water = 3)
/datum/chemical_reaction/arnold_palmer
name = "Arnold Palmer"
id = /datum/reagent/consumable/tea/arnold_palmer
results = list(/datum/reagent/consumable/tea/arnold_palmer = 2)
required_reagents = list(/datum/reagent/consumable/tea = 1, /datum/reagent/consumable/lemonade = 1)
mix_message = "The smells of fresh green grass and sand traps waft through the air as the mixture turns a friendly yellow-orange."
/datum/chemical_reaction/icetea
name = "Iced Tea"
id = /datum/reagent/consumable/icetea
results = list(/datum/reagent/consumable/icetea = 4)
required_reagents = list(/datum/reagent/consumable/ice = 1, /datum/reagent/consumable/tea = 3)
/datum/chemical_reaction/pinktea
name = "Strawberry Tea"
id = /datum/reagent/consumable/pinktea
results = list(/datum/reagent/consumable/pinktea = 5)
required_reagents = list(/datum/reagent/consumable/strawberryjuice = 1, /datum/reagent/consumable/tea/arnold_palmer = 1, /datum/reagent/consumable/sugar = 1)
/datum/chemical_reaction/catnip_tea
name = "Catnip Tea"
id = /datum/reagent/consumable/catnip_tea
results = list(/datum/reagent/consumable/catnip_tea = 3)
required_reagents = list(/datum/reagent/consumable/tea = 5, /datum/reagent/pax/catnip = 2)
////////////////////////////////////////// Race Base Drinks //////////////////////////////////////
/datum/chemical_reaction/coldscales

77
code/modules/reagents/chemistry/reagents/drink_reagents.dm
View File

@@ -323,6 +323,83 @@
..()
. = 1
/datum/reagent/consumable/tea/red
name = "Red Tea"
description = "Tasty red tea, it has digestive properties. Drink in moderation!"
color = "#101000" // rgb: 16, 16, 0
nutriment_factor = 0
taste_description = "sweet red tea"
glass_icon_state = "teaglass"
glass_name = "glass of red tea"
glass_desc = "A piping hot tea that helps with digestion of food."
/datum/reagent/consumable/tea/red/on_mob_life(mob/living/carbon/M)
if(M.nutrition > NUTRITION_LEVEL_HUNGRY)
M.adjust_nutrition(-3)
M.dizziness = max(0,M.dizziness-2)
M.drowsyness = max(0,M.drowsyness-1)
M.jitteriness = max(0,M.jitteriness-3)
M.adjust_bodytemperature(23 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
. = 1
/datum/reagent/consumable/tea/green
name = "Green Tea"
description = "Tasty green tea, known to heal liver it's good for you!"
color = "#101000" // rgb: 16, 16, 0
nutriment_factor = 0
taste_description = "tart green tea"
glass_icon_state = "teaglass"
glass_name = "glass of tea"
glass_desc = "A calming glass of green tea to help get you through the day."
/datum/reagent/consumable/tea/green/on_mob_life(mob/living/carbon/M)
M.adjustOrganLoss(ORGAN_SLOT_LIVER, -0.5) //Detox!
M.dizziness = max(0,M.dizziness-2)
M.drowsyness = max(0,M.drowsyness-1)
M.jitteriness = max(0,M.jitteriness-3)
M.adjust_bodytemperature(15 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
. = 1
/datum/reagent/consumable/tea/forest
name = "Forest Tea"
description = "Tea mixed with honey, has antitoxins and sweetness in one!"
color = "#101000" // rgb: 16, 16, 0
nutriment_factor = 0
quality = DRINK_NICE
taste_description = "sweet tea"
glass_icon_state = "teaglass"
glass_name = "glass of forest tea"
glass_desc = "A lovely glass of tea and honey."
/datum/reagent/consumable/tea/green/on_mob_life(mob/living/carbon/M)
if(M.getToxLoss() && prob(40))//Two anti-toxins working here
M.adjustToxLoss(-1, 0, TRUE) //heals TOXINLOVERs
M.dizziness = max(0,M.dizziness-2)
M.drowsyness = max(0,M.drowsyness-1)
M.jitteriness = max(0,M.jitteriness-3)
M.adjust_bodytemperature(15 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
. = 1
/datum/reagent/consumable/tea/mush
name = "Mush Tea"
description = "Tea mixed with mushroom hallucinogen, used for fun rides or self reflect."
color = "#101000" // rgb: 16, 16, 0
nutriment_factor = 0
quality = DRINK_NICE
taste_description = "fungal infections"
glass_icon_state = "teaglass"
glass_name = "glass of mush tea"
glass_desc = "A cold merky brown tea."
/datum/reagent/consumable/tea/mush/on_mob_life(mob/living/carbon/M)
M.set_drugginess(20) //Little better then space drugs
if(prob(20))
M.Dizzy(10)
if(prob(10))
M.disgust = 0
. = 1
/datum/reagent/consumable/lemonade
name = "Lemonade"
description = "Sweet, tangy lemonade. Good for the soul."

8
code/modules/reagents/chemistry/reagents/toxin_reagents.dm
View File

@@ -373,6 +373,14 @@
pH = 4.9
value = REAGENT_VALUE_VERY_COMMON
/datum/reagent/toxin/teapowder/red
name = "Ground Red Tea Leaves"
toxpwr = 0.4
/datum/reagent/toxin/teapowder/green
name = "Ground Green Tea Leaves"
toxpwr = 0.6
/datum/reagent/toxin/mutetoxin //the new zombie powder.
name = "Mute Toxin"
description = "A nonlethal poison that inhibits speech in its victim."

10
code/modules/vending/coffee.dm
View File

@@ -1,16 +1,20 @@
/obj/machinery/vending/coffee
name = "\improper Solar's Best Hot Drinks"
desc = "A vending machine which dispenses hot drinks."
product_ads = "Have a drink!;Drink up!;It's good for you!;Would you like a hot joe?;I'd kill for some coffee!;The best beans in the galaxy.;Only the finest brew for you.;Mmmm. Nothing like a coffee.;I like coffee, don't you?;Coffee helps you work!;Try some tea.;We hope you like the best!;Try our new chocolate!;Admin conspiracies"
product_ads = "Just what you need!;Have a drink!;Drink up!;It's good for you!;Would you like a hot joe?;I'd kill for some coffee!;The best beans in the galaxy.;Only the finest brew for you.;Mmmm. Nothing like a coffee.;I like coffee, don't you?;Coffee helps you work!;Try some tea.;We hope you like the best!;Try our new chocolate!;Admin conspiracies"
icon_state = "coffee"
icon_vend = "coffee-vend"
products = list(/obj/item/reagent_containers/food/drinks/coffee = 25,
/obj/item/reagent_containers/food/drinks/mug/tea = 25,
/obj/item/reagent_containers/food/drinks/mug/tea/red = 10,
/obj/item/reagent_containers/food/drinks/mug/tea/green = 10,
/obj/item/reagent_containers/food/drinks/mug/coco = 25)
contraband = list(/obj/item/reagent_containers/food/drinks/ice = 12)
contraband = list(/obj/item/reagent_containers/food/drinks/ice = 12,
/obj/item/reagent_containers/food/drinks/mug/tea/mush = 3,)
premium = list(/obj/item/reagent_containers/food/condiment/milk = 2,
/obj/item/reagent_containers/food/drinks/bottle/cream = 2,
/obj/item/reagent_containers/food/condiment/sugar = 1)
/obj/item/reagent_containers/food/condiment/sugar = 1,
/obj/item/reagent_containers/food/drinks/mug/tea/forest = 3,)
refill_canister = /obj/item/vending_refill/coffee
default_price = PRICE_REALLY_CHEAP