cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-25 06:07:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Tea brewing uses distilling (#11802)

Browse Source 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-10-09 15:26:11 +02:00
committed by GitHub
co-authored by Will
parent 474ef1e9bd
commit 6f6cb7d760
8 changed files with 129 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reactions/distilling/hot_drinks.dm
+112
View File
@@ -0,0 +1,112 @@
// The curse of hot_water reagent lives on!
/decl/chemical_reaction/distilling/drinks
name = REAGENT_DEVELOPER_WARNING // Unit test ignore
temp_range = list(T0C + 100, T0C + 500) // These all imply a boiled drink anyway
wiki_flag = WIKI_DRINK
/decl/chemical_reaction/distilling/drinks/coffee
name = REAGENT_COFFEE
id = REAGENT_ID_COFFEE
result = REAGENT_ID_COFFEE
required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_COFFEEPOWDER = 1)
result_amount = 5
/decl/chemical_reaction/distilling/drinks/tea
name = "Black tea"
id = REAGENT_ID_TEA
result = REAGENT_ID_TEA
required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_TEAPOWDER = 1)
result_amount = 5
/decl/chemical_reaction/distilling/drinks/decaftea
name = REAGENT_TEADECAF
id = REAGENT_ID_TEADECAF
result = REAGENT_ID_TEADECAF
required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_DECAFTEAPOWDER = 1)
result_amount = 5
/decl/chemical_reaction/distilling/drinks/hot_coco
name = "Hot Coco"
id = REAGENT_ID_HOTCOCO
result = REAGENT_ID_HOTCOCO
required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_COCO = 1)
result_amount = 5
/decl/chemical_reaction/distilling/drinks/minttea
name = REAGENT_MINTTEA
id = REAGENT_ID_MINTTEA
result = REAGENT_ID_MINTTEA
required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_MINT = 1)
result_amount = 6
/decl/chemical_reaction/distilling/drinks/minttea_decaf
name = REAGENT_MINTTEADECAF
id = REAGENT_ID_MINTTEADECAF
result = REAGENT_ID_MINTTEADECAF
required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_MINT = 1)
result_amount = 6
/decl/chemical_reaction/distilling/drinks/lemontea
name = REAGENT_LEMONTEA
id = REAGENT_ID_LEMONTEA
result = REAGENT_ID_LEMONTEA
required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_LEMONJUICE = 1)
result_amount = 6
/decl/chemical_reaction/distilling/drinks/lemontea_decaf
name = REAGENT_LEMONTEADECAF
id = REAGENT_ID_LEMONTEADECAF
result = REAGENT_ID_LEMONTEADECAF
required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_LEMONJUICE = 1)
result_amount = 6
/decl/chemical_reaction/distilling/drinks/limetea
name = REAGENT_LIMETEA
id = REAGENT_ID_LIMETEA
result = REAGENT_ID_LIMETEA
required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_LIMEJUICE = 1)
result_amount = 6
/decl/chemical_reaction/distilling/drinks/limetea_decaf
name = REAGENT_LIMETEADECAF
id = REAGENT_ID_LIMETEADECAF
result = REAGENT_ID_LIMETEADECAF
required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_LIMEJUICE = 1)
result_amount = 6
/decl/chemical_reaction/distilling/drinks/orangetea
name = REAGENT_ORANGETEA
id = REAGENT_ID_ORANGETEA
result = REAGENT_ID_ORANGETEA
required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_ORANGEJUICE = 1)
result_amount = 6
/decl/chemical_reaction/distilling/drinks/orangetea_decaf
name = "Decaf Orange Tea"
id = REAGENT_ID_ORANGETEADECAF
result = REAGENT_ID_ORANGETEADECAF
required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_ORANGEJUICE = 1)
result_amount = 6
/decl/chemical_reaction/distilling/drinks/berrytea
name = REAGENT_BERRYTEA
id = REAGENT_ID_BERRYTEA
result = REAGENT_ID_BERRYTEA
required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_BERRYJUICE = 1)
result_amount = 6
/decl/chemical_reaction/distilling/drinks/berrytea_decaf
name = REAGENT_BERRYTEADECAF
id = REAGENT_ID_BERRYTEADECAF
result = REAGENT_ID_BERRYTEADECAF
required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_BERRYJUICE = 1)
result_amount = 6
// Not drinks, but we may as well
/decl/chemical_reaction/distilling/drinks/hot_ramen
name = REAGENT_HOTRAMEN
id = REAGENT_ID_HOTRAMEN
result = REAGENT_ID_HOTRAMEN
required_reagents = list(REAGENT_ID_WATER = 1, REAGENT_ID_DRYRAMEN = 3)
result_amount = 3
wiki_flag = WIKI_FOOD
code/modules/reagents/reactions/instant/drinks.dm
-98
View File
@@ -1,34 +1,6 @@
/decl/chemical_reaction/instant/drinks
name = REAGENT_DEVELOPER_WARNING // Unit test ignore
/decl/chemical_reaction/instant/drinks/coffee
name = REAGENT_COFFEE
id = REAGENT_ID_COFFEE
result = REAGENT_ID_COFFEE
required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_COFFEEPOWDER = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/tea
name = "Black tea"
id = REAGENT_ID_TEA
result = REAGENT_ID_TEA
required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_TEAPOWDER = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/decaftea
name = "Decaf tea"
id = REAGENT_ID_TEADECAF
result = REAGENT_ID_TEADECAF
required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_DECAFTEAPOWDER = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/hot_coco
name = "Hot Coco"
id = REAGENT_ID_HOTCOCO
result = REAGENT_ID_HOTCOCO
required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_COCO = 1)
result_amount = 5
/decl/chemical_reaction/instant/drinks/grapejuice
name = REAGENT_GRAPEJUICE
id = REAGENT_ID_GRAPEJUICE
@@ -853,76 +825,6 @@
required_reagents = list(REAGENT_ID_ICETEA = 1, REAGENT_ID_LEMONADE = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/minttea
name = REAGENT_MINTTEA
id = REAGENT_ID_MINTTEA
result = REAGENT_ID_MINTTEA
required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_MINT = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/minttea_decaf
name = REAGENT_MINTTEADECAF
id = "decafminttea"
result = REAGENT_ID_MINTTEADECAF
required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_MINT = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/lemontea
name = REAGENT_LEMONTEA
id = REAGENT_ID_LEMONTEA
result = REAGENT_ID_LEMONTEA
required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_LEMONJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/lemontea_decaf
name = REAGENT_LEMONTEADECAF
id = "decaflemontea"
result = REAGENT_ID_LEMONTEADECAF
required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_LEMONJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/limetea
name = REAGENT_LIMETEA
id = REAGENT_ID_LIMETEA
result = REAGENT_ID_LIMETEA
required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_LIMEJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/limetea_decaf
name = REAGENT_LIMETEADECAF
id = "decaflimetea"
result = REAGENT_ID_LIMETEADECAF
required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_LIMEJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/orangetea
name = REAGENT_ORANGETEA
id = REAGENT_ID_ORANGETEA
result = REAGENT_ID_ORANGETEA
required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_ORANGEJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/orangetea_decaf
name = "Decaf Orange Tea"
id = "decaforangetea"
result = REAGENT_ID_ORANGETEADECAF
required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_ORANGEJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/berrytea
name = REAGENT_BERRYTEA
id = REAGENT_ID_BERRYTEA
result = REAGENT_ID_BERRYTEA
required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_BERRYJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/berrytea_decaf
name = REAGENT_BERRYTEADECAF
id = "decafberrytea"
result = REAGENT_ID_BERRYTEADECAF
required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_BERRYJUICE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/sakebomb
name = REAGENT_SAKEBOMB
id = REAGENT_ID_SAKEBOMB
code/modules/reagents/reactions/instant/food.dm
-7
View File
@@ -2,13 +2,6 @@
name = REAGENT_DEVELOPER_WARNING // Unit test ignore
wiki_flag = WIKI_FOOD
/decl/chemical_reaction/instant/food/hot_ramen
name = REAGENT_HOTRAMEN
id = REAGENT_ID_HOTRAMEN
result = REAGENT_ID_HOTRAMEN
required_reagents = list(REAGENT_ID_WATER = 1, REAGENT_ID_DRYRAMEN = 3)
result_amount = 3
/decl/chemical_reaction/instant/food/hell_ramen
name = REAGENT_HELLRAMEN
id = REAGENT_ID_HELLRAMEN