From 8c11252d935d739c27fd980d780c457f5d97b82e Mon Sep 17 00:00:00 2001 From: Emmett Gaines Date: Sat, 25 Nov 2017 16:35:22 -0500 Subject: [PATCH 1/2] butterdogs (#33002) --- .../food_and_drinks/food/snacks_bread.dm | 17 ++++++++++++++++- .../recipes/tablecraft/recipes_bread.dm | 8 ++++++++ icons/obj/food/food.dmi | Bin 58941 -> 59184 bytes 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm index 8f48e94d08..c29ed30b22 100644 --- a/code/modules/food_and_drinks/food/snacks_bread.dm +++ b/code/modules/food_and_drinks/food/snacks_bread.dm @@ -238,4 +238,19 @@ filling_color = "#F0E68C" list_reagents = list("nutriment" = 5) bonus_reagents = list("nutriment" = 1, "vitamin" = 1) - tastes = list("butter" = 1, "biscuit" = 1) \ No newline at end of file + tastes = list("butter" = 1, "biscuit" = 1) + +/obj/item/reagent_containers/food/snacks/butterdog + name = "butterdog" + desc = "Made from exotic butters." + icon = 'icons/obj/food/food.dmi' + icon_state = "butterdog" + bitesize = 1 + filling_color = "#F1F49A" + list_reagents = list("nutriment" = 5) + bonus_reagents = list("nutriment" = 1, "vitamin" = 1) + tastes = list("butter", "exotic butter") + +/obj/item/reagent_containers/food/snacks/butterdog/ComponentInitialize() + . = ..() + AddComponent(/datum/component/slippery, 80) \ No newline at end of file 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 493c6f6cdd..e572cc76ff 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm @@ -93,3 +93,11 @@ result = /obj/item/reagent_containers/food/snacks/butterbiscuit subcategory = CAT_BREAD +/datum/crafting_recipe/food/butterdog + name = "Butterdog" + reqs = list( + /obj/item/reagent_containers/food/snacks/bun = 1, + /obj/item/reagent_containers/food/snacks/butter = 3, + ) + result = /obj/item/reagent_containers/food/snacks/butterdog + subcategory = CAT_BREAD \ No newline at end of file diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index cefc1e5ab9eeba0180b26e7ab7e75ea7bbbbf9e0..26822c2c015a2f701451ededc4b315ae3021ff63 100644 GIT binary patch delta 4907 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 aBak>!K4rN$^|b^Mhk>4nZn?I7*#7|36n*Rf delta 4662 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