Merge pull request #8223 from MistakeNot4892/fixes

Updates wine reagent id to redwine.

code/modules/food/recipes_microwave.dm

@@ -334,7 +334,7 @@ I said no!
 	result = /obj/item/weapon/reagent_containers/food/snacks/candiedapple
 
 /datum/recipe/twobread
-	reagents = list("wine" = 5)
+	reagents = list("redwine" = 5)
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/slice/bread,
 		/obj/item/weapon/reagent_containers/food/snacks/slice/bread,
@@ -785,7 +785,7 @@ I said no!
 	result = /obj/item/weapon/reagent_containers/food/snacks/chilicheesefries
 
 /datum/recipe/risotto
-	reagents = list("wine" = 5, "rice" = 10, "spacespice" = 1)
+	reagents = list("redwine" = 5, "rice" = 10, "spacespice" = 1)
 	fruit = list("mushroom" = 1)
 	reagent_mix = RECIPE_REAGENT_REPLACE //Get that rice and wine outta here
 	result = /obj/item/weapon/reagent_containers/food/snacks/risotto

code/modules/reagents/reactions/instant/drinks.dm

@@ -399,7 +399,7 @@
 	name = "Singulo"
 	id = "singulo"
 	result = "singulo"
-	required_reagents = list("vodka" = 5, "radium" = 1, "wine" = 5)
+	required_reagents = list("vodka" = 5, "radium" = 1, "redwine" = 5)
 	result_amount = 10
 
 /decl/chemical_reaction/instant/drinks/alliescocktail
@@ -505,14 +505,14 @@
 	name = "Acid Spit"
 	id = "acidspit"
 	result = "acidspit"
-	required_reagents = list("sacid" = 1, "wine" = 5)
+	required_reagents = list("sacid" = 1, "redwine" = 5)
 	result_amount = 6
 
 /decl/chemical_reaction/instant/drinks/amasec
 	name = "Amasec"
 	id = "amasec"
 	result = "amasec"
-	required_reagents = list("iron" = 1, "wine" = 5, "vodka" = 5)
+	required_reagents = list("iron" = 1, "redwine" = 5, "vodka" = 5)
 	result_amount = 10
 
 /decl/chemical_reaction/instant/drinks/changelingsting
@@ -661,7 +661,7 @@
 	name = "Melon Spritzer"
 	id = "melonspritzer"
 	result = "melonspritzer"
-	required_reagents = list("watermelonjuice" = 2, "wine" = 2, "applejuice" = 1, "limejuice" = 1)
+	required_reagents = list("watermelonjuice" = 2, "redwine" = 2, "applejuice" = 1, "limejuice" = 1)
 	result_amount = 6
 
 /decl/chemical_reaction/instant/drinks/fauxfizz
@@ -915,7 +915,7 @@
     name = "Wine brandy"
     id = "winebrandy"
     result = "winebrandy"
-    required_reagents = list("wine" = 10)
+    required_reagents = list("redwine" = 10)
     catalysts = list("enzyme" = 10) //10u enzyme so it requires more than is usually added. Stops overlap with wine recipe
     result_amount = 5
 
@@ -937,7 +937,7 @@
 	name = "Vesper"
 	id = "vesper"
 	result = "vesper"
-	required_reagents = list("gin" = 3, "vodka" = 1, "wine" = 1)
+	required_reagents = list("gin" = 3, "vodka" = 1, "redwine" = 1)
 	result_amount = 4
 
 /decl/chemical_reaction/instant/drinks/rotgut

code/modules/reagents/reagent_containers/borghypo.dm

@@ -155,6 +155,7 @@
 		"milk",
 		"mint",
 		"orangejuice",
+		"redwine",
 		"rum",
 		"sake",
 		"sodawater",
@@ -172,8 +173,7 @@
 		"vodka",
 		"water",
 		"watermelonjuice",
-		"whiskey",
-		"wine")
+		"whiskey")
 
 /obj/item/weapon/reagent_containers/borghypo/service/attack(var/mob/M, var/mob/user)
 	return