Merge pull request #12510 from TheObserver-sys/Finally!AUseForPeas!

Finally, A use for peas!
This commit is contained in:
Ghom
2020-06-13 04:27:04 +02:00
committed by GitHub
13 changed files with 149 additions and 4 deletions
@@ -54,6 +54,15 @@
tastes = list("fish" = 1, "chips" = 1)
foodtype = MEAT | VEGETABLES | FRIED
/obj/item/reagent_containers/food/snacks/fishfry
name = "fish fry"
desc = "All that and no bag of chips..."
icon_state = "fish_fry"
list_reagents = list (/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 3)
filling_color = "#ee7676"
tastes = list("fish" = 1, "pan seared vegtables" = 1)
foodtype = MEAT | VEGETABLES | FRIED
/obj/item/reagent_containers/food/snacks/sushi_basic
name = "funa hosomaki"
desc = "A small cylindrical kudzu skin, filled with rice and fish."
@@ -144,6 +144,15 @@
is_decorated = TRUE
filling_color = "#879630"
/obj/item/reagent_containers/food/snacks/donut/laugh
name = "sweet pea donut"
desc = "Goes great with a glass of Bastion Burbon!"
icon_state = "donut_laugh"
bonus_reagents = list(/datum/reagent/consumable/laughter = 3)
tastes = list("donut" = 3, "fizzy tutti frutti" = 1,)
is_decorated = TRUE
filling_color = "#803280"
//////////////////////JELLY DONUTS/////////////////////////
/obj/item/reagent_containers/food/snacks/donut/jelly
@@ -234,6 +243,15 @@
is_decorated = TRUE
filling_color = "#879630"
/obj/item/reagent_containers/food/snacks/donut/jelly/laugh
name = "sweet pea jelly donut"
desc = "Goes great with a glass of Bastion Burbon!"
icon_state = "jelly_laugh"
bonus_reagents = list(/datum/reagent/consumable/laughter = 3)
tastes = list("jelly" = 3, "donut" = 1, "fizzy tutti frutti" = 1)
is_decorated = TRUE
filling_color = "#803280"
//////////////////////////SLIME DONUTS/////////////////////////
/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly
@@ -315,6 +333,15 @@
is_decorated = TRUE
filling_color = "#879630"
/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/laugh
name = "sweet pea jelly donut"
desc = "Goes great with a glass of Bastion Burbon!"
icon_state = "jelly_laugh"
bonus_reagents = list(/datum/reagent/consumable/laughter = 3)
tastes = list("jelly" = 3, "donut" = 1, "fizzy tutti frutti" = 1)
is_decorated = TRUE
filling_color = "#803280"
/obj/item/reagent_containers/food/snacks/donut/glaze
name = "glazed donut"
desc = "A sugar glazed donut."
@@ -124,4 +124,22 @@
trash = /obj/item/kitchen/knife
bonus_reagents = list(/datum/reagent/medicine/earthsblood = 1, /datum/reagent/iron = 4)
tastes = list("iron" = 1, "conspiracy" = 1)
foodtype = VEGETABLES
foodtype = VEGETABLES
/obj/item/reagent_containers/food/snacks/salad/edensalad
name = "\improper Salad of Eden"
desc = "A salad brimming with untapped potential."
icon_state = "eden_salad"
trash = /obj/item/reagent_containers/glass/bowl
list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/medicine/earthsblood = 3, /datum/reagent/medicine/omnizine = 5, /datum/reagent/drug/happiness = 2)
tastes = list("hope" = 1)
foodtype = VEGETABLES
/obj/item/reagent_containers/food/snacks/salad/gumbo
name = "black eyed gumbo"
desc = "A spicy and savory meat and rice dish."
icon_state = "gumbo"
trash = /obj/item/reagent_containers/glass/bowl
list_reagents = list(/datum/reagent/consumable/capsaicin = 2, /datum/reagent/consumable/nutriment/vitamin = 3, /datum/reagent/consumable/nutriment = 5)
tastes = list("building heat" = 2, "savory meat and vegtables" = 1)
foodtype = GRAIN | MEAT | VEGETABLES
@@ -262,3 +262,13 @@
tastes = list("bungo" = 2, "hot curry" = 4, "tropical sweetness" = 1)
filling_color = "#E6A625"
foodtype = VEGETABLES | FRUIT | DAIRY
/obj/item/reagent_containers/food/snacks/soup/peasoup
name = "pea soup"
desc = "A humble split pea soup."
icon_state = "peasoup"
bonus_reagents = list (/datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/medicine/oculine = 2)
list_reagents = list (/datum/reagent/consumable/nutriment = 8)
tastes = list("creamy peas"= 2, "parsnip" = 1)
filling_color = "#9dc530"
foodtype = VEGETABLES
@@ -121,6 +121,15 @@ datum/crafting_recipe/food/donut/meat
)
result = /obj/item/reagent_containers/food/snacks/donut/matcha
/datum/crafting_recipe/food/donut/laugh
name = "Sweet Pea Donut"
reqs = list(
/datum/reagent/consumable/laughsyrup = 3,
/obj/item/reagent_containers/food/snacks/donut/plain = 1
)
result = /obj/item/reagent_containers/food/snacks/donut/laugh
////////////////////////////////////////////////////JELLY DONUTS///////////////////////////////////////////////////////
/datum/crafting_recipe/food/donut/jelly/apple
@@ -187,6 +196,14 @@ datum/crafting_recipe/food/donut/meat
)
result = /obj/item/reagent_containers/food/snacks/donut/jelly/trumpet
/datum/crafting_recipe/food/donut/jelly/laugh
name = "Sweet Pea Jelly Donut"
reqs = list(
/datum/reagent/consumable/laughsyrup = 3,
/obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1
)
result = /obj/item/reagent_containers/food/snacks/donut/jelly/laugh
////////////////////////////////////////////////////SLIME DONUTS///////////////////////////////////////////////////////
/datum/crafting_recipe/food/donut/slimejelly/apple
@@ -253,3 +270,11 @@ datum/crafting_recipe/food/donut/meat
/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1
)
result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/matcha
/datum/crafting_recipe/food/donut/slimejelly/laugh
name = "Sweet Pea Jelly Donut"
reqs = list(
/datum/reagent/consumable/laughsyrup = 3,
/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1
)
result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/laugh
@@ -171,3 +171,14 @@
)
result = /obj/item/reagent_containers/food/snacks/salad/ricepork
subcategory = CAT_MEAT
/datum/crafting_recipe/food/gumbo
name = "Black eyed gumbo"
reqs = list(
/obj/item/reagent_containers/food/snacks/salad/boiledrice = 1,
/obj/item/reagent_containers/food/snacks/grown/peas = 1,
/obj/item/reagent_containers/food/snacks/grown/chili = 1,
/obj/item/reagent_containers/food/snacks/meat/cutlet = 1
)
result = /obj/item/reagent_containers/food/snacks/salad/gumbo
subcategory = CAT_MEAT
@@ -93,4 +93,17 @@
/obj/item/reagent_containers/food/snacks/grown/cabbage = 1
)
result = /obj/item/reagent_containers/food/snacks/salad/caesar
subcategory = CAT_SALAD
subcategory = CAT_SALAD
/datum/crafting_recipe/food/edensalad
name = "Salad of Eden"
reqs = list(
/obj/item/reagent_containers/glass/bowl =1,
/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 1,
/obj/item/reagent_containers/food/snacks/grown/ambrosia/deus = 1,
/obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia = 1,
/obj/item/reagent_containers/food/snacks/grown/peace = 1
)
result = /obj/item/reagent_containers/food/snacks/salad/edensalad
subcategory = CAT_SALAD
@@ -135,4 +135,14 @@
/obj/item/reagent_containers/food/snacks/carpmeat = 1
)
result = /obj/item/reagent_containers/food/snacks/fishandchips
subcategory = CAT_SEAFOOD
subcategory = CAT_SEAFOOD
/datum/crafting_recipe/food/fishfry
name = "Fish fry"
reqs = list(
/obj/item/reagent_containers/food/snacks/grown/corn = 1,
/obj/item/reagent_containers/food/snacks/grown/peas =1,
/obj/item/reagent_containers/food/snacks/carpmeat = 1
)
result = /obj/item/reagent_containers/food/snacks/fishfry
subcategory = CAT_SEAFOOD
@@ -255,4 +255,16 @@
/obj/item/reagent_containers/glass/bowl = 1
)
result= /obj/item/reagent_containers/food/snacks/soup/wish
subcategory = CAT_SOUP
subcategory = CAT_SOUP
/datum/crafting_recipe/food/peasoup
name = "Pea soup"
reqs = list(
/datum/reagent/water = 10,
/obj/item/reagent_containers/food/snacks/grown/peas = 2,
/obj/item/reagent_containers/food/snacks/grown/parsnip = 1,
/obj/item/reagent_containers/food/snacks/grown/carrot = 1
)
result = /obj/item/reagent_containers/food/snacks/soup/peasoup
subcategory = CAT_SOUP
@@ -857,3 +857,13 @@
taste_mult = 2.5 //sugar's 1.5, capsacin's 1.5, so a good middle ground.
taste_description = "smokey sweetness"
value = REAGENT_VALUE_COMMON
/datum/reagent/consumable/laughsyrup
name = "Laughin' Syrup"
description = "The product of juicing Laughin' Peas. Fizzy, and seems to change flavour based on what it's used with!"
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#803280"
taste_mult = 2
taste_description = "fizzy sweetness"
value = REAGENT_VALUE_COMMON