[MIRROR] Olives! + Custom sushi/Pierogi changes [MDB IGNORE] (#14451)

* Olives! + Custom sushi/Pierogi changes (#67239)

About The Pull Request

This is a continuation of #66946 since I have enough points to finally do so.

This PR will:

    Expand upon my previous sushi PR, allowing people to use an ingredient on a sushi sheet to start creating custom sushi.
    Add olives! A new type of fruit that can be grown in hydroponics. When ground, it becomes olive paste which when mixed with water in a 4-1 reaction turns into 2 units of quality oil.
    Make pierogis require a dough slice to craft instead of a bun.
    Make quality oil cost 50 credits to order instead of 120

Why It's Good For The Game

Since my sushi PR merged, many people have asked me to add custom sushi, so here it is. This will allow chefs to make more interesting menus with added customization.

Quality oil is an extremely expensive commodity (120 credits for one 50 unit bottle, 240 if you expedite it!!!) and can only be acquired from cargo. I feel because of this, many chefs do not make lizard or mothic foods because simply acquiring the ingredients to do so is either very time consuming, expensive, or both. This will encourage people to make those foods more often since one of the key ingredients in many lizard or mothic dishes can be made by them, too. Olives themselves can be eaten as a snack and open up opportunities for new foods in the future, and it makes sense for you to make your own oil since the process is simple yet highly inefficient in real life.

This PR originally had a way to craft cornmeal as well, but that idea was adopted yesterday in #67227 which they can keep.

Lastly, it seems more reasonable for pierogis to require a dough slice instead of a burger bun. Don't think that requires more explanation.

I believe my gbp score is at -3, but I have three PRs waiting to merge currently which will boost me way above that.
Changelog

cl
add: Botany can now grow olives, which can be ground into a paste and mixed with water to make quality oil.
add: You can now make custom sushi by using an ingredient on a seaweed sheet. The sushi will be named after the first ingredient you use.
balance: Pierogis now need a dough slice instead of a bun
balance: Quality oil costs 50 credits to order instead of 120
/cl

* Olives! + Custom sushi/Pierogi changes

Co-authored-by: MidoriWroth <kodyman@att.net>
This commit is contained in:
SkyratBot
2022-06-22 10:35:00 +01:00
committed by GitHub
co-authored by MidoriWroth
parent 544c9cc145
commit 3007f9974c
12 changed files with 68 additions and 4 deletions
@@ -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
+19
View File
@@ -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
+5 -1
View File
@@ -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)
@@ -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)
@@ -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
+27
View File
@@ -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)
@@ -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
+1
View File
@@ -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,
Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

+1
View File
@@ -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"