Merge pull request #2054 from Yoshax/cocktails

Adds new non-alcoholic drinkd

code/modules/economy/price_list.dm

@@ -42,6 +42,18 @@
 /datum/reagent/drink/milkshake
 	price_tag = 2
 
+/datum/reagent/drink/roy_rogers
+	price_tag = 2
+
+/datum/reagent/drink/shirley_temple
+	price_tag = 2
+
+/datum/reagent/drink/arnold_palmer
+	price_tag = 2
+
+/datum/reagent/drink/collins_mix
+	price_tag = 2
+
 
 // Beer //
 
@@ -322,6 +334,7 @@
 	price_tag = 3
 
 
+
 // From the machine //
 
 /obj/item/weapon/reagent_containers/food/drinks/cans/cola

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -924,6 +924,50 @@
 	glass_desc = "A tangy substance made of 0.5% natural citrus!"
 	glass_special = list(DRINK_FIZZ)
 
+/datum/reagent/drink/shirley_temple
+	name = "Shirley Temple"
+	description = "A sweet concotion hated even by its namesake."
+	id =  "shirley_temple"
+	color = "#EF304F"
+	adj_temp = -8
+
+	glass_name = "shirley temple"
+	glass_desc = "A sweet concotion hated even by its namesake."
+	glass_special = list(DRINK_FIZZ)
+
+/datum/reagent/drink/roy_rogers
+	name = "Roy Rogers"
+	description = "I'm a cowboy, on a steel horse I ride."
+	id = "roy_rogers"
+	color = "#4F1811"
+	adj_temp = -8
+
+	glass_name = "roy rogers"
+	glass_desc = "I'm a cowboy, on a steel horse I ride"
+	glass_special = list(DRINK_FIZZ)
+
+/datum/reagent/drink/collins_mix
+	name = "Collins Mix"
+	description = "Best hope it isn't a hoax."
+	id = "collins_mix"
+	color = "#D7D0B3"
+	adj_temp = -8
+
+	glass_name = "collins mix"
+	glass_desc = "Best hope it isn't a hoax."
+	glass_special = list(DRINK_FIZZ)
+
+/datum/reagent/drink/arnold_palmer
+	name = "Arnold Palmer"
+	description = "Tastes just like the old man."
+	id = "arnold_palmer"
+	color = "#AF5517"
+	adj_temp = -8
+
+	glass_name = "arnold palmer"
+	glass_desc = "Tastes just like the old man."
+	glass_special = list(DRINK_FIZZ)
+
 /datum/reagent/drink/doctor_delight
 	name = "The Doctor's Delight"
 	id = "doctorsdelight"

code/modules/reagents/Chemistry-Recipes.dm

@@ -1748,3 +1748,30 @@
 	required_reagents = list("hydrogen" = 2, "carbon" = 2, "ammonia" = 2)
 	result_amount = 6
 
+/datum/chemical_reaction/shirleytemple
+	name = "Shirley Temple"
+	id = "shirley_temple"
+	result = "shirley_temple"
+	required_reagents = list("lemon_lime" = 4, "grenadine" = 1)
+	result_amount = 5
+
+/datum/chemical_reaction/royrogers
+	name = "Roy Rogers"
+	id = "roy_rogers"
+	result = "roy_rogers"
+	required_reagents = list("cola" = 4, "grenadine" = 1)
+	result_amount = 5
+
+/datum/chemical_reaction/collinsmix
+	name = "Collins Mix"
+	id = "collins_mix"
+	result = "collins_mix"
+	required_reagents = list("lemon_lime" = 3, "sodawater" = 1)
+	result_amount = 4
+
+/datum/chemical_reaction/arnoldpalmer
+	name = "Arnold Palmer"
+	id = "arnold_palmer"
+	result = "arnold_palmer"
+	required_reagents = list("icetea" = 1, "lemonade" = 1)
+	result_amount = 2