From a0bd8f69158dee208577938adcf2fd62c8dd86e4 Mon Sep 17 00:00:00 2001 From: SunnyDaise Date: Wed, 17 Jan 2018 07:29:40 +0000 Subject: [PATCH] Adds Apple Juice. --- code/modules/hydroponics/seed_datums.dm | 2 +- .../Chemistry-Reagents-Food-Drinks.dm | 21 ++++++++++++++----- .../drinkingglass/metaglass.dm | 3 +++ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index 7ee8a7bcb4..d2aa8373af 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -245,7 +245,7 @@ seed_name = "apple" display_name = "apple tree" mutants = list("poisonapple","goldapple") - chems = list("nutriment" = list(1,10)) + chems = list("nutriment" = list(1,10),"applejuice" = list(10,20)) kitchen_tag = "apple" /datum/seed/apple/New() diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 08e583931a..8b94502d40 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -521,6 +521,17 @@ glass_name = "lemon juice" glass_desc = "Sour..." +/datum/reagent/drink/juice/apple + name = "Apple Juice" + id = "applejuice" + description = "The most basic juice." + taste_description = "crispness" + taste_mult = 1.1 + color = "#E2A55F" + + glass_name = "apple juice" + glass_desc = "An earth favorite." + /datum/reagent/drink/juice/lime name = "Lime Juice" id = "limejuice" @@ -1324,7 +1335,7 @@ glass_name = "Ent's Draught" glass_desc = "You can almost smell the tranquility emanating from this." - + /datum/reagent/drink/lovepotion name = "Love Potion" id = "lovepotion" @@ -2780,7 +2791,7 @@ glass_name = "Pisco Sour" glass_desc = "South American bliss, served ice cold." - + /datum/reagent/ethanol/coldfront name = "Cold Front" id = "coldfront" @@ -2790,10 +2801,10 @@ strength = 30 adj_temp = -20 targ_temp = 220 //Dangerous to certain races. Drink in moderation. - + glass_name = "Cold Front" glass_desc = "Minty, rich, and painfully cold. It's a blizzard in a cup." - + /datum/reagent/ethanol/mintjulep name = "Mint Julep" id = "mintjulep" @@ -2802,6 +2813,6 @@ color = "#bbfc8a" // rgb(187, 252, 138) strength = 25 adj_temp = -5 - + glass_name = "Mint Julep" glass_desc = "Minty and refreshing, perfect for a hot day." \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm b/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm index 17376c7b9a..355407e9a3 100644 --- a/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm +++ b/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm @@ -90,6 +90,9 @@ Drinks Data /datum/reagent/drink/juice/lemon glass_icon_state = "lemonjuice" +/datum/reagent/drink/juice/apple + glass_icon_state = "applejuice" + /datum/reagent/drink/juice/lime glass_icon_state = "glass_green"