From 4c01ecaee4b3d99c9a6a2df68a164bfd16e03ede Mon Sep 17 00:00:00 2001
From: Nanai <dawnsedai@gmail.com>
Date: Mon, 21 Oct 2013 07:11:40 -0400
Subject: [PATCH] Fixed iced tea, adds canned ice tea and grape juice, adds
 grape juice, melon liquor, blue curacao, grenadine, poisonous wine.
 rebalances absinthe, and places it within the vendor.

---
 code/modules/reagents/Chemistry-Reagents.dm   | 102 ++++++++++++++++--
 code/modules/reagents/Chemistry-Recipes.dm    |  49 ++++++++-
 .../reagent_containers/food/drinks.dm         |  30 ++++++
 .../reagent_containers/food/drinks/bottle.dm  |  32 ++++++
 .../food/drinks/drinkingglass.dm              |  38 ++++++-
 5 files changed, 233 insertions(+), 18 deletions(-)

diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index fb172e2801..8f16252455 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -2340,6 +2340,12 @@ datum
 			name = "Berry Juice"
 			id = "berryjuice"
 			description = "A delicious blend of several different kinds of berries."
+			color = "#990066" // rgb: 153, 0, 102
+
+		drink/grapejuice
+			name = "Grape Juice"
+			id = "grapejuice"
+			description = "It's grrrrrape!"
 			color = "#863333" // rgb: 134, 51, 51
 
 		drink/poisonberryjuice
@@ -2408,6 +2414,12 @@ datum
 			description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?"
 			color = "#DFD7AF" // rgb: 223, 215, 175
 
+		drink/grenadine
+			name = "Grenadine Syrup"
+			id = "grenadine"
+			description = "Made in the modern day with proper pomegranate substitute. Who uses real fruit, anyways?"
+			color = "#FF004F" // rgb: 255, 0, 79
+
 		drink/hot_coco
 			name = "Hot Chocolate"
 			id = "hot_coco"
@@ -3010,20 +3022,69 @@ datum
 			name = "Absinthe"
 			id = "absinthe"
 			description = "Watch out that the Green Fairy doesn't come for you!"
-			color = "#33EE00" // rgb: lots, ??, ??
-			boozepwr = 2
+			color = "#33EE00" // rgb: 51, 238, 0
+			boozepwr = 4
 			dizzy_adj = 5
-			slur_start = 25
-			confused_start = 100
+			slur_start = 15
+			confused_start = 30
 
-			//copy paste from LSD... shoot me
-			on_mob_life(var/mob/M)
+
+		ethanol/pwine
+			name = "Poison Wine"
+			id = "pwine"
+			description = "Is this even wine? Toxic! Hallucinogenic! Probably consumed in boatloads by your superiors!"
+			color = "#000000" // rgb: 0, 0, 0 SHOCKER
+			boozepwr = 1
+			dizzy_adj = 1
+			slur_start = 1
+			confused_start = 1
+
+			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
+				M.druggy = max(M.druggy, 50)
 				if(!data) data = 1
 				data++
-				M:hallucination += 5
-				..()
-				return
+				switch(data)
+					if(1 to 25)
+						if (!M.stuttering) M.stuttering = 1
+						M.make_dizzy(10)
+						M.hallucination = max(M.hallucination, 3)
+						if(prob(1)) M.emote(pick("twitch","giggle"))
+					if(25 to 75)
+						if (!M.stuttering) M.stuttering = 1
+						M.hallucination = max(M.hallucination, 10)
+						M.make_jittery(20)
+						M.make_dizzy(20)
+						M.druggy = max(M.druggy, 45)
+						if(prob(5)) M.emote(pick("twitch","giggle"))
+					if (75 to 150)
+						if (!M.stuttering) M.stuttering = 1
+						M.hallucination = max(M.hallucination, 60)
+						M.make_jittery(40)
+						M.make_dizzy(40)
+						M.druggy = max(M.druggy, 60)
+						if(prob(10)) M.emote(pick("twitch","giggle"))
+						if(prob(30)) M.adjustToxLoss(2)
+					if (150 to 300)
+						if (!M.stuttering) M.stuttering = 1
+						M.hallucination = max(M.hallucination, 60)
+						M.make_jittery(40)
+						M.make_dizzy(40)
+						M.druggy = max(M.druggy, 60)
+						if(prob(10)) M.emote(pick("twitch","giggle"))
+						if(prob(30)) M.adjustToxLoss(2)
+						if(prob(5)) if(ishuman(M))
+							var/mob/living/carbon/human/H = M
+							var/datum/organ/internal/heart/L = H.internal_organs["heart"]
+							if (istype(L))
+								L.take_damage(5, 0)
+					if (300 to INFINITY)
+						if(ishuman(M))
+							var/mob/living/carbon/human/H = M
+							var/datum/organ/internal/heart/L = H.internal_organs["heart"]
+							if (istype(L))
+								L.take_damage(100, 0)
+
 
 		ethanol/deadrum
 			name = "Deadrum"
@@ -3275,6 +3336,27 @@ datum
 			color = "#FFFFFF" // rgb: 255, 255, 255
 			boozepwr = 1.5
 
+		ethanol/melonliquor
+			name = "Melon Liquor"
+			id = "melonliquor"
+			description = "A relatively sweet and fruity 46 proof liquor."
+			color = "#138808" // rgb: 19, 136, 8
+			boozepwr = 1
+
+		ethanol/bluecuracao
+			name = "Blue Curacao"
+			id = "bluecuracao"
+			description = "Exotically blue, fruity drink, distilled from oranges."
+			color = "#0000CD" // rgb: 0, 0, 205
+			boozepwr = 1.5
+
+		ethanol/suidream
+			name = "Sui Dream"
+			id = "suidream"
+			description = "Comprised of: White soda, blue curacao, melon liquor."
+			color = "#00A86B" // rgb: 0, 168, 107
+			boozepwr = 0.5
+
 		ethanol/demonsblood
 			name = "Demons Blood"
 			id = "demonsblood"
@@ -3476,4 +3558,4 @@ datum
 				return
 
 // Undefine the alias for REAGENTS_EFFECT_MULTIPLER
-#undef REM
+#undef REM
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index b5720a448b..07c1c77869 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -1461,11 +1461,43 @@ datum
 			required_catalysts = list("enzyme" = 5)
 			result_amount = 10
 
+		grenadine
+			name = "Grenadine Syrup"
+			id = "grenadine"
+			result = "grenadine"
+			required_reagents = list("berryjuice" = 10)
+			required_catalysts = list("enzyme" = 5)
+			result_amount = 10
+
 		wine
 			name = "Wine"
 			id = "wine"
 			result = "wine"
-			required_reagents = list("berryjuice" = 10)
+			required_reagents = list("grapejuice" = 10)
+			required_catalysts = list("enzyme" = 5)
+			result_amount = 10
+
+		pwine
+			name = "Poison Wine"
+			id = "pwine"
+			result = "pwine"
+			required_reagents = list("poisonberryjuice" = 10)
+			required_catalysts = list("enzyme" = 5)
+			result_amount = 10
+
+		melonliquor
+			name = "Melon Liquor"
+			id = "melonliquor"
+			result = "melonliquor"
+			required_reagents = list("watermelonjuice" = 10)
+			required_catalysts = list("enzyme" = 5)
+			result_amount = 10
+
+		bluecuracao
+			name = "Blue Curacao"
+			id = "bluecuracao"
+			result = "bluecuracao"
+			required_reagents = list("orangejuice" = 10)
 			required_catalysts = list("enzyme" = 5)
 			result_amount = 10
 
@@ -1654,6 +1686,13 @@ datum
 			required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 1)
 			result_amount = 4
 
+		icedtea
+			name = "Long Island Iced Tea"
+			id = "longislandicedtea"
+			result = "longislandicedtea"
+			required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 1)
+			result_amount = 4
+
 		threemileisland
 			name = "Three Mile Island Iced Tea"
 			id = "threemileisland"
@@ -1952,5 +1991,9 @@ datum
 			required_reagents = list("spacemountainwind" = 1, "coffee" = 1)
 			result_amount = 2
 
-
-
+		suidream
+			name = "Sui Dream"
+			id = "suidream"
+			result = "suidream"
+			required_reagents = list("space_up" = 2, "bluecuracao" = 1, "melonliquor" = 1)
+			result_amount = 4
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index 44de752b6b..86bd97d7ea 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -252,6 +252,16 @@
 		src.pixel_x = rand(-10.0, 10)
 		src.pixel_y = rand(-10.0, 10)
 
+/obj/item/weapon/reagent_containers/food/drinks/waterbottle
+	name = "Bottled Water"
+	desc = "Introduced to the vending machines on health nut protest, taste fresh, pure glacial* water! *Note: Might be tapwater."
+	icon_state = "waterbottle"
+	New()
+		..()
+		reagents.add_reagent("water", 30)
+		src.pixel_x = rand(-10.0, 10)
+		src.pixel_y = rand(-10.0, 10)
+
 /obj/item/weapon/reagent_containers/food/drinks/beer
 	name = "Space Beer"
 	desc = "Beer. In space."
@@ -273,6 +283,7 @@
 		src.pixel_x = rand(-10.0, 10)
 		src.pixel_y = rand(-10.0, 10)
 
+
 /obj/item/weapon/reagent_containers/food/drinks/space_mountain_wind
 	name = "Space Mountain Wind"
 	desc = "Blows right through you like a space wind."
@@ -334,6 +345,25 @@
 		src.pixel_x = rand(-10.0, 10)
 		src.pixel_y = rand(-10.0, 10)
 
+/obj/item/weapon/reagent_containers/food/drinks/iced_tea
+	name = "Vrisk Serket Iced Tea"
+	desc = "That sweet, refreshing southern earthy flavor. That's where it's from, right? South Earth? Whatever!!!!!!!!"
+	icon_state = "ice_tea_can"
+	New()
+		..()
+		reagents.add_reagent("icetea", 30)
+		src.pixel_x = rand(-10.0, 10)
+		src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/grape_juice
+	name = "Grapel Juice"
+	desc = "500 pages of rules of how to appropriately enter into a combat with this juice!"
+	icon_state = "purple_can"
+	New()
+		..()
+		reagents.add_reagent("grapejuice", 30)
+		src.pixel_x = rand(-10.0, 10)
+		src.pixel_y = rand(-10.0, 10)
 
 /obj/item/weapon/reagent_containers/food/drinks/sillycup
 	name = "Paper Cup"
diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
index c958b351fa..64cd2c3e94 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
@@ -244,6 +244,38 @@
 		..()
 		reagents.add_reagent("absinthe", 100)
 
+/obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor
+	name = "Emeraldine Melon Liquor"
+	desc = "A bottle of 46 proof Emeraldine Melon Liquor. Sweet and light."
+	icon_state = "alco-green" //Placeholder.
+	New()
+		..()
+		reagents.add_reagent("melonliquor", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao
+	name = "Miss Blue Curacao"
+	desc = "A fruity, exceptionally azure drink. Does not allow the imbiber to use the fifth magic."
+	icon_state = "alco-blue" //Placeholder.
+	New()
+		..()
+		reagents.add_reagent("bluecuracao", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine
+	name = "Briar Rose Grenadine Syrup"
+	desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks."
+	icon_state = "grenadinebottle"
+	New()
+		..()
+		reagents.add_reagent("grenadine", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine
+	name = "Warlock's Velvet"
+	desc = "What a delightful packaging for a surely high quality wine! The vintage must be amazing!"
+	icon_state = "pwinebottle"
+	New()
+		..()
+		reagents.add_reagent("pwine", 100)
+
 //////////////////////////JUICES AND STUFF ///////////////////////
 
 /obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice
diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
index 48636b4b60..2aec56dc0a 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
@@ -60,7 +60,7 @@
 					desc = "Vitamins! Yay!"
 				if("tomatojuice")
 					icon_state = "glass_red"
-					name = "Glass of Tomato juice"
+					name = "Glass of Tomato juf"
 					desc = "Are you sure this is tomato juice?"
 				if("blood")
 					icon_state = "glass_red"
@@ -429,17 +429,25 @@
 				if("brownstar")
 					icon_state = "brownstar"
 					name = "Brown Star"
-					desc = "Its not what it sounds like..."
+					desc = "It's not what it sounds like..."
+				if("grapejuice")
+					icon_state = "grapejuice"
+					name = "Glass of grape juice"
+					desc = "It's grrrrrape!"
 				if("icetea")
-					icon_state = "icetea"
+					icon_state = "icedteaglass"
 					name = "Iced Tea"
 					desc = "No relation to a certain rap artist/ actor."
+				if("grenadine")
+					icon_state = "grenadineglass"
+					name = "Glass of grenadine syrup"
+					desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks."
 				if("milkshake")
 					icon_state = "milkshake"
 					name = "Milkshake"
 					desc = "Glorious brainfreezing mixture."
 				if("lemonade")
-					icon_state = "lemonade"
+					icon_state = "lemonadeglass"
 					name = "Lemonade"
 					desc = "Oh the nostalgia..."
 				if("kiraspecial")
@@ -449,7 +457,27 @@
 				if("rewriter")
 					icon_state = "rewriter"
 					name = "Rewriter"
-					desc = "The secert of the sanctuary of the Libarian..."
+					desc = "The secret of the sanctuary of the Libarian..."
+				if("suidream")
+					icon_state = "sdreamglass"
+					name = "Sui Dream"
+					desc = "A froofy, fruity, and sweet mixed drink. Understanding the name only brings shame."
+				if("melonliquor")
+					icon_state = "emeraldglass"
+					name = "Glass of Melon Liquor"
+					desc = "A relatively sweet and fruity 46 proof liquor."
+				if("bluecuracao")
+					icon_state = "curacaoglass"
+					name = "Glass of Blue Curacao"
+					desc = "Exotically blue, fruity drink, distilled from oranges."
+				if("absinthe")
+					icon_state = "absintheglass"
+					name = "Glass of Absinthe"
+					desc = "Wormwood, anise, oh my."
+				if("pwine")
+					icon_state = "pwineglass"
+					name = "Glass of ???"
+					desc = "A black ichor with an oily purple sheer on top. Are you sure you should drink this?"
 				else
 					icon_state ="glass_brown"
 					name = "Glass of ..what?"