Merge pull request #938 from Citadel-Station-13/upstream-merge-27169

[MIRROR] Adds Several Butter-filled Foods

code/modules/food_and_drinks/food/snacks_bread.dm

@@ -164,3 +164,24 @@
 	icon = 'icons/obj/food/food.dmi'
 	icon_state = ""
 	bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/butteredtoast
+	name = "buttered toast"
+	desc = "Butter lightly spread over a piece of toast."
+	icon = 'icons/obj/food/food.dmi'
+	icon_state = "butteredtoast"
+	bitesize = 3
+	filling_color = "#FFA500"
+	list_reagents = list("nutriment" = 4)
+	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
+	tastes = list("butter" = 1, "toast" = 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/butterbiscuit
+	name = "butter biscuit"
+	desc = "Well butter my biscuit!"
+	icon = 'icons/obj/food/food.dmi'
+	icon_state = "butterbiscuit"
+	filling_color = "#F0E68C"
+	list_reagents = list("nutriment" = 5)
+	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
+	tastes = list("butter" = 1, "biscuit" = 1)

code/modules/food_and_drinks/food/snacks_meat.dm

@@ -236,3 +236,12 @@
 	var/shape = pick("lump", "star", "lizard", "corgi")
 	desc = "A 'chicken' nugget vaguely shaped like a [shape]."
 	icon_state = "nugget_[shape]"
+
+/obj/item/weapon/reagent_containers/food/snacks/pigblanket
+	name = "pig in a blanket"
+	desc = "A tiny sausage wrapped in a flakey, buttery roll. Free this pig from its blanket prison by eating it."
+	icon_state = "pigblanket"
+	list_reagents = list("nutriment" = 6, "vitamin" = 1)
+	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
+	filling_color = "#800000"
+	tastes = list("meat" = 1, "butter" = 1)

code/modules/food_and_drinks/food/snacks_spaghetti.dm

@@ -85,3 +85,12 @@
 	trash = /obj/item/weapon/reagent_containers/glass/bowl
 	bonus_reagents = list("nutriment" = 5, "vitamin" = 6, "liquidgibs" = 3)
 	tastes = list("noodle" = 1, "meat" = 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/butternoodles
+	name = "butter noodles"
+	desc = "Noodles covered in savory butter. Simple and slippery, but delicious."
+	icon = 'icons/obj/food/pizzaspaghetti.dmi'
+	icon_state = "butternoodles"
+	trash = /obj/item/trash/plate
+	bonus_reagents = list("nutriment" = 8, "vitamin" = 1)
+	tastes = list("noodle" = 1, "butter" = 1)

code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm

@@ -74,3 +74,22 @@
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/mimana
 	category = CAT_BREAD
+
+/datum/crafting_recipe/food/butteredtoast
+	name = "Buttered Toast"
+	reqs = list(
+		/obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 1,
+		/obj/item/weapon/reagent_containers/food/snacks/butter = 1
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/butteredtoast
+	category = CAT_BREAD
+
+/datum/crafting_recipe/food/butterbiscuit
+	name = "Butter Biscuit"
+	reqs = list(
+		/obj/item/weapon/reagent_containers/food/snacks/bun = 1,
+		/obj/item/weapon/reagent_containers/food/snacks/butter = 1
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/butterbiscuit
+	category = CAT_BREAD
+

code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm

@@ -160,3 +160,13 @@
 	)
 	result =  /obj/item/weapon/reagent_containers/food/snacks/rawkhinkali
 	category = CAT_MEAT
+
+/datum/crafting_recipe/food/pigblanket
+	name = "Pig in a Blanket"
+	reqs = list(
+		/obj/item/weapon/reagent_containers/food/snacks/bun = 1,
+		/obj/item/weapon/reagent_containers/food/snacks/butter = 1,
+		/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 1
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/pigblanket
+	category = CAT_MEAT

code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm

@@ -59,3 +59,12 @@
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/chowmein
 	category = CAT_SPAGHETTI
+
+/datum/crafting_recipe/food/butternoodles
+	name = "Butter Noodles"
+	reqs = list(
+		/obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti = 1,
+		/obj/item/weapon/reagent_containers/food/snacks/butter = 1
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/butternoodles
+	category = CAT_SPAGHETTI