diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm index 0aef697883..60a933873e 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -24,7 +24,8 @@ "blackpepper" = list("peppermillsmall", "pepper mill", "Often used to flavor food or make people sneeze"), "cornoil" = list("oliveoil", "corn oil bottle", "A delicious oil used in cooking. Made from corn"), "sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!"), - "mayonnaise" = list("mayonnaise", "mayonnaise jar", "An oily condiment made from egg yolks.")) + "mayonnaise" = list("mayonnaise", "mayonnaise jar", "An oily condiment made from egg yolks."), + "peanut_butter" = list("peanutbutter", "peanut butter jar", "A deliciously and sticky spread made from peanuts.")) var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters. /obj/item/reagent_containers/food/condiment/suicide_act(mob/living/carbon/user) diff --git a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm index 1b602b6759..31a9917c0c 100644 --- a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm +++ b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm @@ -52,6 +52,33 @@ list_reagents = list("nutriment" = 2, "cherryjelly" = 5, "vitamin" = 2) foodtype = GRAIN | FRUIT +/obj/item/reagent_containers/food/snacks/jellysandwich/pbj + name = "\improper PB & J sandwich" + desc = "A grand creation of peanut butter, jelly and bread! An all-american classic." + icon_state = "pbjsandwich" + tastes = list("bread" = 1, "jelly" = 1, "peanuts" = 1) + +/obj/item/reagent_containers/food/snacks/jellysandwich/pbj/cherry + bonus_reagents = list("cherryjelly" = 5, "peanut_butter" = 5, "vitamin" = 2) + list_reagents = list("nutriment" = 2, "cherryjelly" = 5, "peanut_butter" = 5, "vitamin" = 2) + foodtype = GRAIN | FRUIT + +/obj/item/reagent_containers/food/snacks/jellysandwich/pbj/slime + bonus_reagents = list("slimejelly" = 5, "peanut_butter" = 5, "vitamin" = 2) + list_reagents = list("nutriment" = 2, "slimejelly" = 5, "peanut_butter" = 5, "vitamin" = 2) + foodtype = GRAIN | TOXIC + +/obj/item/reagent_containers/food/snacks/peanutbutter_sandwich + name = "peanut butter sandwich" + desc = "You wish you had some jelly to go with this..." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "peanutbuttersandwich" + trash = /obj/item/trash/plate + bitesize = 3 + bonus_reagent = list("peanut_butter" = 5, "vitamin" = 2) + list_reagents = list("nutriment" = 2, "peanut_butter" = 5, "vitamin" = 2) + foodtype = GRAIN + /obj/item/reagent_containers/food/snacks/notasandwich name = "not-a-sandwich" desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache." @@ -83,6 +110,19 @@ list_reagents = list("nutriment" = 1, "slimejelly" = 5, "vitamin" = 2) foodtype = GRAIN | TOXIC | SUGAR +/obj/item/reagent_containers/food/snacks/peanut_buttertoast + name = "peanut butter toast" + desc = "A slice of toast covered with delicious peanut butter." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "peanutbuttertoast" + trash = /obj/item/trash/plate + bitesize = 3 + bonus_reagents = list("peanut_butter" = 5, "vitamin" = 2) + list_reagents = list("nutriment" = 1, "peanut_butter" = 5, "vitamin" = 2) + tastes = list("toast" = 1, "peanuts" = 1) + foodtype = GRAIN + + /obj/item/reagent_containers/food/snacks/twobread name = "two bread" desc = "This seems awfully bitter." 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 0c4e2c2e30..a6240e5b48 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -116,7 +116,7 @@ result = /obj/item/reagent_containers/food/snacks/jelliedtoast/slime subcategory = CAT_MISCFOOD -/datum/crafting_recipe/food/jelliedyoast +/datum/crafting_recipe/food/jelliedtoast name = "Jellied toast" reqs = list( /datum/reagent/consumable/cherryjelly = 5, @@ -125,6 +125,15 @@ result = /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry subcategory = CAT_MISCFOOD +/datum/crafting_recipe/food/peanutbuttertoast + name = "Peanut butter toast" + reqs = list( + /datum/reagent/consumable/peanut_butter = 5, + /obj/item/reagent_containers/food/snacks/breadslice/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/peanut_buttertoast + subcategory = CAT_MISCFOOD + /datum/crafting_recipe/food/twobread name = "Two bread" reqs = list( 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 0f1c40da3f..b782603e8e 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm @@ -43,6 +43,48 @@ result = /obj/item/reagent_containers/food/snacks/jellysandwich/cherry subcategory = CAT_SANDWICH +/datum/crafting_recipe/food/pbj_slimesandwich + name = "PB&J sandwich" + reqs = list( + /datum/reagent/toxin/slimejelly = 5, + /datum/reagent/consumable/peanut_butter = 5, + /obj/item/reagent_containers/food/snacks/breadslice/plain = 2, + ) + result = /obj/item/reagent_containers/food/snacks/jellysandwich/pbj/slime + subcategory = CAT_SANDWICH + +/datum/crafting_recipe/food/pbj_slimesandwich/alt + reqs = list( + /obj/item/reagent_containers/food/snacks/jelliedtoast/slime = 1, + /obj/item/reagent_containers/food/snacks/peanut_buttertoast = 1, + ) + +/datum/crafting_recipe/food/pbj_sandwich + name = "PB&J sandwich" + reqs = list( + /datum/reagent/consumable/cherryjelly = 5, + /datum/reagent/consumable/peanut_butter = 5, + /obj/item/reagent_containers/food/snacks/breadslice/plain = 2, + ) + result = /obj/item/reagent_containers/food/snacks/jellysandwich/pbj/cherry + subcategory = CAT_SANDWICH + +/datum/crafting_recipe/food/pbj_sandwich/alt + reqs = list( + /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry = 1, + /obj/item/reagent_containers/food/snacks/peanut_buttertoast = 1, + ) + +/datum/crafting_recipe/peanutbutter_sandwich + name = "Peanut butter sandwich" + reqs = list( + /datum/reagent/consumable/peanut_butter = 5, + /obj/item/reagent_containers/food/snacks/breadslice/plain = 2, + ) + result = /obj/item/reagent_containers/food/snacks/peanutbutter_sandwich + subcategory = CAT_SANDWICH + + /datum/crafting_recipe/food/notasandwich name = "Not a sandwich" reqs = list( diff --git a/code/modules/hydroponics/grown/peanuts.dm b/code/modules/hydroponics/grown/peanuts.dm new file mode 100644 index 0000000000..2423300cc4 --- /dev/null +++ b/code/modules/hydroponics/grown/peanuts.dm @@ -0,0 +1,30 @@ +/obj/item/seeds/peanutseed + name = "pack of peanut seeds" + desc = "These seeds grow to produce fruits botanically classified as legumes, but mundanely referred as nuts." + icon_state = "seed-peanut" + species = "peanut" + plantname = "Peanut Vines" + product = /obj/item/reagent_containers/food/snacks/grown/peanut + yield = 6 + growthstages = 4 + growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' + reagents_add = list("vitamin" = 0.02, "nutriment" = 0.15, "cooking_oil" = 0.03) + +/obj/item/reagent_containers/food/snacks/grown/peanut + seed = /obj/item/seeds/peanutseed + name = "peanut" + desc = "Peanuts for the peanut gallery!" //get me a better description, boys. + icon_state = "peanut" + filling_color = "#C4AE7A" + bitesize = 100 + foodtype = VEGETABLES + dried_type = /obj/item/reagent_containers/food/snacks/roasted_peanuts + cooked_type = /obj/item/reagent_containers/food/snacks/roasted_peanuts + +/obj/item/reagent_containers/food/snacks/roasted_peanuts + name = "roasted peanuts" + desc = "A handful of roasted peanuts, with or without salt." + icon_state = "roasted_peanuts" + foodtype = VEGETABLES + list_reagents = list("nutriment" = 6, "vitamin" = 1) + juice_results = list("peanut_butter" = 3) \ No newline at end of file diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index afa469706a..2b147a3bd5 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -436,6 +436,14 @@ . = 1 ..() +/datum/reagent/consumable/peanut_butter + name = "Peanut Butter" + id = "peanut_butter" + description = "A popular food paste made from ground dry-roasted peanuts." + color = "#C29261" + nutriment_factor = 15 * REAGENTS_METABOLISM + taste_description = "peanuts" + /datum/reagent/consumable/cornoil name = "Corn Oil" id = "cornoil" diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm index 9aa11c7bfb..4594048256 100644 --- a/code/modules/vending/megaseed.dm +++ b/code/modules/vending/megaseed.dm @@ -23,6 +23,7 @@ /obj/item/seeds/lime = 3, /obj/item/seeds/onion = 3, /obj/item/seeds/orange = 3, + /obj/item/seeds/peanutseed = 3, /obj/item/seeds/pineapple = 3, /obj/item/seeds/potato = 3, /obj/item/seeds/poppy = 3, diff --git a/icons/obj/food/burgerbread.dmi b/icons/obj/food/burgerbread.dmi index c40dfaaa22..cd7fc1742b 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 c348fb4f8f..97a2e62e3e 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 9861a2e618..6ee47c33a8 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/hydroponics/growing_vegetables.dmi b/icons/obj/hydroponics/growing_vegetables.dmi index 9fc1520175..4e1adceb87 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 054aa47bbd..efaaf18462 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 4c898aecd3..5a2088c332 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 e33566290c..b660af0b07 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -1711,6 +1711,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\peanuts.dm" #include "code\modules\hydroponics\grown\pineapple.dm" #include "code\modules\hydroponics\grown\potato.dm" #include "code\modules\hydroponics\grown\pumpkin.dm"