Merge pull request #3840 from MDReckless/dev

Grape Soda addition

code/modules/reagents/Chemistry-Reagents.dm

@@ -2347,6 +2347,13 @@ datum
 			id = "grapejuice"
 			description = "It's grrrrrape!"
 			color = "#863333" // rgb: 134, 51, 51
+		
+		drink/grapesoda
+			name = "Grape Soda"
+			id = "grapesoda"
+			description = "Grapes made into a fine drank."
+			color = "#421C52" // rgb: 98, 57, 53
+			adj_drowsy 	= 	-3
 
 		drink/poisonberryjuice
 			name = "Poison Berry Juice"

code/modules/reagents/Chemistry-Recipes.dm

@@ -1790,6 +1790,14 @@ datum
 			result = "barefoot"
 			required_reagents = list("berryjuice" = 1, "cream" = 1, "vermouth" = 1)
 			result_amount = 3
+			
+		grapesoda //Allows Grape Soda to be made
+			name = "Grape Soda"
+			id = "grapesoda"
+			result = "grapesoda"
+			required_reagents = list("grapejuice" = 2, "cola" = 1)
+			result_amount = 3
+
 
 
 ////DRINKS THAT REQUIRED IMPROVED SPRITES BELOW:: -Agouri/////

code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm

@@ -1,5 +1,5 @@
-
-
+ 
+ 
 /obj/item/weapon/reagent_containers/food/drinks/drinkingglass
 	name = "glass"
 	desc = "Your standard drinking glass."
@@ -434,6 +434,10 @@
 					icon_state = "grapejuice"
 					name = "Glass of grape juice"
 					desc = "It's grrrrrape!"
+				if("grapesoda")
+					icon_state = "grapesoda"
+					name = "Can of Grape Soda"
+					desc = "Looks like a delicious drank!"
 				if("icetea")
 					icon_state = "icedteaglass"
 					name = "Iced Tea"
@@ -499,4 +503,4 @@
 	New()
 		..()
 		reagents.add_reagent("cola", 50)
-		on_reagent_change()
+		on_reagent_change()