diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index c75d419c361..791abe2e9a0 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -173,7 +173,7 @@ plant_type = 0 oneharvest = 1 growthstages = 3 -/* + /obj/item/seeds/poppyseed name = "Poppy seeds" icon_state = "seed-poppy" @@ -186,11 +186,11 @@ potency = 20 maturation = 8 production = 6 - yield = 3 + yield = 6 plant_type = 0 oneharvest = 1 growthstages = 3 -*/ + /obj/item/seeds/potatoseed name = "Potato Seeds" desc = "This will one day grow into potatoes." @@ -511,6 +511,22 @@ growthstages = 3 plant_type = 2 +/obj/item/seeds/appleseed + name = "Apple seeds" + desc = "A tasty fruit." + icon_state = "seed-apple" + mypath = "/obj/item/seeds/appleseed" + species = "apple" + plantname = "Apple tree" + productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/apple" + lifespan = 55 + endurance = 35 + maturation = 6 + production = 6 + yield = 5 + plant_type = 0 + growthstages = 6 + /* /obj/item/seeds/ name = "" @@ -611,7 +627,7 @@ New() ..() reagents.add_reagent("nutriment", 2) -/* + /obj/item/weapon/reagent_containers/food/snacks/grown/poppy seed = "/obj/item/seeds/poppyseed" name = "Poppy" @@ -621,7 +637,7 @@ reagents.add_reagent("nutriment", 1) reagents.add_reagent("opium", max(round((potency / 5), 1), 2)) bitesize = reagents.total_volume -*/ + /obj/item/weapon/reagent_containers/food/snacks/grown/potato seed = "/obj/item/seeds/potatoseed" @@ -652,6 +668,16 @@ ..() reagents.add_reagent("nutriment", 2) +/obj/item/weapon/reagent_containers/food/snacks/grown/apple + seed = "/obj/item/seeds/appleseed" + name = "Apple" + desc = "A piece of Eden." + icon_state = "apple" + potency = 15 + New() + ..() + reagents.add_reagent("nutriment", 3) + /obj/item/weapon/reagent_containers/food/snacks/grown/banana seed = "/obj/item/seeds/bananaseed" name = "Banana" diff --git a/code/defines/obj/vending.dm b/code/defines/obj/vending.dm index acbc40349d7..01103b7ea60 100644 --- a/code/defines/obj/vending.dm +++ b/code/defines/obj/vending.dm @@ -128,8 +128,8 @@ name = "MegaSeed Servitor" desc = "When you need seeds fast!" icon_state = "seeds" - product_paths = "/obj/item/seeds/bananaseed;/obj/item/seeds/berryseed;/obj/item/seeds/carrotseed;/obj/item/seeds/chantermycelium;/obj/item/seeds/chiliseed;/obj/item/seeds/cornseed;/obj/item/seeds/eggplantseed;/obj/item/seeds/potatoseed;/obj/item/seeds/replicapod;/obj/item/seeds/soyaseed;/obj/item/seeds/sunflowerseed;/obj/item/seeds/tomatoseed;/obj/item/seeds/towermycelium;/obj/item/seeds/wheatseed" - product_amounts = "2;2;2;2;2;2;2;2;3;2;2;2;2;2" + product_paths = "/obj/item/seeds/bananaseed;/obj/item/seeds/berryseed;/obj/item/seeds/carrotseed;/obj/item/seeds/chantermycelium;/obj/item/seeds/chiliseed;/obj/item/seeds/cornseed;/obj/item/seeds/eggplantseed;/obj/item/seeds/potatoseed;/obj/item/seeds/replicapod;/obj/item/seeds/soyaseed;/obj/item/seeds/sunflowerseed;/obj/item/seeds/tomatoseed;/obj/item/seeds/towermycelium;/obj/item/seeds/wheatseed;/obj/item/seeds/appleseed;/obj/item/seeds/poppyseed" + product_amounts = "3;2;2;2;2;2;2;2;3;2;2;2;2;2;3;5" product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!" product_hidden = "/obj/item/seeds/amanitamycelium;/obj/item/seeds/glowshroom;/obj/item/seeds/libertymycelium;/obj/item/seeds/nettleseed;/obj/item/seeds/plumpmycelium" product_hideamt = "2;2;2;2;2" diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm index 3267822e7df..476e0f73d5b 100644 --- a/code/game/machinery/kitchen/processor.dm +++ b/code/game/machinery/kitchen/processor.dm @@ -49,6 +49,14 @@ input = /obj/item/weapon/reagent_containers/food/snacks/grown/potato output = /obj/item/weapon/reagent_containers/food/snacks/fries + soybeans + input = /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans + output = /obj/item/weapon/reagent_containers/food/snacks/soydope + + flour + input = /obj/item/weapon/reagent_containers/food/snacks/flour + output = /obj/item/weapon/reagent_containers/food/snacks/spagetti + /* mobs */ mob process(loc, what) diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index d72bc4e7717..c6f93efa75d 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -611,6 +611,24 @@ reagents.add_reagent("nutriment", 4) bitesize = 2 +/obj/item/weapon/reagent_containers/food/snacks/soydope + name = "Soy Dope" + desc = "Dope from a soy." + icon_state = "soydope" + New() + ..() + reagents.add_reagent("nutriment", 2) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/spagetti + name = "Spagetti" + desc = "Now thats a nice pasta!" + icon_state = "spagetti" + New() + ..() + reagents.add_reagent("nutriment", 1) + bitesize = 1 + /obj/item/weapon/reagent_containers/food/snacks/cheesyfries name = "Cheesy Fries" desc = "Fries. Covered in cheese. Duh." @@ -839,7 +857,7 @@ icon_state = "spellburger" New() ..() - reagents.add_reagent("nutriment", 10) + reagents.add_reagent("nutriment", 4) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/bigbiteburger @@ -857,8 +875,8 @@ icon_state = "enchiladas" New() ..() - reagents.add_reagent("nutriment", 10) - reagents.add_reagent("capsaicin", 10) + reagents.add_reagent("nutriment",5) + reagents.add_reagent("capsaicin", 5) reagents.add_reagent("blackpepper", 10) bitesize = 5 @@ -868,7 +886,7 @@ icon_state = "monkiesdelight" New() ..() - reagents.add_reagent("nutriment", 50) + reagents.add_reagent("nutriment", 15) reagents.add_reagent("blackpepper", 1) reagents.add_reagent("sodiumchloride", 1) bitesize = 6 @@ -879,7 +897,7 @@ icon_state = "baguette" New() ..() - reagents.add_reagent("nutriment", 25) + reagents.add_reagent("nutriment", 5) reagents.add_reagent("blackpepper", 1) reagents.add_reagent("sodiumchloride", 1) bitesize = 3 @@ -890,7 +908,7 @@ icon_state = "fishandchips" New() ..() - reagents.add_reagent("nutriment", 15) + reagents.add_reagent("nutriment", 6) reagents.add_reagent("carpotoxin", 4) bitesize = 3 @@ -900,7 +918,7 @@ icon_state = "sandwich" New() ..() - reagents.add_reagent("nutriment", 30) + reagents.add_reagent("nutriment", 3) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/toastedsandwich @@ -909,7 +927,7 @@ icon_state = "toastedsandwich" New() ..() - reagents.add_reagent("nutriment", 40) + reagents.add_reagent("nutriment", 5) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/tomatosoup @@ -918,7 +936,7 @@ icon_state = "tomatosoup" New() ..() - reagents.add_reagent("nutriment", 20) + reagents.add_reagent("nutriment", 4) reagents.add_reagent("water", 7) bitesize = 5 @@ -928,7 +946,7 @@ icon_state = "rofflewaffles" New() ..() - reagents.add_reagent("nutriment", 25) + reagents.add_reagent("nutriment", 8) reagents.add_reagent("psilocybin", 7) bitesize = 5 @@ -938,7 +956,7 @@ icon_state = "stew" New() ..() - reagents.add_reagent("nutriment", 50) + reagents.add_reagent("nutriment", 6) reagents.add_reagent("water", 10) bitesize = 3 @@ -948,10 +966,68 @@ icon_state = "metroidtoast" New() ..() - reagents.add_reagent("nutriment", 20) + reagents.add_reagent("nutriment", 5) reagents.add_reagent("toxin", 10) bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/milosoup + name = "Milosoup" + desc = "The universes best soup! Yum!!!" + icon_state = "milosoup" + New() + ..() + reagents.add_reagent("nutriment", 6) + reagents.add_reagent("water", 20) + bitesize = 4 + +/obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat + name = "Stewed Soy Meat" + desc = "Even non-vegetarians will LOVE this!" + icon_state = "stewedsoymeat" + New() + ..() + reagents.add_reagent("nutriment", 6) + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/boiledspagetti + name = "Boiled Spagetti" + desc = "Spagetti boiled in 100 degree celcius water until it is soft." + icon_state = "spagettiboiled" + New() + ..() + reagents.add_reagent("nutriment", 2) + reagents.add_reagent("water", 5) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/pastatomato + name = "Pasta Tomato" + desc = "Spagetti boiled in 100 degree celcius water until it is soft, with a bit of red tomato on it." + icon_state = "pastatomato" + New() + ..() + reagents.add_reagent("nutriment", 3) + reagents.add_reagent("water", 5) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/meatballspagetti + name = "Meatball Spagetti" + desc = "Now thats a nic'e meatball!" + icon_state = "meatballspagetti" + New() + ..() + reagents.add_reagent("nutriment", 4) + reagents.add_reagent("water", 5) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/poppypretzel + name = "Poppy Pretzel" + desc = "A pretzel full of POP!" + icon_state = "poppypretzel" + New() + ..() + reagents.add_reagent("nutriment", 3) + bitesize = 3 + /////////////////////////////////////////////////Sliceable//////////////////////////////////////// // All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index f04ac1cafdc..3ebdb54f530 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -811,3 +811,49 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/metroidtoast +/datum/recipe/milosoup + reagents = list("water" = 30) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/soydope, + /obj/item/weapon/reagent_containers/food/snacks/soydope, + /obj/item/weapon/reagent_containers/food/snacks/tofu, + /obj/item/weapon/reagent_containers/food/snacks/tofu, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/milosoup + +/datum/recipe/stewedsoymeat + items = list( + /obj/item/weapon/reagent_containers/food/snacks/soydope, + /obj/item/weapon/reagent_containers/food/snacks/soydope, + /obj/item/weapon/reagent_containers/food/snacks/grown/carrot, + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat + + +/datum/recipe/boiledspagetti + reagents = list("water" = 20) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/spagetti, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/boiledspagetti + +/datum/recipe/pastatomato + reagents = list("water" = 20) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/spagetti, + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/pastatomato + +/datum/recipe/poppypretzel + reagents = list("water" = 20) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/seeds/poppyseed, + /obj/item/seeds/poppyseed, + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/egg, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 8a4113be06b..c79685817e5 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/harvest.dmi b/icons/obj/harvest.dmi index 7b4eb8f36fa..ee295096f9e 100644 Binary files a/icons/obj/harvest.dmi and b/icons/obj/harvest.dmi differ diff --git a/icons/obj/hydroponics.dmi b/icons/obj/hydroponics.dmi index 91554e19643..548f20c7c6f 100644 Binary files a/icons/obj/hydroponics.dmi and b/icons/obj/hydroponics.dmi differ diff --git a/icons/obj/seeds.dmi b/icons/obj/seeds.dmi index 2aa06c86a50..a30ab8a51a3 100644 Binary files a/icons/obj/seeds.dmi and b/icons/obj/seeds.dmi differ