From a7b7d7492a4f1e6c3296e59edbb9960329fbac69 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Mon, 18 Mar 2019 18:52:38 -0400
Subject: [PATCH 1/4] Add files via upload

---
 modular_citadel/icons/obj/food/drink.dmi | Bin 0 -> 423 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 modular_citadel/icons/obj/food/drink.dmi

diff --git a/modular_citadel/icons/obj/food/drink.dmi b/modular_citadel/icons/obj/food/drink.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..0972025b4f4272db44645bb3e7ff4881bc678164
GIT binary patch
literal 423
zcmV;Y0a*TtP)<h;3K|Lk000e1NJLTq002M$001Ba0{{R3P_tvV0000RP)t-sz`(%&
z|Ns90Gk}1A|C#@Gc6R^F|I7e0|Nk=vT^CjW0004WQchC<K<3zH0001UdQ@0+L}hbh
za%pgMX>V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+
z(=$pSoZ^zil2jm5sUR~iJ2x{YTZxM^C9|j)C}haRnO2mTn+jp0C@e`$#HCJI!PU<N
z>;eD<Nhb7zdCA)V006s5L_t(Ijm?t14Z|Q1g|QKR#00TILTkyMfV=@H;uSoAt8C!4
zb5yxI6s$B+o@nm)^zH|Y`I$~#`}$iy?~NG-k?K?luVP(eB2`4s!Wp=W0_B`p!UCgi
ztQXNN4BS$bKRdXUbmN5T!GVB~7Y+moU`5D|0cleJ6cG1I3$Vputblh9G(<oJuqkXw
z)DDILK`!D!z?H=|ZE90M5{ry`kbvGaIi%{fI6ytbHh}az01h0=mumrkrWXPzD#+_~
R=OX|B002ovPDHLkV1ngxt-AmK

literal 0
HcmV?d00001


From 8d213cb1c621cfc7c2436b7b7f174ea07e9e1277 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Mon, 18 Mar 2019 19:45:51 -0400
Subject: [PATCH 2/4] Update drinks_recipes.dm

---
 .../food_and_drinks/recipes/drinks_recipes.dm        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
index 02106e808c..f41f6cce80 100644
--- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
@@ -692,3 +692,15 @@
 	id = "pwr_game"
 	results = list("pwr_game" = 5)
 	required_reagents = list("sodawater" = 1, "blackcrayonpowder" = 1, "sodiumchloride" = 1)
+
+/datum/chemical_reaction/pinkmilk
+	name = "Strawberry Milk"
+	id = "pinkmilk"
+	results = list("pinkmilk" = 5)
+	required_reagents = list("aphro+" = 1, "milk" = 1)
+
+/datum/chemical_reaction/pinktea
+	name = "Strawberry Tea"
+	id = "pinktea"
+	results = list("pinktea" = 5)
+	required_reagents = list("aphro" = 1, "arnold_palmer" = 1, "sugar" = 1)

From c321e443198107592f64aa7a9981683ca9973e83 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Mon, 18 Mar 2019 20:20:24 -0400
Subject: [PATCH 3/4] Update drink_reagents.dm

---
 .../chemistry/reagents/drink_reagents.dm      | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index 0cbd1f2d85..3a0709ead6 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -745,3 +745,35 @@
 	taste_description = "sweet pomegranates"
 	glass_name = "glass of grenadine"
 	glass_desc = "Delicious flavored syrup."
+
+/datum/reagent/consumable/pinkmilk
+	name = "Strawberry Milk"
+	id = "pinkmilk"
+	description = "A drink of a bygone era of milk and artificial sweetener back on a rock."
+	color = "#f76aeb"//rgb(247, 106, 235)
+	quality = DRINK_FANTASTIC //Love drink
+	taste_description = "sweet strawberry and milk cream"
+	glass_name = "tall glass of strawberry milk"
+	glass_desc = "Delicious flavored strawberry syrup mixed with milk."
+
+/datum/reagent/consumable/tea/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
+	name = "Strawberry Tea"
+	id = "pinktea"
+	description = "A timeless classic!"
+	color = "#f76aeb"//rgb(247, 106, 235)
+	quality = DRINK_FANTASTIC //Love drink
+	taste_description = "sweet tea with a hint of strawberry"
+	glass_name = "mug of strawberry tea"
+	glass_desc = "Delicious traditional tea flavored with strawberries."
+
+/datum/reagent/consumable/tea/pinktea/on_mob_life(mob/living/carbon/M)
+	if(prob(10))
+		to_chat(M, "<span class = 'notice'>[pick("Diamond skies where white deer fly.","Sipping strawberry tea.","Silver raindrops drift through timeless, Neverending June.","Crystal ... pearls free, with love!","Beaming love into me.")]</span>")
+	..()
+	. = 1

From 4699d8380181194535113725c1a3a2b52d7d1e81 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Mon, 18 Mar 2019 20:24:57 -0400
Subject: [PATCH 4/4] the icons damn it!

---
 code/modules/reagents/chemistry/reagents/drink_reagents.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index 3a0709ead6..6ec37f3ec4 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -751,6 +751,7 @@
 	id = "pinkmilk"
 	description = "A drink of a bygone era of milk and artificial sweetener back on a rock."
 	color = "#f76aeb"//rgb(247, 106, 235)
+	glass_icon_state = "pinkmilk"
 	quality = DRINK_FANTASTIC //Love drink
 	taste_description = "sweet strawberry and milk cream"
 	glass_name = "tall glass of strawberry milk"
@@ -767,6 +768,7 @@
 	id = "pinktea"
 	description = "A timeless classic!"
 	color = "#f76aeb"//rgb(247, 106, 235)
+	glass_icon_state = "pinktea"
 	quality = DRINK_FANTASTIC //Love drink
 	taste_description = "sweet tea with a hint of strawberry"
 	glass_name = "mug of strawberry tea"