Merge pull request #6620 from Citadel-Station-13/upstream-merge-37598

[MIRROR] Adds grenadine.

code/modules/food_and_drinks/drinks/drinks/bottle.dm

@@ -377,6 +377,15 @@
 	isGlass = FALSE
 	list_reagents = list("menthol" = 100)
 
+/obj/item/reagent_containers/food/drinks/bottle/grenadine
+	name = "Jester Grenadine"
+	desc = "Contains 0% real cherries!"
+	icon_state = "grenadine"
+	isGlass = TRUE
+	list_reagents = list("grenadine" = 100)
+	foodtype = FRUIT
+
+
 ////////////////////////// MOLOTOV ///////////////////////
 /obj/item/reagent_containers/food/drinks/bottle/molotov
 	name = "molotov cocktail"

code/modules/food_and_drinks/recipes/drinks_recipes.dm

@@ -141,8 +141,8 @@
 /datum/chemical_reaction/tequila_sunrise
 	name = "Tequila Sunrise"
 	id = "tequilasunrise"
-	results = list("tequilasunrise" = 3)
-	required_reagents = list("tequila" = 2, "orangejuice" = 1)
+	results = list("tequilasunrise" = 5)
+	required_reagents = list("tequila" = 2, "orangejuice" = 2, "grenadine" = 1)
 
 /datum/chemical_reaction/toxins_special
 	name = "Toxins Special"

code/modules/reagents/chemistry/machinery/chem_dispenser.dm

@@ -431,6 +431,7 @@ obj/machinery/chem_dispenser/proc/work_animation()
 		"shamblers",
 		"sugar",
 		"orangejuice",
+		"grenadine",
 		"limejuice",
 		"tomatojuice",
 		"lemonjuice",

code/modules/reagents/chemistry/reagents/alcohol_reagents.dm

@@ -561,10 +561,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
 /datum/reagent/consumable/ethanol/tequila_sunrise
 	name = "Tequila Sunrise"
 	id = "tequilasunrise"
-	description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~"
+	description = "Tequila, Grenadine, and Orange Juice."
 	color = "#FFE48C" // rgb: 255, 228, 140
 	boozepwr = 45
-	taste_description = "oranges"
+	taste_description = "oranges with a hint of pomegranate"
 	glass_icon_state = "tequilasunriseglass"
 	glass_name = "tequila Sunrise"
 	glass_desc = "Oh great, now you feel nostalgic about sunrises back on Terra..."

code/modules/reagents/chemistry/reagents/drink_reagents.dm

@@ -721,7 +721,7 @@
 	description = "Milk for cool kids."
 	color = "#7D4E29"
 	taste_description = "chocolate milk"
-
+  
 /datum/reagent/consumable/menthol
 	name = "Menthol"
 	id = "menthol"
@@ -731,3 +731,12 @@
 	glass_icon_state = "glass_green"
 	glass_name = "glass of menthol"
 	glass_desc = "Tastes naturally minty, and imparts a very mild numbing sensation."
+
+/datum/reagent/consumable/grenadine
+	name = "Grenadine"
+	id = "grenadine"
+	description = "Not cherry flavored!"
+	color = "#EA1D26"
+	taste_description = "sweet pomegranates"
+	glass_name = "glass of grenadine"
+	glass_desc = "Delicious flavored syrup."

code/modules/reagents/reagent_containers/borghydro.dm

@@ -179,7 +179,8 @@ Borg Shaker
 	charge_cost = 20 //Lots of reagents all regenerating at once, so the charge cost is lower. They also regenerate faster.
 	recharge_time = 3
 	accepts_reagent_upgrades = FALSE
-	reagent_ids = list("beer", "orangejuice", "grenadine" ,"limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequila", "vermouth", "wine", "kahlua", "cognac", "ale", "fernet")
+
+	reagent_ids = list("beer", "orangejuice", "grenadine" ,"limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequila", "vermouth", "wine", "kahlua", "cognac", "ale")
 
 /obj/item/reagent_containers/borghypo/borgshaker/attack(mob/M, mob/user)
 	return //Can't inject stuff with a shaker, can we? //not with that attitude

code/modules/vending/boozeomat.dm

@@ -21,6 +21,7 @@
 					/obj/item/reagent_containers/food/drinks/bottle/orangejuice = 4,
 					/obj/item/reagent_containers/food/drinks/bottle/tomatojuice = 4,
 					/obj/item/reagent_containers/food/drinks/bottle/limejuice = 4,
+					/obj/item/reagent_containers/food/drinks/bottle/grenadine = 4,
 					/obj/item/reagent_containers/food/drinks/bottle/menthol = 4,
 					/obj/item/reagent_containers/food/drinks/bottle/cream = 4,
 					/obj/item/reagent_containers/food/drinks/soda_cans/tonic = 8,