Finally, peas for the whole station. (#54573)

This PR brings three new plants, and 6 new food recipes into being. This is a combined port of Citadel-Station-13/Citadel-Station-13#12211 and Citadel-Station-13/Citadel-Station-13#12510, along with the fixes made along the way.

Laugh Peas contains 7% Laughter.
World Peas contains 10% Pax and Happiness, but takes at least 21 cycles to bear a harvest, by having a maturation time of 20.
Salad of Eden contains 3 units of Earthsblood, 5 units of Omnizine, and 2 units of Happiness, but requires one of every ambrosia leaf, as well as a world pea.

Credits to TripleZeta for the base peas sprite, and Stewydeadmike for the Laugh, World, and food sprites. Without them, the peas would have remained an ideasguy sort of deal.
This commit is contained in:
TheObserver-sys
2020-10-24 23:29:00 -04:00
committed by GitHub
parent bedd4d07d3
commit a5e6db8f99
18 changed files with 237 additions and 0 deletions
+8
View File
@@ -49,6 +49,14 @@
tastes = list("fish" = 1, "chips" = 1)
foodtypes = MEAT | VEGETABLES | FRIED
/obj/item/food/fishfry
name = "fish fry"
desc = "All that and no bag of chips..."
icon_state = "fishfry"
food_reagents = list (/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 3)
tastes = list("fish" = 1, "pan seared vegtables" = 1)
foodtypes = MEAT | VEGETABLES | FRIED
////////////////////////////////////////////MEATS AND ALIKE////////////////////////////////////////////
/obj/item/food/tofu
+16
View File
@@ -107,6 +107,22 @@
tastes = list("rice" = 1, "egg" = 1)
foodtypes = GRAIN | MEAT //EGG = MEAT -NinjaNomNom 2017
/obj/item/food/salad/edensalad
name = "\improper Salad of Eden"
desc = "A salad brimming with untapped potential."
icon_state = "edensalad"
food_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("extreme bitterness" = 3, "hope" = 1)
foodtypes = VEGETABLES
/obj/item/food/salad/gumbo
name = "black eyed gumbo"
desc = "A spicy and savory meat and rice dish."
icon_state = "gumbo"
food_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)
foodtypes = GRAIN | MEAT | VEGETABLES
/obj/item/reagent_containers/glass/bowl
name = "bowl"
+8
View File
@@ -253,3 +253,11 @@
desc = "A bowl of mushy bread and milk. It reminds you, not too fondly, of a bowel movement."
icon_state = "mammi"
food_reagents = list(/datum/reagent/consumable/nutriment = 11, /datum/reagent/consumable/nutriment/vitamin = 2)
/obj/item/food/soup/peasoup
name = "pea soup"
desc = "A humble split pea soup."
icon_state = "peasoup"
food_reagents = list (/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/medicine/oculine = 2)
tastes = list("creamy peas"= 2, "parsnip" = 1)
foodtypes = VEGETABLES
@@ -158,6 +158,16 @@
filling_color = "#879630"
value = FOOD_EXOTIC
/obj/item/reagent_containers/food/snacks/donut/laugh
name = "sweet pea donut"
desc = "Goes great with a bottle 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"
value = FOOD_EXOTIC
//////////////////////JELLY DONUTS/////////////////////////
/obj/item/reagent_containers/food/snacks/donut/jelly
@@ -261,6 +271,16 @@
filling_color = "#879630"
value = FOOD_EXOTIC
/obj/item/reagent_containers/food/snacks/donut/jelly/laugh
name = "sweet pea jelly donut"
desc = "Goes great with a bottle 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"
value = FOOD_EXOTIC
//////////////////////////SLIME DONUTS/////////////////////////
/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly
@@ -342,6 +362,16 @@
tastes = list("jelly" = 1, "donut" = 3, "matcha" = 1)
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 bottle 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"
////////////////////////////////////////////MUFFINS////////////////////////////////////////////
/obj/item/reagent_containers/food/snacks/muffin
@@ -81,6 +81,16 @@
result = /obj/item/food/fishfingers
subcategory = CAT_MEAT
/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/food/carpmeat = 1
)
result = /obj/item/food/fishfry
subcategory = CAT_MEAT
/datum/crafting_recipe/food/sashimi
name = "Sashimi"
reqs = list(
@@ -238,3 +248,14 @@
)
result = /obj/item/food/lasagna
subcategory = CAT_MEAT
/datum/crafting_recipe/food/gumbo
name = "Black eyed gumbo"
reqs = list(
/obj/item/food/salad/boiledrice = 1,
/obj/item/reagent_containers/food/snacks/grown/peas = 1,
/obj/item/reagent_containers/food/snacks/grown/chili = 1,
/obj/item/food/meat/cutlet = 1
)
result = /obj/item/food/salad/gumbo
subcategory = CAT_MEAT
@@ -114,6 +114,14 @@
)
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/berry
@@ -181,6 +189,14 @@
)
result = /obj/item/reagent_containers/food/snacks/donut/jelly/matcha
/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/berry
@@ -248,6 +264,14 @@
)
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
////////////////////////////////////////////////WAFFLES AND PANCAKES////////////////////////////////////////////////
/datum/crafting_recipe/food/waffles
@@ -94,3 +94,15 @@
)
result = /obj/item/food/salad/citrusdelight
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/food/salad/edensalad
subcategory = CAT_SALAD
@@ -293,3 +293,14 @@
)
result = /obj/item/food/soup/electron
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/food/soup/peasoup
subcategory = CAT_SOUP
+97
View File
@@ -0,0 +1,97 @@
// Finally, peas. Base plant.
/obj/item/seeds/peas
name = "pack of pea pods"
desc = "These seeds grows into vitamin rich peas!"
icon_state = "seed-peas"
species = "peas"
plantname = "Pea Vines"
product = /obj/item/reagent_containers/food/snacks/grown/peas
maturation = 3
potency = 25
instability = 15
growthstages = 3
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
icon_grow = "peas-grow"
icon_dead = "peas-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/peas/laugh)
reagents_add = list (/datum/reagent/consumable/nutriment/vitamin = 0.1, /datum/reagent/consumable/nutriment = 0.05, /datum/reagent/water = 0.05)
/obj/item/reagent_containers/food/snacks/grown/peas
seed = /obj/item/seeds/peas
name = "peapod"
desc = "Finally... peas."
icon_state = "peas"
filling_color = "#739122"
bitesize_mod = 1
foodtype = VEGETABLES
tastes = list ("peas" = 1, "chalky saltiness" = 1)
wine_power = 50
wine_flavor = "what is, distressingly, fermented peas."
// Laughin' Peas
/obj/item/seeds/peas/laugh
name = "pack of laughin' peas"
desc = "These seeds give off a very soft purple glow.. they should grow into Laughin' Peas."
icon_state = "seed-laughpeas"
species = "laughpeas"
plantname = "Laughin' Peas"
product = /obj/item/reagent_containers/food/snacks/grown/laugh
maturation = 7
potency = 10
yield = 7
production = 5
growthstages = 3
icon_grow = "laughpeas-grow"
icon_dead = "laughpeas-dead"
genes = list (/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/purple)
mutatelist = list (/obj/item/seeds/peas/laugh/peace)
reagents_add = list (/datum/reagent/consumable/laughter = 0.05, /datum/reagent/consumable/sugar = 0.05, /datum/reagent/consumable/nutriment = 0.07)
rarity = 25 //It actually might make Central Command Officials loosen up a smidge, eh?
graft_gene = /datum/plant_gene/trait/glow/purple
/obj/item/reagent_containers/food/snacks/grown/laugh
seed = /obj/item/seeds/peas/laugh
name = "pod of laughin' peas"
desc = "Ridens Cicer, guaranteed to improve your mood dramatically upon consumption!"
icon_state = "laughpeas"
filling_color = "#ee7bee"
bitesize_mod = 2
foodtype = VEGETABLES
juice_results = list (/datum/reagent/consumable/laughsyrup = 0)
tastes = list ("a prancing rabbit" = 1) //Vib Ribbon sends her regards.. wherever she is.
wine_power = 90
wine_flavor = "a vector-graphic rabbit dancing on your tongue"
// World Peas - Peace at last, peace at last...
/obj/item/seeds/peas/laugh/peace
name = "pack of world peas"
desc = "These rather large seeds give off a soothing blue glow..."
icon_state = "seed-worldpeas"
species = "worldpeas"
plantname = "World Peas"
product = /obj/item/reagent_containers/food/snacks/grown/peace
maturation = 20
potency = 75
yield = 1
production = 10
instability = 45 //The world is a very unstable place. Constantly changing.
growthstages = 3
icon_grow = "worldpeas-grow"
icon_dead = "worldpeas-dead"
genes = list (/datum/plant_gene/trait/glow/blue)
reagents_add = list (/datum/reagent/pax = 0.1, /datum/reagent/drug/happiness = 0.1, /datum/reagent/consumable/nutriment = 0.15)
rarity = 50 // This absolutely will make even the most hardened Syndicate Operators relax.
graft_gene = /datum/plant_gene/trait/glow/blue
/obj/item/reagent_containers/food/snacks/grown/peace
seed = /obj/item/seeds/peas/laugh/peace
name = "cluster of world peas"
desc = "A plant discovered through extensive genetic engineering, and iterative graft work. It's rumored to bring peace to any who consume it. In the wider AgSci community, it's attained the nickname of 'Pax Mundi'." //at last... world peas. I'm not sorry.
icon_state = "worldpeas"
filling_color = "#0099CC"
bitesize_mod = 4
foodtype = VEGETABLES
tastes = list ("numbing tranquility" = 2, "warmth" = 1)
wine_power = 100
wine_flavor = "mind-numbing peace and warmth"
@@ -850,3 +850,11 @@
glass_icon_state = "vanillapudding"
glass_name = "vanilla pudding"
glass_desc = "Tasty."
/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!"
color = "#803280"
nutriment_factor = 5 * REAGENTS_METABOLISM
taste_mult = 2
taste_description = "fizzy sweetness"
+1
View File
@@ -27,6 +27,7 @@
/obj/item/seeds/lime = 3,
/obj/item/seeds/onion = 3,
/obj/item/seeds/orange = 3,
/obj/item/seeds/peas = 3,
/obj/item/seeds/pineapple = 3,
/obj/item/seeds/potato = 3,
/obj/item/seeds/poppy = 3,
Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 77 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 84 KiB

After

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 27 KiB

+1
View File
@@ -2024,6 +2024,7 @@
#include "code\modules\hydroponics\grown\mushrooms.dm"
#include "code\modules\hydroponics\grown\nettle.dm"
#include "code\modules\hydroponics\grown\onion.dm"
#include "code\modules\hydroponics\grown\peas.dm"
#include "code\modules\hydroponics\grown\pineapple.dm"
#include "code\modules\hydroponics\grown\potato.dm"
#include "code\modules\hydroponics\grown\pumpkin.dm"