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

Tea dispensing fix

Browse Source
This commit is contained in:
Cognition
2022-07-22 12:19:54 -06:00
parent 1b199dadbd
commit 70dbad7055
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/recipes/drinks_recipes.dm
+4 -4
View File
@@ -771,8 +771,8 @@
/datum/chemical_reaction/pinkmilk
name = "Strawberry Milk"
id = /datum/reagent/consumable/pinkmilk
results = list(/datum/reagent/consumable/pinkmilk = 2)
id = /datum/reagent/consumable/milk/pinkmilk
results = list(/datum/reagent/consumable/milk/pinkmilk = 2)
required_reagents = list(/datum/reagent/consumable/strawberryjuice = 1, /datum/reagent/consumable/milk = 1)
mix_message = "You feel a sweet aroma drift up your nose as the lactic mixture swirls. It reminds you of... a cafeteria."
@@ -1016,8 +1016,8 @@
/datum/chemical_reaction/pinktea
name = "Strawberry Tea"
id = /datum/reagent/consumable/pinktea
results = list(/datum/reagent/consumable/pinktea = 5)
id = /datum/reagent/consumable/tea/pinktea
results = list(/datum/reagent/consumable/tea/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
code/modules/reagents/chemistry/reagents/drink_reagents.dm
+3 -3
View File
@@ -1034,7 +1034,7 @@
M.update_transform()
..()
/datum/reagent/consumable/pinkmilk
/datum/reagent/consumable/milk/pinkmilk
name = "Strawberry Milk"
description = "A drink of a bygone era of milk and artificial sweetener back on a rock."
color = "#f76aeb"//rgb(247, 106, 235)
@@ -1045,13 +1045,13 @@
glass_desc = "Delicious flavored strawberry syrup mixed with milk."
value = REAGENT_VALUE_VERY_COMMON
/datum/reagent/consumable/tea/pinkmilk/on_mob_life(mob/living/carbon/M)
/datum/reagent/consumable/milk/pinkmilk/on_mob_life(mob/living/carbon/M)
if(prob(15))
to_chat(M, "<span class = 'notice'>[pick("You cant help to smile.","You feel nostalgia all of sudden.","You remember to relax.")]</span>")
..()
. = 1
/datum/reagent/consumable/pinktea //Tiny Tim song
/datum/reagent/consumable/tea/pinktea //Tiny Tim song
name = "Strawberry Tea"
description = "A timeless classic!"
color = "#f76aeb"//rgb(247, 106, 235)