diff --git a/code/game/machinery/computer/chef_orders/order_datum.dm b/code/game/machinery/computer/chef_orders/order_datum.dm index e6106bb6410..5d6eb006901 100644 --- a/code/game/machinery/computer/chef_orders/order_datum.dm +++ b/code/game/machinery/computer/chef_orders/order_datum.dm @@ -313,4 +313,4 @@ name = "Quality Oil" category_index = CATEGORY_SAUCES_REAGENTS item_instance = /obj/item/reagent_containers/food/condiment/quality_oil - cost_per_order = 120 //Extra Virgin, just like you, the reader + cost_per_order = 50 //Extra Virgin, just like you, the reader diff --git a/code/game/objects/items/food/meat.dm b/code/game/objects/items/food/meat.dm index 1ae06952d00..61f9823a244 100644 --- a/code/game/objects/items/food/meat.dm +++ b/code/game/objects/items/food/meat.dm @@ -151,6 +151,25 @@ foodtypes = VEGETABLES | SEAFOOD w_class = WEIGHT_CLASS_SMALL +// empty sushi for custom sushi +/obj/item/food/sushi/empty + name = "sushi" + foodtypes = NONE + tastes = list() + icon_state = "vegetariansushiroll" + desc = "A roll of customized sushi." + +/obj/item/food/sushi/empty/MakeProcessable() + AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/sushislice/empty, 4, 20) + +/obj/item/food/sushislice/empty + name = "sushi slice" + foodtypes = NONE + tastes = list() + icon_state = "vegetariansushislice" + desc = "A slice of customized sushi." + + ////////////////////////////////////////////MEATS AND ALIKE//////////////////////////////////////////// /obj/item/food/tofu diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm index a4871597f66..c0dc6cc2502 100644 --- a/code/game/objects/items/food/misc.dm +++ b/code/game/objects/items/food/misc.dm @@ -857,9 +857,13 @@ /obj/item/food/seaweedsheet name = "seaweed sheet" - desc = "A dried sheet of seaweed used for making sushi." + desc = "A dried sheet of seaweed used for making sushi. Use an ingredient on it to start making custom sushi!" icon_state = "seaweedsheet" food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) tastes = list("seaweed" = 1) foodtypes = VEGETABLES w_class = WEIGHT_CLASS_SMALL + +/obj/item/food/seaweedsheet/Initialize(mapload) + . = ..() + AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/sushi/empty, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 6) diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm index 620d715e916..d423f20b117 100644 --- a/code/modules/food_and_drinks/recipes/food_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm @@ -266,3 +266,7 @@ results = list(/datum/reagent/consumable/quality_oil = 2) mix_message = "The cooking oil dilutes the quality oil- how delightfully devilish..." reaction_flags = REACTION_INSTANT + +/datum/chemical_reaction/food/quality_oil + results = list(/datum/reagent/consumable/quality_oil = 2) + required_reagents = list(/datum/reagent/consumable/olivepaste = 4, /datum/reagent/water = 1) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index 0c9ea4c4108..fcbc4d5fca9 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -241,9 +241,9 @@ /datum/crafting_recipe/food/pierogi name = "Pierogi" reqs = list( + /obj/item/food/doughslice = 1, /obj/item/food/grown/potato = 1, - /obj/item/food/grown/onion = 1, - /obj/item/food/bun = 1 + /obj/item/food/grown/onion = 1 ) result = /obj/item/food/pierogi subcategory = CAT_MISCFOOD diff --git a/code/modules/hydroponics/grown/olive.dm b/code/modules/hydroponics/grown/olive.dm new file mode 100644 index 00000000000..8f93a9695ec --- /dev/null +++ b/code/modules/hydroponics/grown/olive.dm @@ -0,0 +1,27 @@ +// Olive +/obj/item/seeds/olive + name = "pack of olive seeds" + desc = "These seeds grow into olive trees." + icon_state = "seed-olive" + species = "olive" + plantname = "Olive Tree" + product = /obj/item/food/grown/olive + lifespan = 150 + endurance = 35 + yield = 5 + maturation = 10 + growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' + icon_grow = "olive-grow" + icon_dead = "olive-dead" + genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/one_bite) + reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1) + +/obj/item/food/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" + foodtypes = FRUIT + grind_results = list(/datum/reagent/consumable/olivepaste = 0) + tastes = list("olive" = 1) + diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index f037b6cde7d..c9e428401e5 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -1059,3 +1059,11 @@ taste_description = "raw batter" color = "#ebca85" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/olivepaste + name = "Olive Paste" + description = "A mushy pile of finely ground olives." + taste_description = "mushy olives" + color = "#adcf77" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm index d9ca3c40bc8..95d31ae47ef 100644 --- a/code/modules/vending/megaseed.dm +++ b/code/modules/vending/megaseed.dm @@ -31,6 +31,7 @@ /obj/item/seeds/korta_nut = 3, /obj/item/seeds/lemon = 3, /obj/item/seeds/lime = 3, + /obj/item/seeds/olive = 3, /obj/item/seeds/onion = 3, /obj/item/seeds/orange = 3, /obj/item/seeds/peas = 3, diff --git a/icons/obj/hydroponics/growing_fruits.dmi b/icons/obj/hydroponics/growing_fruits.dmi index 2ad7a5a5f7d..a71acabc2ae 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 c38b928302c..a3b738f9d5e 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 7948e2ab89f..d2b2e4c76f6 100644 Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ diff --git a/tgstation.dme b/tgstation.dme index a6af877cd22..3eebe861450 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3066,6 +3066,7 @@ #include "code\modules\hydroponics\grown\kronkus.dm" #include "code\modules\hydroponics\grown\melon.dm" #include "code\modules\hydroponics\grown\mushrooms.dm" +#include "code\modules\hydroponics\grown\olive.dm" #include "code\modules\hydroponics\grown\onion.dm" #include "code\modules\hydroponics\grown\peas.dm" #include "code\modules\hydroponics\grown\pineapple.dm"