diff --git a/code/game/machinery/vendors/departmental_vendors.dm b/code/game/machinery/vendors/departmental_vendors.dm index 35efe649cbe3..708d38e30853 100644 --- a/code/game/machinery/vendors/departmental_vendors.dm +++ b/code/game/machinery/vendors/departmental_vendors.dm @@ -195,6 +195,7 @@ /obj/item/seeds/lemon = 3, /obj/item/seeds/lime = 3, /obj/item/seeds/mint = 3, + /obj/item/seeds/olive = 3, /obj/item/seeds/onion = 3, /obj/item/seeds/orange = 3, /obj/item/seeds/peanuts = 3, diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm index 2f71a447b741..72f153eddb32 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -19,15 +19,23 @@ "bbqsauce" = list("bbqsauce", "BBQ sauce bottle", "Sweet, smoky, savory, and gets everywhere. Perfect for grilling."), "ketchup" = list("ketchup", "ketchup bottle", "You feel more American already."), "capsaicin" = list("hotsauce", "hotsauce bottle", "You can almost TASTE the stomach ulcers now!"), - "enzyme" = list("enzyme", "universal enzyme bottle", "Used in cooking various dishes"), - "soysauce" = list("soysauce", "soy sauce bottle", "A salty soy-based flavoring"), - "frostoil" = list("coldsauce", "coldsauce bottle", "Leaves the tongue numb in it's passage"), - "sodiumchloride" = list("saltshakersmall", "salt shaker", "Salt. From space oceans, presumably"), - "blackpepper" = list("peppermillsmall", "pepper mill", "Often used to flavor food or make people sneeze"), - "cornoil" = list("oliveoil", "corn oil bottle", "A delicious oil used in cooking. Made from corn"), - "wasabi" = list("wasabitube", "wasabi bottle", "A pungent paste commonly served in tiny amounts with sushi. Spicy!"), + "enzyme" = list("enzyme", "universal enzyme bottle", "Used in cooking various dishes."), + "soysauce" = list("soysauce", "soy sauce bottle", "A salty soy-based flavoring."), + "frostoil" = list("coldsauce", "coldsauce bottle", "Leaves the tongue numb in it's passage."), + "sodiumchloride" = list("saltshakersmall", "salt shaker", "Salt. From space oceans, presumably."), + "blackpepper" = list("peppermillsmall", "pepper mill", "Often used to flavor food or make people sneeze."), + "cornoil" = list("cornoil", "corn oil bottle", "A delicious oil used in cooking. Made from corn."), + "oliveoil" = list("oliveoil","olive oil bottle", "A high quality oil used in a variety of cuisine. Made from olives."), + "wasabi" = list("wasabibottle", "wasabi bottle", "A pungent paste commonly served in tiny amounts with sushi. Spicy!"), "sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!"), - "vinegar" = list("vinegar", "vinegar", "Perfect for chips, if you're feeling Space British.")) + "vinegar" = list("vinegar", "vinegar", "Perfect for chips, if you're feeling Space British."), + "mayonnaise" = list("mayonnaise", "mayonnaise bottle", "An oily condiment made from egg yolks."), + "cherryjelly" = list("cherryjelly", "cherry jelly jar", "A sweet jelly made out of red cherries."), + "peanutbutter" = list("peanutbutter", "peanut butter jar", "A smooth, nutty spread. Perfect for sandwiches."), + "honey" = list("honey", "honey jar", "A sweet substance produced by bees."), + "sugar" = list("sugar", "sugar sack", "Tasty spacey sugar!"), + "flour" = list("flour", "flour sack", "A big bag of flour. Good for baking!"), + "rice" = list("rice", "rice sack", "A big bag of rice. Good for cooking!")) var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters. /obj/item/reagent_containers/food/condiment/attack_self(mob/user) @@ -105,9 +113,8 @@ else name = "[originalname] bottle" main_reagent = reagents.get_master_reagent_name() + desc = "Looks like it is [lowertext(main_reagent)], but you are not sure." if(reagents.reagent_list.len==1) - desc = "Looks like it is [lowertext(main_reagent)], but you are not sure." - else desc = "A mixture of various condiments. [lowertext(main_reagent)] is one of them." icon_state = "mixedcondiments" else @@ -125,9 +132,12 @@ reagents.check_and_add("enzyme", volume, 2 * coeff) // Only recharge if the current amount of enzyme is under `volume`. /obj/item/reagent_containers/food/condiment/sugar - name = "sugar bottle" + name = "sugar sack" desc = "Tasty spacey sugar!" + icon_state = "sugar" + item_state = "sugar" list_reagents = list("sugar" = 50) + possible_states = list() /obj/item/reagent_containers/food/condiment/saltshaker //Seperate from above since it's a small shaker rather then name = "salt shaker" // a large one. @@ -210,6 +220,62 @@ list_reagents = list("amanitin" = 50) possible_states = list() +/obj/item/reagent_containers/food/condiment/mayonnaise + name = "mayonnaise" + desc = "An oily condiment made from egg yolks." + icon_state = "mayonnaise" + list_reagents = list("mayonnaise" = 50) + possible_states = list() + +/obj/item/reagent_containers/food/condiment/cherryjelly + name = "cherry jelly" + desc = "A sweet jelly made out of red cherries." + icon_state = "cherryjelly" + list_reagents = list("cherryjelly" = 50) + possible_states = list() + +/obj/item/reagent_containers/food/condiment/peanutbutter + name = "peanut butter" + desc = "A smooth, nutty spread. Perfect for sandwiches." + icon_state = "peanutbutter" + list_reagents = list("peanutbutter" = 50) + possible_states = list() + +/obj/item/reagent_containers/food/condiment/honey + name = "honey" + desc = "A sweet substance produced by bees." + icon_state = "honey" + list_reagents = list("honey" = 50) + possible_states = list() + +/obj/item/reagent_containers/food/condiment/oliveoil + name = "olive oil" + desc = "A high quality oil derived from olives." + icon_state = "oliveoil" + list_reagents = list("oliveoil" = 50) + possible_states = list() + +/obj/item/reagent_containers/food/condiment/frostoil + name = "cold sauce" + desc = "A special oil that noticably chills the body. Extraced from Icepeppers." + icon_state = "coldsauce" + list_reagents = list("frostoil" = 50) + possible_states = list() + +/obj/item/reagent_containers/food/condiment/capsaicin + name = "hot sauce" + desc = "You can almost TASTE the stomach ulcers now!" + icon_state = "hotsauce" + list_reagents = list("capsaicin" = 50) + possible_states = list() + +/obj/item/reagent_containers/food/condiment/wasabi + name = "wasabi" + desc= "A pungent paste commonly served in tiny amounts with sushi. Spicy!" + icon_state = "wasabibottle" + list_reagents = list("wasabi" = 50) + possible_states = list() + //Food packs. To easily apply deadly toxi... delicious sauces to your food! /obj/item/reagent_containers/food/condiment/pack @@ -219,7 +285,16 @@ volume = 10 amount_per_transfer_from_this = 10 possible_transfer_amounts = null - possible_states = list("ketchup" = list("condi_ketchup", "Ketchup", "You feel more American already."), "capsaicin" = list("condi_hotsauce", "Hotsauce", "You can almost TASTE the stomach ulcers now!"), "soysauce" = list("condi_soysauce", "Soy Sauce", "A salty soy-based flavoring"), "frostoil" = list("condi_frostoil", "Coldsauce", "Leaves the tongue numb in it's passage"), "sodiumchloride" = list("condi_salt", "Salt Shaker", "Salt. From space oceans, presumably"), "blackpepper" = list("condi_pepper", "Pepper Mill", "Often used to flavor food or make people sneeze"), "cornoil" = list("condi_cornoil", "Corn Oil", "A delicious oil used in cooking. Made from corn"), "sugar" = list("condi_sugar", "Sugar", "Tasty spacey sugar!"), "vinegar" = list("condi_mixed", "vinegar", "Perfect for chips, if you're feeling Space British.")) + possible_states = list( + "ketchup" = list("condi_ketchup", "Ketchup", "You feel more American already."), + "capsaicin" = list("condi_hotsauce", "Hotsauce", "You can almost TASTE the stomach ulcers now!"), + "soysauce" = list("condi_soysauce", "Soy Sauce", "A salty soy-based flavoring."), + "frostoil" = list("condi_frostoil", "Coldsauce", "Leaves the tongue numb in it's passage."), + "sodiumchloride" = list("condi_salt", "Salt Shaker", "Salt. From space oceans, presumably."), + "blackpepper" = list("condi_pepper", "Pepper Mill", "Often used to flavor food or make people sneeze."), + "cornoil" = list("condi_cornoil", "Corn Oil", "A delicious oil used in cooking. Made from corn."), + "sugar" = list("condi_sugar", "Sugar", "Tasty spacey sugar!"), + "vinegar" =list("condi_mixed", "vinegar", "Perfect for chips, if you're feeling Space British.")) /obj/item/reagent_containers/food/condiment/pack/attack(mob/M, mob/user, def_zone) //Can't feed these to people directly. return diff --git a/code/modules/hydroponics/grown/olive.dm b/code/modules/hydroponics/grown/olive.dm new file mode 100644 index 000000000000..eb3ea8d43d36 --- /dev/null +++ b/code/modules/hydroponics/grown/olive.dm @@ -0,0 +1,24 @@ +// Olives! +/obj/item/seeds/olive + name = "pack of olive seads" + desc = "These seeds grow into olive trees." + icon_state = "seed-olive" + species = "olive" + plantname = "Olive Tree" + product = /obj/item/reagent_containers/food/snacks/grown/olive + lifespan = 150 + endurance = 35 + yield = 5 + growthstages = 6 + growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' + genes = list(/datum/plant_gene/trait/repeated_harvest) + mutatelist = list(/obj/item/seeds/apple) + reagents_add = list("vitamin" = 0.02, "plantmatter" = 0.2, "sodiumchloride" = 0.2) + +/obj/item/reagent_containers/food/snacks/grown/olive + seed = /obj/item/seeds/olive + name = "olive" + desc = "A small cylindrical salty fruit closely related to mangoes. Can be ground into a paste and mixed with water to make quality oil." + icon_state = "olive" + tastes = list("olive" = 1) + wine_power = 0.4 diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 38097573b8e5..3c87b83c73d0 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -42,6 +42,8 @@ /obj/item/reagent_containers/food/snacks/grown/bluecherries = list("bluecherryjelly" = 0), /obj/item/reagent_containers/food/snacks/egg = list("egg" = -5), /obj/item/reagent_containers/food/snacks/grown/rice = list("rice" = -5), + /obj/item/reagent_containers/food/snacks/grown/olive = list("olivepaste" = 0, "sodiumchloride" = 0), + /obj/item/reagent_containers/food/snacks/grown/peanuts = list("peanutbutter" = 0), //Grinder stuff, but only if dry /obj/item/reagent_containers/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0), diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index f3d12f813088..e0a9968da15c 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -140,6 +140,23 @@ color = "#731008" // rgb: 115, 16, 8 taste_description = "ketchup" +/datum/reagent/consumable/mayonnaise + name = "Mayonnaise" + id = "mayonnaise" + description = "A white and oily mixture of mixed egg yolks." + reagent_state = LIQUID + color = "#DFDFDF" // rgb: 223, 223, 223 + taste_description = "mayonnaise" + +/datum/reagent/consumable/peanutbutter + name = "Peanut Butter" + id = "peanutbutter" + description = "A rich, creamy spread made by grinding peanuts." + reagent_state = LIQUID + nutriment_factor = 5 * REAGENTS_METABOLISM + color = "#D9A066" // rgb: 217, 160, 102 + taste_description = "peanuts" + /datum/reagent/consumable/bbqsauce name = "BBQ Sauce" id = "bbqsauce" @@ -381,6 +398,23 @@ color = "#302000" // rgb: 48, 32, 0 taste_description = "oil" +/datum/reagent/consumbale/olivepaste + name = "Olive Paste" + id = "olivepaste" + description = "A mushy pile of freshly ground olives." + reagent_state = LIQUID + color = "#adcf77" //rgb: 173, 207, 119 + taste_description = "mushy olives" + +/datum/reagent/consumable/oliveoil + name = "Olive Oil" + id = "oliveoil" + description = "A high quality oil derived from olives. Suitable for dishes or mixtures requiring oil." + reagent_state = LIQUID + nutriment_factor = 10 * REAGENTS_METABOLISM + color = "#DBCF5C" //rgb: 219, 207, 92 + taste_description = "olive oil" + /datum/reagent/consumable/cornoil/reaction_turf(turf/simulated/T, volume) if(!istype(T)) return diff --git a/code/modules/reagents/chemistry/recipes/food_reactions.dm b/code/modules/reagents/chemistry/recipes/food_reactions.dm index c04262e826ae..76609ad8dd90 100644 --- a/code/modules/reagents/chemistry/recipes/food_reactions.dm +++ b/code/modules/reagents/chemistry/recipes/food_reactions.dm @@ -43,6 +43,20 @@ required_reagents = list("soymilk" = 1,"sodiumchloride" = 1, "water" = 8) result_amount = 10 +/datum/chemical_reaction/oliveoil + name = "Olive Oil" + id = "oliveoil" + result = "oliveoil" + required_reagents = list("olivepaste" = 5, "water" = 5) + result_amount = 10 + +/datum/chemical_reaction/mayonnaise + name = "Mayonnaise" + id = "mayonnaise" + result = "mayonnaise" + required_reagents = list("egg" = 5, "sodiumchloride" = 1, "oliveoil" = 5) + result_amount = 10 + /datum/chemical_reaction/bbqsauce name = "BBQ Sauce" id = "bbqsauce" diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi index e61167bdabd6..a22ddb833ba3 100644 Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ diff --git a/icons/obj/hydroponics/growing_fruits.dmi b/icons/obj/hydroponics/growing_fruits.dmi index eda0fe9d5e82..835d17d2aa81 100644 Binary files a/icons/obj/hydroponics/growing_fruits.dmi and b/icons/obj/hydroponics/growing_fruits.dmi differ diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi index ebd41dc578f0..cd11eb7b160e 100644 Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi index d1de98721b2d..3ce19536210e 100644 Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi index b1f00a1f2dea..dec194f16d9c 100644 Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ diff --git a/paradise.dme b/paradise.dme index db7b12a23cad..e06955524af4 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1820,6 +1820,7 @@ #include "code\modules\hydroponics\grown\mushrooms.dm" #include "code\modules\hydroponics\grown\nettle.dm" #include "code\modules\hydroponics\grown\nymph.dm" +#include "code\modules\hydroponics\grown\olive.dm" #include "code\modules\hydroponics\grown\onion.dm" #include "code\modules\hydroponics\grown\peanut.dm" #include "code\modules\hydroponics\grown\pineapple.dm"