diff --git a/code/game/machinery/computer/chef_orders/order_datum.dm b/code/game/machinery/computer/chef_orders/order_datum.dm index 5d6eb006901..4205201840c 100644 --- a/code/game/machinery/computer/chef_orders/order_datum.dm +++ b/code/game/machinery/computer/chef_orders/order_datum.dm @@ -314,3 +314,9 @@ category_index = CATEGORY_SAUCES_REAGENTS item_instance = /obj/item/reagent_containers/food/condiment/quality_oil cost_per_order = 50 //Extra Virgin, just like you, the reader + +/datum/orderable_item/peanut_butter + name = "Peanut Butter" + category_index = CATEGORY_SAUCES_REAGENTS + item_instance = /obj/item/reagent_containers/food/condiment/peanut_butter + cost_per_order = 30 diff --git a/code/game/objects/effects/spawners/random/food_or_drink.dm b/code/game/objects/effects/spawners/random/food_or_drink.dm index 2e835cbdf92..b6b94f7f97f 100644 --- a/code/game/objects/effects/spawners/random/food_or_drink.dm +++ b/code/game/objects/effects/spawners/random/food_or_drink.dm @@ -228,6 +228,7 @@ /obj/item/reagent_containers/food/condiment/bbqsauce = 1, /obj/item/reagent_containers/food/condiment/soysauce = 1, /obj/item/reagent_containers/food/condiment/vinegar = 1, + /obj/item/reagent_containers/food/condiment/peanut_butter = 1, /obj/item/reagent_containers/food/condiment/quality_oil = 1, ) diff --git a/code/game/objects/items/food/bread.dm b/code/game/objects/items/food/bread.dm index aec4b5ce309..b8929fb43d1 100644 --- a/code/game/objects/items/food/bread.dm +++ b/code/game/objects/items/food/bread.dm @@ -300,7 +300,7 @@ desc = "A slice of bread soaked in a beaten egg mixture. Put it on a griddle to start cooking!." icon = 'icons/obj/food/burgerbread.dmi' icon_state = "raw_frenchtoast" - food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2,) + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2) tastes = list("raw egg" = 2, "soaked bread" = 1) foodtypes = GRAIN | RAW | BREAKFAST w_class = WEIGHT_CLASS_SMALL @@ -313,8 +313,32 @@ desc = "A slice of bread soaked in an egg mixture and grilled until golden-brown. Drizzled with syrup!." icon = 'icons/obj/food/burgerbread.dmi' icon_state = "frenchtoast" - food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2,) + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2) tastes = list("french toast" = 1, "syrup" = 1, "golden deliciousness" = 1) foodtypes = GRAIN | BREAKFAST w_class = WEIGHT_CLASS_SMALL burns_on_grill = TRUE + +/obj/item/food/raw_breadstick + name = "raw breadstick" + desc = "An uncooked strip of dough in the shape of a breadstick." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "raw_breadstick" + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2) + tastes = list("raw dough" = 1) + foodtypes = GRAIN | DAIRY + w_class = WEIGHT_CLASS_SMALL + +/obj/item/food/rawbreadstick/MakeBakeable() + AddComponent(/datum/component/bakeable, /obj/item/food/breadstick, rand(15 SECONDS, 20 SECONDS), TRUE, TRUE) + +/obj/item/food/breadstick + name = "breadstick" + desc = "A delicious, buttery breadstick. Highly addictive, but oh-so worth it." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "breadstick" + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2) + tastes = list("fluffy bread" = 1, "butter" = 2) + foodtypes = GRAIN | DAIRY + w_class = WEIGHT_CLASS_SMALL + burns_in_oven = TRUE diff --git a/code/game/objects/items/food/meat.dm b/code/game/objects/items/food/meat.dm index 979176cd53f..83058babc58 100644 --- a/code/game/objects/items/food/meat.dm +++ b/code/game/objects/items/food/meat.dm @@ -169,6 +169,15 @@ icon_state = "vegetariansushislice" desc = "A slice of customized sushi." +/obj/item/food/nigiri_sushi + name = "nigiri sushi" + desc = "A simple nigiri of fish atop a packed rice ball with a seaweed wrapping and a side of soy sauce." + icon = 'icons/obj/food/food.dmi' + icon_state = "nigiri_sushi" + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/nutriment/protein = 2) + tastes = list("boiled rice" = 4, "fish filet" = 2, "soy sauce" = 2) + foodtypes = SEAFOOD | VEGETABLES + w_class = WEIGHT_CLASS_SMALL ////////////////////////////////////////////MEATS AND ALIKE//////////////////////////////////////////// diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm index c0dc6cc2502..afde878f5ef 100644 --- a/code/game/objects/items/food/misc.dm +++ b/code/game/objects/items/food/misc.dm @@ -867,3 +867,35 @@ /obj/item/food/seaweedsheet/Initialize(mapload) . = ..() AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/sushi/empty, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 6) + +/obj/item/food/granola_bar + name = "granola bar" + desc = "A dried mixture of oats, nuts, fruits, and chocolate condensed into a chewy bar. Makes a great snack while space-hiking." + icon = 'icons/obj/food/food.dmi' + icon_state = "granola_bar" + food_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/nutriment/protein = 4) + tastes = list("granola" = 1, "nuts" = 1, "chocolate" = 1, "raisin" = 1) + foodtypes = GRAIN | NUTS | FRUIT | SUGAR | DAIRY + w_class = WEIGHT_CLASS_SMALL + +/obj/item/food/onigiri + name = "onigiri" + desc = "A ball of cooked rice surrounding a filling formed into a triangular shape and wrapped in seaweed. Can be added fillings!" + icon = 'icons/obj/food/food.dmi' + icon_state = "onigiri" + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2) + tastes = list("rice" = 1, "dried seaweed" = 1) + foodtypes = VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/food/onigiri/Initialize(mapload) + . = ..() + AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/onigiri/empty, CUSTOM_INGREDIENT_ICON_NOCHANGE, max_ingredients = 4) + +// empty onigiri for custom onigiri +/obj/item/food/onigiri/empty + name = "onigiri" + foodtypes = VEGETABLES + tastes = list() + icon_state = "onigiri" + desc = "A ball of cooked rice surrounding a filling formed into a triangular shape and wrapped in seaweed." diff --git a/code/game/objects/items/food/pastries.dm b/code/game/objects/items/food/pastries.dm index 9b1d97c4c72..b62ccfa2c7f 100644 --- a/code/game/objects/items/food/pastries.dm +++ b/code/game/objects/items/food/pastries.dm @@ -301,3 +301,47 @@ icon_state = "icecream_cone_chocolate" food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/coco = 1) ingredients = list(/datum/reagent/consumable/flour, /datum/reagent/consumable/sugar, /datum/reagent/consumable/coco) + +/obj/item/food/cookie/peanut_butter + name = "peanut butter cookie" + desc = "A tasty, chewy peanut butter cookie." + icon_state = "peanut_butter_cookie" + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/peanut_butter = 5) + tastes = list("peanut butter" = 2, "cookie" = 1) + foodtypes = GRAIN | JUNKFOOD | NUTS + +/obj/item/food/raw_brownie_batter + name = "raw brownie batter" + desc = "A sticky mixture of raw brownie batter, cook it in the oven!" + icon = 'icons/obj/food/food.dmi' + icon_state = "raw_brownie_batter" + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4) + tastes = list("raw brownie batter" = 1) + foodtypes = GRAIN | JUNKFOOD | SUGAR | BREAKFAST + +/obj/item/food/rawbrowniebatter/MakeBakeable() + AddComponent(/datum/component/bakeable, /obj/item/food/browniesheet, rand(20 SECONDS, 30 SECONDS), TRUE, TRUE) + +/obj/item/food/brownie_sheet + name = "brownie sheet" + desc = "An uncut sheet of cooked brownie, use a knife to cut it!." + icon = 'icons/obj/food/food.dmi' + icon_state = "brownie_sheet" + food_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/sugar = 12) + tastes = list("brownie" = 1, "chocolatey goodness" = 1) + foodtypes = GRAIN | JUNKFOOD | SUGAR + w_class = WEIGHT_CLASS_SMALL + burns_in_oven = TRUE + +/obj/item/food/browniesheet/MakeProcessable() + AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/brownie, 4, 3 SECONDS, table_required = TRUE) + +/obj/item/food/brownie + name = "brownie" + desc = "A square slice of delicious, chewy brownie. Often the target of potheads." + icon = 'icons/obj/food/food.dmi' + icon_state = "brownie" + food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/sugar = 3) + tastes = list("brownie" = 1, "chocolatey goodness" = 1) + foodtypes = GRAIN | JUNKFOOD | SUGAR + w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/objects/items/food/sandwichtoast.dm b/code/game/objects/items/food/sandwichtoast.dm index 24fe4831145..7e808df14df 100644 --- a/code/game/objects/items/food/sandwichtoast.dm +++ b/code/game/objects/items/food/sandwichtoast.dm @@ -145,3 +145,25 @@ foodtypes = GRAIN | MEAT | VEGETABLES | BREAKFAST food_flags = FOOD_FINGER_FOOD w_class = WEIGHT_CLASS_SMALL + +/obj/item/food/peanut_butter_jelly_sandwich + name = "peanut butter and jelly sandwich" + desc = "A classic PB&J sandwich, just like your mom used to make." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "peanut_butter_jelly_sandwich" + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 4, /datum/reagent/consumable/nutriment/vitamin = 2) + tastes = list("peanut butter" = 1, "jelly" = 1, "bread" = 2) + foodtypes = GRAIN | FRUIT | NUTS + food_flags = FOOD_FINGER_FOOD + w_class = WEIGHT_CLASS_SMALL + +/obj/item/food/peanut_butter_banana_sandwich + name = "peanut butter and banana sandwich" + desc = "A grilled peanut butter sandwich with banana slices mixed in, a good high protein treat." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "peanut_butter_banana_sandwich" + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 4, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 2) + tastes = list("peanut butter" = 1, "banana" = 1, "bread" = 2) + foodtypes = GRAIN | FRUIT | NUTS + food_flags = FOOD_FINGER_FOOD + w_class = WEIGHT_CLASS_SMALL diff --git a/code/modules/asset_cache/assets/condiments.dm b/code/modules/asset_cache/assets/condiments.dm index d72716f778c..0fc4e65aa50 100644 --- a/code/modules/asset_cache/assets/condiments.dm +++ b/code/modules/asset_cache/assets/condiments.dm @@ -17,4 +17,5 @@ "frostoil" = 'icons/ui_icons/condiments/coldsauce.png', "bbqsauce" = 'icons/ui_icons/condiments/bbqsauce.png', "cornoil" = 'icons/ui_icons/condiments/oliveoil.png', + "peanut_butter" = 'icons/ui_icons/condiments/peanutbutter.png', ) diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm index 55c6179a652..c9a8227c5c7 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -285,6 +285,13 @@ list_reagents = list(/datum/reagent/consumable/yoghurt = 50) fill_icon_thresholds = null +/obj/item/reagent_containers/food/condiment/peanut_butter + name = "peanut butter" + desc = "Tasty, fattening processed peanuts in a jar." + icon_state = "peanutbutter" + list_reagents = list(/datum/reagent/consumable/peanut_butter = 50) + fill_icon_thresholds = null + //Food packs. To easily apply deadly toxi... delicious sauces to your food! /obj/item/reagent_containers/food/condiment/pack @@ -309,6 +316,7 @@ /datum/reagent/consumable/sugar = list("condi_sugar", "Sugar", "Tasty spacey sugar!"), /datum/reagent/consumable/astrotame = list("condi_astrotame", "Astrotame", "The sweetness of a thousand sugars but none of the calories."), /datum/reagent/consumable/bbqsauce = list("condi_bbq", "BBQ sauce", "Hand wipes not included."), + /datum/reagent/consumable/peanut_butter = list("condi_peanutbutter", "Peanut Butter", "A creamy paste made from ground peanuts."), ) /// Can't use initial(name) for this. This stores the name set by condimasters. var/originalname = "condiment" diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm index edfd6bcf749..470619fe519 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm @@ -122,6 +122,16 @@ result = /obj/item/food/baguette subcategory = CAT_BREAD +/datum/crafting_recipe/food/raw_breadstick + name = "Raw breadstick" + reqs = list( + /obj/item/food/doughslice = 1, + /datum/reagent/consumable/salt = 1, + /obj/item/food/butter = 1 + ) + result = /obj/item/food/raw_breadstick + subcategory = CAT_BREAD + ////////////////////////////////////////////////TOAST//////////////////////////////////////////////// /datum/crafting_recipe/food/slimetoast diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm index 22a1e4ac434..6a18ed613b4 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm @@ -306,7 +306,7 @@ /obj/item/food/grown/onion = 1, /obj/item/food/spaghetti/nizaya = 1, /obj/item/food/meatball = 2, - /obj/item/food/peanuts = 1 + /obj/item/food/grown/peanut = 1 ) result = /obj/item/food/soup/meatball_noodles subcategory = CAT_LIZARD diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index fcbc4d5fca9..eb820cd9efb 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -258,3 +258,24 @@ ) result = /obj/item/food/stuffed_cabbage subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/granola_bar + name = "Granola bar" + reqs = list( + /obj/item/food/grown/oat = 1, + /obj/item/food/grown/peanut = 1, + /obj/item/food/chocolatebar = 1, + /obj/item/food/no_raisin = 1, + /datum/reagent/consumable/sugar = 2 + ) + result = /obj/item/food/granola_bar + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/onigiri + name = "Onigiri" + reqs = list( + /obj/item/food/salad/boiledrice = 1, + /obj/item/food/seaweedsheet = 1, + ) + result = /obj/item/food/onigiri + subcategory = CAT_MISCFOOD 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 e47a891592a..18e6c750b6c 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -586,3 +586,24 @@ ) result = /obj/item/food/cannoli subcategory = CAT_PASTRY + +/datum/crafting_recipe/food/peanut_butter_cookie + name = "Peanut butter cookie" + reqs = list( + /datum/reagent/consumable/peanut_butter = 5, + /obj/item/food/pastrybase = 1 + ) + result = /obj/item/food/cookie/peanut_butter + subcategory = CAT_PASTRY + +/datum/crafting_recipe/food/raw_brownie_batter + name = "Raw brownie batter" + reqs = list( + /datum/reagent/consumable/flour = 5, + /datum/reagent/consumable/sugar = 5, + /obj/item/food/egg = 2, + /datum/reagent/consumable/coco = 5, + /obj/item/food/butter = 1 + ) + result = /obj/item/food/raw_brownie_batter + subcategory = CAT_PASTRY diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm index 0784bca39d7..eeb1f7761c3 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm @@ -72,3 +72,24 @@ ) result = /obj/item/food/blt subcategory = CAT_SANDWICH + +/datum/crafting_recipe/food/peanut_butter_jelly_sandwich + name = "Peanut butter and jelly sandwich" + reqs = list( + /obj/item/food/breadslice/plain = 2, + /datum/reagent/consumable/peanut_butter = 5, + /datum/reagent/consumable/cherryjelly = 5 + ) + result = /obj/item/food/peanut_butter_jelly_sandwich + subcategory = CAT_SANDWICH + +/datum/crafting_recipe/food/peanut_butter_banana_sandwich + name = "Peanut butter and banana sandwich" + reqs = list( + /obj/item/food/breadslice/plain = 2, + /datum/reagent/consumable/peanut_butter = 5, + /obj/item/food/grown/banana = 1 + ) + result = /obj/item/food/peanut_butter_banana_sandwich + subcategory = CAT_SANDWICH + diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm index 5ec651a6842..f4f660bd1bc 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm @@ -80,3 +80,14 @@ ) result = /obj/item/food/spicyfiletsushiroll subcategory = CAT_SEAFOOD + +/datum/crafting_recipe/food/nigiri_sushi + name ="Nigiri sushi" + reqs = list( + /obj/item/food/seaweedsheet = 1, + /obj/item/food/salad/boiledrice = 1, + /obj/item/food/fishmeat = 1, + /datum/reagent/consumable/soysauce = 2 + ) + result = /obj/item/food/nigiri_sushi + subcategory = CAT_SEAFOOD diff --git a/code/modules/hydroponics/grown/peanut.dm b/code/modules/hydroponics/grown/peanut.dm new file mode 100644 index 00000000000..bda79a10a6b --- /dev/null +++ b/code/modules/hydroponics/grown/peanut.dm @@ -0,0 +1,25 @@ +// Peanuts! +/obj/item/seeds/peanut + name = "pack of peanut seeds" + desc = "These seeds grow into peanut plants." + icon_state = "seed-peanut" + species = "peanut" + plantname = "Peanut Plant" + product = /obj/item/food/grown/peanut + lifespan = 55 + endurance = 35 + yield = 5 + growing_icon = 'icons/obj/hydroponics/growing.dmi' + icon_grow = "peanut-grow" + icon_dead = "peanut-dead" + genes = list(/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/peanut + seed = /obj/item/seeds/peanut + name = "peanut" + desc = "A tasty pair of groundnuts concealed in a tough shell." + icon_state = "peanut" + foodtypes = NUTS + grind_results = list(/datum/reagent/consumable/peanut_butter = 0) + tastes = list("peanuts" = 1) diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 39af8cd33ca..2e024776752 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -573,7 +573,8 @@ "capsaicin" = list("icon_state" = "hotsauce", "icon_empty" = "", "name" = "hotsauce bottle", "desc" = "You can almost TASTE the stomach ulcers!"), "frostoil" = list("icon_state" = "coldsauce", "icon_empty" = "", "name" = "coldsauce bottle", "desc" = "Leaves the tongue numb from its passage."), "cornoil" = list("icon_state" = "oliveoil", "icon_empty" = "", "name" = "corn oil bottle", "desc" = "A delicious oil used in cooking. Made from corn."), - "bbqsauce" = list("icon_state" = "bbqsauce", "icon_empty" = "", "name" = "bbq sauce bottle", "desc" = "Hand wipes not included.") + "bbqsauce" = list("icon_state" = "bbqsauce", "icon_empty" = "", "name" = "bbq sauce bottle", "desc" = "Hand wipes not included."), + "peanut_butter" = list("icon_state" = "peanutbutter", "icon_empty" = "", "name" = "peanut butter jar", "desc" = "A creamy paste made from ground peanuts."), ) var/list/carton_in_hand = list( "inhand_icon_state" = "carton", diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 2661ac2befb..c0d0afe7c58 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -1013,6 +1013,7 @@ description = "A rich, creamy spread produced by grinding peanuts." taste_description = "peanuts" color = "#D9A066" + nutriment_factor = 15 * REAGENTS_METABOLISM chemical_flags = REAGENT_CAN_BE_SYNTHESIZED /datum/reagent/consumable/peanut_butter/on_mob_life(mob/living/carbon/M, delta_time, times_fired) //ET loves peanut butter diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm index 95d31ae47ef..680f409407f 100644 --- a/code/modules/vending/megaseed.dm +++ b/code/modules/vending/megaseed.dm @@ -34,6 +34,7 @@ /obj/item/seeds/olive = 3, /obj/item/seeds/onion = 3, /obj/item/seeds/orange = 3, + /obj/item/seeds/peanut = 3, /obj/item/seeds/peas = 3, /obj/item/seeds/pineapple = 3, /obj/item/seeds/potato = 3, diff --git a/icons/obj/food/burgerbread.dmi b/icons/obj/food/burgerbread.dmi index 63cd4263012..512bc02743f 100644 Binary files a/icons/obj/food/burgerbread.dmi and b/icons/obj/food/burgerbread.dmi differ diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi index 9c0a210398f..a8983e7ddad 100644 Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index c4bd7dc24c5..c6b21dda81b 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/hydroponics/growing.dmi b/icons/obj/hydroponics/growing.dmi index aafc403199d..b215017e300 100644 Binary files a/icons/obj/hydroponics/growing.dmi and b/icons/obj/hydroponics/growing.dmi differ diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi index 9041efa5ead..b6a12b69f9b 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 d2b2e4c76f6..8883526e9ab 100644 Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ diff --git a/icons/ui_icons/condiments/peanutbutter.png b/icons/ui_icons/condiments/peanutbutter.png new file mode 100644 index 00000000000..dd751efaa3e Binary files /dev/null and b/icons/ui_icons/condiments/peanutbutter.png differ diff --git a/tgstation.dme b/tgstation.dme index 0afb2fb98eb..989b57f78eb 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3103,6 +3103,7 @@ #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\peanut.dm" #include "code\modules\hydroponics\grown\peas.dm" #include "code\modules\hydroponics\grown\pineapple.dm" #include "code\modules\hydroponics\grown\potato.dm"