cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-23 03:56:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Introducing matcha!

Browse Source 
-Adds matcha, matcha powder, and matcha latte reagents
-Adds recipe to microwave a steamed tea leaf to get tencha then use a knife to devein and obtain matcha
-Adds matcha latte to the coffee dispenser, also makes the new cartridge available in the coffee dispenser refill crate
-Fixes grammatical issues with tea
-Removes teamush added when steaming tea leaves
-Adds matcha ice cream
-Adds icons for new objects
This commit is contained in:
Nadyr
2019-04-12 05:59:48 -05:00
parent cb7b5c1918
commit 3b7630259c
10 changed files with 122 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food/recipes_microwave_vr.dm
+7 -1
View File
@@ -218,4 +218,10 @@
items = list(
/obj/item/weapon/reagent_containers/food/snacks/steamrolltealeaf
)
result = /obj/item/weapon/reagent_containers/food/snacks/greentealeaf
result = /obj/item/weapon/reagent_containers/food/snacks/greentealeaf
/datum/recipe/tencha //TODO: Figure out how to make this recipe with a drying rack.
items = list(
/obj/item/weapon/reagent_containers/food/snacks/steamtealeaf
)
result = /obj/item/weapon/reagent_containers/food/snacks/tencha
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+57 -7
View File
@@ -807,7 +807,7 @@
adj_sleepy = -3
adj_temp = 20
glass_name = "cup of tea"
glass_name = "tea"
glass_desc = "Tasty black tea, it has antioxidants, it's good for you!"
cup_icon_state = "cup_tea"
@@ -945,6 +945,22 @@
cup_name = "cup of watermelon tea"
cup_desc = "A tasty mixture of watermelon and tea. It's apparently good for you!"
/datum/reagent/drink/tea/matcha_latte //Putting this as tea to inherit tea variables. Should not have the same toxloss as matcha so it can be placed in a dispenser without breaking balance.
name = "Matcha latte"
id = "matcha_latte"
description = "A nice and tasty beverage to enjoy while studying."
taste_description = "creamy, vegetal sweetness"
color = "#b1c48c"
adj_temp = 5
glass_name = "matcha latte"
glass_desc = "A nice and refreshing beverage while you are studying."
cup_icon_state = "cup_latte"
cup_name = "cup of matcha latte"
cup_desc = "A nice and refreshing beverage while you are studying."
/datum/reagent/drink/coffee
name = "Coffee"
id = "coffee"
@@ -1030,7 +1046,6 @@
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"
@@ -1049,11 +1064,11 @@
adj_temp = 5
glass_name = "cafe latte"
glass_desc = "A nice, strong and refreshing beverage while you are reading."
glass_desc = "A nice, strong, and refreshing beverage while you are reading."
cup_icon_state = "cup_latte"
cup_name = "cup of cafe latte"
cup_desc = "A nice and refreshing beverage while you are reading."
cup_desc = "A nice, strong, and refreshing beverage while you are reading."
/datum/reagent/drink/coffee/cafe_latte/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
@@ -3295,7 +3310,7 @@
glass_name = "Sit on my face"
glass_desc = "A drink made of irish coffee and nuts, mostly known for its vulgar name. Makes for a great pickup line though!"
/datum/reagent/ethanol/hachi
name = "Hachi"
id = "hachi"
@@ -3366,7 +3381,7 @@
name = "Instant green tea powder"
id = "instantteapowdergreen"
description = "Green tea powder missing all the goodness of green tea." //Heathen.
taste_description = "strongly bitter with a subtle chemical aftertaste"
taste_description = "strong bitterness with a subtle chemical aftertaste"
color = "#56761d"
glass_name = "tea powder"
@@ -3376,7 +3391,7 @@
name = "Instant green tea"
id = "instantteagreen"
description = "Convenient green tea missing all the goodness of actual green tea." //It's not even hot.
taste_description = "bitter with a subtle chemical aftertaste"
taste_description = "bitterness with a subtle chemical aftertaste"
color = "#cac162"
glass_name = "green tea"
@@ -3385,3 +3400,38 @@
cup_icon_state = "cup_tea"
cup_name = "cup of tea"
cup_desc = "Green tea. It smells a bit off."
/datum/reagent/drink/matchapowder
name = "Matcha powder"
id = "matchapowder"
description = "Finely ground green tea. This is about the highest quality matcha you can prepare without traditional methods."
taste_description = "heavy bitterness"
color = "#86a443"
glass_name = "matcha powder"
glass_desc = "Matcha powder, waiting for brewing."
/datum/reagent/drink/matcha
name = "Matcha"
id = "matcha"
description = "A form of green tea where the leaf is ground and suspended in water rather than steeped. This is considered cooking grade."
taste_description = "floral, full-bodied bitterness with a subtle, earthy sweetness"
color = "#9bc265"
adj_dizzy = -4
adj_drowsy = -1
adj_sleepy = -3
adj_temp = 20
glass_name = "matcha"
glass_desc = "Heavenly matcha. Good for body and spirit."
cup_icon_state = "cup_tea"
cup_name = "cup of matcha"
cup_desc = "Heavenly matcha. Good for body and spirit."
/datum/reagent/drink/matcha/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
if(alien == IS_DIONA)
return
M.adjustToxLoss(-3 * removed) //Almost on par with dylovene despite being harder to obtain in bulk. Nerf if this causes problems.
code/modules/reagents/Chemistry-Recipes_ch.dm
+13 -1
View File
@@ -47,4 +47,16 @@
id = "instantteagreen"
result = "instantteagreen"
required_reagents = list ("instantteapowdergreen" = 1, "water" = 9)
result_amount = 10
result_amount = 10
/datum/chemical_reaction/matcha
id = "matcha"
result = "matcha"
required_reagents = list ("matchapowder" = 1, "hotwater" = 2)
result_amount = 2
/datum/chemical_reaction/tea/matcha_latte
id = "matcha_latte"
result = "matcha_latte"
required_reagents = list ("matchapowder" = 1, "milk" = 5)
result_amount = 5
code/modules/reagents/dispenser/cartridge_presets.dm
+1
View File
@@ -71,6 +71,7 @@
cream spawn_reagent = "cream"
mint spawn_reagent = "mint"
berry spawn_reagent = "berryjuice"
matcha_latte spawn_reagent = "matcha_latte"
// ERT
inaprov spawn_reagent = "inaprovaline"
code/modules/reagents/dispenser/dispenser2_energy.dm
+1 -1
View File
@@ -58,5 +58,5 @@
/obj/machinery/chemical_dispenser/bar_coffee
dispense_reagents = list(
"coffee", "cafe_latte", "soy_latte", "hot_coco", "milk", "cream", "tea", "ice",
"orangejuice", "lemonjuice", "limejuice", "berryjuice", "mint"
"orangejuice", "lemonjuice", "limejuice", "berryjuice", "mint", "matcha_latte"
)
code/modules/reagents/dispenser/dispenser_presets.dm
+1 -2
View File
@@ -137,6 +137,5 @@
/obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/lime,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/berry,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/matcha_latte
)
code/modules/reagents/dispenser/supply.dm
+2 -1
View File
@@ -120,7 +120,8 @@
/obj/item/weapon/reagent_containers/chem_disp_cartridge/milk,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/cream,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/tea,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/ice
/obj/item/weapon/reagent_containers/chem_disp_cartridge/ice,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/matcha_latte
)
cost = 50
containertype = /obj/structure/closet/crate
code/modules/reagents/reagent_containers/food/snacks_vr.dm
+28 -1
View File
@@ -378,7 +378,6 @@
/obj/item/weapon/reagent_containers/food/snacks/steamtealeaf/New()
..()
reagents.add_reagent("teamush", 3)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/steamtealeaf/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -412,6 +411,34 @@
reagents.add_reagent("tealeavesgreen", 6)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/tencha
name = "Tencha"
desc = "A dried, crumbly green tea leaf. Needs deveined."
icon = 'icons/obj/food.dmi'
icon_state = "tencha"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/matchaleaf
slices_num = 1
nutriment_amt = 0
nutriment_desc = list("nothing" = 1)
/obj/item/weapon/reagent_containers/food/snacks/tencha/New()
..()
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/matchaleaf
name = "Matcha"
desc = "Low grade matcha. Ready for grinding."
icon = 'icons/obj/food.dmi'
icon_state = "matchaleaf"
nutriment_amt = 0
nutriment_desc = list("nothing" = 0)
/obj/item/weapon/reagent_containers/food/snacks/matchaleaf/New()
..()
reagents.add_reagent("matchapowder", 5)
reagents.remove_reagent("teamush", 5)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sobakacube
name = "sobaka cube"
monkey_type = "Sobaka"