diff --git a/code/modules/food&drinks/kitchen machinery/juicer.dm b/code/modules/food&drinks/kitchen machinery/juicer.dm index e688b2ee575..62349b8f825 100644 --- a/code/modules/food&drinks/kitchen machinery/juicer.dm +++ b/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 = {" Processing chamber contains:
@@ -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) diff --git a/code/modules/food&drinks/recipes/drinks_recipes.dm b/code/modules/food&drinks/recipes/drinks_recipes.dm index d5bac77ace3..d020473cfc7 100644 --- a/code/modules/food&drinks/recipes/drinks_recipes.dm +++ b/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,11 @@ id = "triple_citrus" result = "triple_citrus" required_reagents = list("lemonjuice" = 1, "limejuice" = 1, "orangejuice" = 1) + 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 = 5 \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm index e945e1f44b9..9997396152b 100644 --- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm +++ b/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//////////////////////////////////////////////