diff --git a/code/game/objects/items/food/meat.dm b/code/game/objects/items/food/meat.dm index 5b47b0b5775..42d70186710 100644 --- a/code/game/objects/items/food/meat.dm +++ b/code/game/objects/items/food/meat.dm @@ -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 diff --git a/code/game/objects/items/food/salad.dm b/code/game/objects/items/food/salad.dm index d6e8f643b73..504a8f2efd4 100644 --- a/code/game/objects/items/food/salad.dm +++ b/code/game/objects/items/food/salad.dm @@ -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" diff --git a/code/game/objects/items/food/soup.dm b/code/game/objects/items/food/soup.dm index 3436a4b42aa..e48ebd0261c 100644 --- a/code/game/objects/items/food/soup.dm +++ b/code/game/objects/items/food/soup.dm @@ -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 diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index 8acabc420d6..b289ce1eb25 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -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 diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index d9c1140820a..478b803c05f 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -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 diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index 787eb7b4c1a..08f62c5a045 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -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 diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm index faf1f2d223b..35c5501fd55 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm @@ -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 diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm index 1fb953eabbe..d1c3fd82e3b 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm @@ -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 diff --git a/code/modules/hydroponics/grown/peas.dm b/code/modules/hydroponics/grown/peas.dm new file mode 100644 index 00000000000..22cbcccac7a --- /dev/null +++ b/code/modules/hydroponics/grown/peas.dm @@ -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" diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index c39bec779bd..c3daf19a122 100755 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -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" diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm index dd5fd47fa6d..7ee223df98d 100644 --- a/code/modules/vending/megaseed.dm +++ b/code/modules/vending/megaseed.dm @@ -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, diff --git a/icons/obj/food/donuts.dmi b/icons/obj/food/donuts.dmi index 404f8af12ff..652ee812814 100644 Binary files a/icons/obj/food/donuts.dmi and b/icons/obj/food/donuts.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index d9f99159204..eaa4516fdbc 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/food/soupsalad.dmi b/icons/obj/food/soupsalad.dmi index 0bd0101b084..2c4d845a9e3 100644 Binary files a/icons/obj/food/soupsalad.dmi and b/icons/obj/food/soupsalad.dmi differ diff --git a/icons/obj/hydroponics/growing_vegetables.dmi b/icons/obj/hydroponics/growing_vegetables.dmi index 2c01f9e6524..bac07898c99 100644 Binary files a/icons/obj/hydroponics/growing_vegetables.dmi and b/icons/obj/hydroponics/growing_vegetables.dmi differ diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi index 5d1dfdd31ec..20622b7bfbe 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 dea2752f86a..9b713f83865 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 fa4e108b84a..16d6ee4a6dd 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -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"