Merge pull request #12411 from bgobandit/grapesetc

Adds recipes for grapes and grape juice.

code/modules/food&drinks/food/snacks_pie.dm

@@ -129,6 +129,13 @@
 	bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
 	list_reagents = list("nutriment" = 8, "gold" = 5, "vitamin" = 4)
 
+/obj/item/weapon/reagent_containers/food/snacks/pie/grapetart
+	name = "grape tart"
+	desc = "A tasty dessert that reminds you of the wine you didn't make."
+	icon_state = "grapetart"
+	bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
+	list_reagents = list("nutriment" = 4, "vitamin" = 4)
+
 /obj/item/weapon/reagent_containers/food/snacks/pie/blumpkinpie
 	name = "blumpkin pie"
 	desc = "An odd blue pie made with toxic blumpkin."

code/modules/food&drinks/kitchen machinery/juicer.dm

@@ -15,6 +15,8 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato  = "tomatojuice",
 		/obj/item/weapon/reagent_containers/food/snacks/grown/carrot  = "carrotjuice",
 		/obj/item/weapon/reagent_containers/food/snacks/grown/berries = "berryjuice",
+		/obj/item/weapon/reagent_containers/food/snacks/grown/grapes = "grapejuice",
+		/obj/item/weapon/reagent_containers/food/snacks/grown/grapes/green = "grapejuice",
 		/obj/item/weapon/reagent_containers/food/snacks/grown/banana  = "banana",
 		/obj/item/weapon/reagent_containers/food/snacks/grown/potato = "potato",
 		/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lemon = "lemonjuice",
@@ -96,7 +98,7 @@
 		beaker_contents = "\The [src]  has attached a beaker with something."
 		is_beaker_ready = 1
 	else
-		beaker_contents = "\The [src]  has attached a beaker and beaker is full!"
+		beaker_contents = "\The [src]  has attached a beaker and the beaker is full!"
 
 	var/dat = {"
 <b>Processing chamber contains:</b><br>
@@ -172,12 +174,15 @@
 	new/obj/item/weapon/reagent_containers/food/snacks/grown/carrot(src)
 	new/obj/item/weapon/reagent_containers/food/snacks/grown/berries(src)
 	new/obj/item/weapon/reagent_containers/food/snacks/grown/banana(src)
+	new/obj/item/weapon/reagent_containers/food/snacks/grown/grapes(src)
 	new/obj/item/weapon/reagent_containers/food/snacks/grown/tomato(src)
 	new/obj/item/weapon/reagent_containers/food/snacks/grown/carrot(src)
 	new/obj/item/weapon/reagent_containers/food/snacks/grown/berries(src)
 	new/obj/item/weapon/reagent_containers/food/snacks/grown/banana(src)
+	new/obj/item/weapon/reagent_containers/food/snacks/grown/grapes(src)
 	new/obj/item/weapon/reagent_containers/food/snacks/grown/tomato(src)
 	new/obj/item/weapon/reagent_containers/food/snacks/grown/carrot(src)
 	new/obj/item/weapon/reagent_containers/food/snacks/grown/berries(src)
 	new/obj/item/weapon/reagent_containers/food/snacks/grown/banana(src)
+	new/obj/item/weapon/reagent_containers/food/snacks/grown/grapes(src)
 

code/modules/food&drinks/recipes/drinks_recipes.dm

@@ -55,7 +55,7 @@
 	name = "Wine"
 	id = "wine"
 	result = "wine"
-	required_reagents = list("berryjuice" = 10)
+	required_reagents = list("grapejuice" = 10)
 	required_catalysts = list("enzyme" = 5)
 	result_amount = 10
 
@@ -544,7 +544,7 @@
 	result_amount = 4
 
 /datum/chemical_reaction/pumpkin_latte
-	name = "Pumpkin latte"
+	name = "Pumpkin space latte"
 	id = "pumpkin_latte"
 	result = "pumpkin_latte"
 	required_reagents = list("pumpkinjuice" = 5, "coffee" = 5, "cream" = 5)
@@ -562,4 +562,19 @@
 	id = "triple_citrus"
 	result = "triple_citrus"
 	required_reagents = list("lemonjuice" = 1, "limejuice" = 1, "orangejuice" = 1)
-	result_amount = 5
+	result_amount = 5
+
+/datum/chemical_reaction/grape_soda
+	name = "grape soda"
+	id = "grapesoda"
+	result = "grape_soda"
+	required_reagents = list("grapejuice" = 1, "sodawater" = 1)
+	result_amount = 2
+
+/datum/chemical_reaction/grappa
+	name = "grappa"
+	id = "grappa"
+	result = "grappa"
+	required_reagents = list ("wine" = 10)
+	required_catalysts = list ("enzyme" = 5)
+	result_amount = 10

code/modules/food&drinks/recipes/tablecraft/recipes_pie.dm

@@ -119,6 +119,17 @@
 	result = /obj/item/weapon/reagent_containers/food/snacks/pie/appletart
 	category = CAT_FOOD
 
+/datum/table_recipe/grapetart
+	name = "Grape tart"
+	reqs = list(
+            /datum/reagent/consumable/milk = 5,
+            /datum/reagent/consumable/sugar = 5,
+            /obj/item/weapon/reagent_containers/food/snacks/pie/plain = 1,
+	        /obj/item/weapon/reagent_containers/food/snacks/grown/grapes = 3
+	        )
+	result = /obj/item/weapon/reagent_containers/food/snacks/pie/grapetart
+	category = CAT_FOOD
+
 /datum/table_recipe/blumpkinpie
 	name = "Blumpkin pie"
 	reqs = list(

code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm

@@ -163,7 +163,7 @@
 /datum/reagent/consumable/ethanol/tequila
 	name = "Tequila"
 	id = "tequila"
-	description = "A strong and mildly flavoured, mexican produced spirit. Feeling thirsty, hombre?"
+	description = "A strong and mildly flavoured, Mexican produced spirit. Feeling thirsty, hombre?"
 	color = "#FFFF91" // rgb: 255, 255, 145
 	boozepwr = 35
 
@@ -177,10 +177,17 @@
 /datum/reagent/consumable/ethanol/wine
 	name = "Wine"
 	id = "wine"
-	description = "An premium alchoholic beverage made from distilled grape juice."
+	description = "An premium alcoholic beverage made from distilled grape juice."
 	color = "#7E4043" // rgb: 126, 64, 67
 	boozepwr = 45
 
+/datum/reagent/consumable/ethanol/grappa
+	name = "Grappa"
+	id = "grappa"
+	description = "A fine Italian brandy, for when regular wine just isn't alcoholic enough for you."
+	color = "#F8EBF1"
+	boozepwr = 35
+
 /datum/reagent/consumable/ethanol/cognac
 	name = "Cognac"
 	id = "cognac"
@@ -493,7 +500,7 @@
 /datum/reagent/consumable/ethanol/mead
 	name = "Mead"
 	id = "mead"
-	description = "A Vikings drink, though a cheap one."
+	description = "A Viking drink, though a cheap one."
 	color = "#664300" // rgb: 102, 67, 0
 	nutriment_factor = 1 * REAGENTS_METABOLISM
 	boozepwr = 45

code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm

@@ -115,6 +115,12 @@
 	nutriment_factor = 2 * REAGENTS_METABOLISM
 	color = "#302000" // rgb: 48, 32, 0
 
+/datum/reagent/consumable/grapejuice
+	name = "Grape juice"
+	id = "grapejuice"
+	description = "The juice of a bunch of grapes. Guaranteed non-alcoholic."
+	color = "#290029" // dark purple
+
 /datum/reagent/consumable/milk
 	name = "Milk"
 	id = "milk"
@@ -465,6 +471,11 @@
 	description = "A solution."
 	color = "#C8A5DC"
 
+/datum/reagent/consumable/grape_soda
+	name = "Grape soda"
+	id = "grapesoda"
+	description = "Beloved of children and teetotalers."
+	color = "#E6CDFF"
 
 //////////////////////////////////////////////The ten friggen million reagents that get you drunk//////////////////////////////////////////////