diff --git a/code/modules/cargo/bounties/chef.dm b/code/modules/cargo/bounties/chef.dm index e1ca9260569..bf8503e481e 100644 --- a/code/modules/cargo/bounties/chef.dm +++ b/code/modules/cargo/bounties/chef.dm @@ -141,7 +141,7 @@ random_count = 3 wanted_types = list(/obj/item/reagent_containers/food/snacks/muffin, /obj/item/reagent_containers/food/snacks/burger/nt_muffin, - /obj/item/reagent_containers/food/snacks/berrymuffin) + /obj/item/reagent_containers/food/snacks/muffin/berry) /datum/bounty/item/chef/chawanmush name = "Chawanmushi" diff --git a/code/modules/cooking/recipes/recipes_pastries.dm b/code/modules/cooking/recipes/recipes_pastries.dm index 5ed98b3a524..bf73f034348 100644 --- a/code/modules/cooking/recipes/recipes_pastries.dm +++ b/code/modules/cooking/recipes/recipes_pastries.dm @@ -8,22 +8,76 @@ reagent_mix = RECIPE_REAGENT_REPLACE items = list( /obj/item/reagent_containers/food/snacks/dough, - /obj/item/reagent_containers/food/snacks/dough + /obj/item/reagent_containers/food/snacks/dough, ) result = /obj/item/reagent_containers/food/snacks/muffin result_quantity = 6 -/singleton/recipe/berrymuffin - appliance = OVEN - reagents = list(/singleton/reagent/drink/milk = 20, /singleton/reagent/sugar = 20) - reagent_mix = RECIPE_REAGENT_REPLACE +/singleton/recipe/muffin/berry + fruit = list("berries" = 2) + result = /obj/item/reagent_containers/food/snacks/muffin/berry + +/singleton/recipe/muffin/chocolate items = list( /obj/item/reagent_containers/food/snacks/dough, - /obj/item/reagent_containers/food/snacks/dough + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/chocolatebar, + ) + result = /obj/item/reagent_containers/food/snacks/muffin/chocolate + +/singleton/recipe/muffin/whitechocolate + items = list( + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/whitechocolate, + ) + result = /obj/item/reagent_containers/food/snacks/muffin/whitechocolate + +/singleton/recipe/muffin/cheese + items = list( + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/cheesewedge, + ) + result = /obj/item/reagent_containers/food/snacks/muffin/cheese + +/singleton/recipe/muffin/cheese/honkers + items = list( + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/cheesiehonkers, + ) + +/singleton/recipe/muffin/butter + items = list( + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/spreads/butter, + ) + result = /obj/item/reagent_containers/food/snacks/muffin/butter + +/singleton/recipe/muffin/raisin + items = list( + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/no_raisin, + ) + result = /obj/item/reagent_containers/food/snacks/muffin/raisin + +/singleton/recipe/muffin/meat + items = list( + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/meat, + ) + result = /obj/item/reagent_containers/food/snacks/muffin/meat + +/singleton/recipe/muffin/meat/meatsnack + items = list( + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/meatsnack, ) - fruit = list("berries" = 2) - result = /obj/item/reagent_containers/food/snacks/berrymuffin - result_quantity = 6 ////////////////////////////////////////////PANCAKES//////////////////////////////////////////// diff --git a/code/modules/reagents/reagent_containers/food/snacks/pastries.dm b/code/modules/reagents/reagent_containers/food/snacks/pastries.dm index c9254a01fb9..d2f010b144c 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/pastries.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/pastries.dm @@ -13,16 +13,47 @@ reagent_data = list(/singleton/reagent/nutriment = list("sweetness" = 3, "muffin" = 3)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/berrymuffin +/obj/item/reagent_containers/food/snacks/muffin/berry name = "berry muffin" desc = "A delicious and spongy little cake, with berries." - icon = 'icons/obj/item/reagent_containers/food/pastries.dmi' - icon_state = "berrymuffin" - filling_color = "#E0CF9B" - - reagents_to_add = list(/singleton/reagent/nutriment = 5) + icon_state = "muffin_berry" reagent_data = list(/singleton/reagent/nutriment = list("sweetness" = 1, "muffin" = 2, "berries" = 2)) - bitesize = 2 + +/obj/item/reagent_containers/food/snacks/muffin/chocolate + name = "berry muffin" + desc = "A delicious and spongy little cake, with chocolate chips." + icon_state = "muffin_chocolate" + reagent_data = list(/singleton/reagent/nutriment = list("sweetness" = 1, "muffin" = 2, "chocolate" = 2)) + +/obj/item/reagent_containers/food/snacks/muffin/whitechocolate + name = "chocolate muffin" + desc = "A delicious and spongy little cake, with white chocolate chips." + icon_state = "muffin_whitechocolate" + reagent_data = list(/singleton/reagent/nutriment = list("sweetness" = 1, "muffin" = 2, "white chocolate" = 2)) + +/obj/item/reagent_containers/food/snacks/muffin/cheese + name = "cheese muffin" + desc = "A delicious and spongy little cake, with cheese." + icon_state = "muffin_cheese" + reagent_data = list(/singleton/reagent/nutriment = list("sweetness" = 1, "muffin" = 2, "cheese" = 2)) + +/obj/item/reagent_containers/food/snacks/muffin/butter + name = "butter muffin" + desc = "A delicious, buttery and soft little cake." + icon_state = "muffin_butter" + reagent_data = list(/singleton/reagent/nutriment = list("sweetness" = 1, "muffin" = 2, "butter" = 2)) + +/obj/item/reagent_containers/food/snacks/muffin/raisin + name = "raisin muffin" + desc = "A delicious and spongy little cake, with raisins." + icon_state = "muffin_raisin" + reagent_data = list(/singleton/reagent/nutriment = list("sweetness" = 1, "muffin" = 2, "raisins" = 2)) + +/obj/item/reagent_containers/food/snacks/muffin/meat + name = "meat muffin" + desc = "A delicious and spongy little cake, with meat." + icon_state = "muffin_meat" + reagent_data = list(/singleton/reagent/nutriment = list("sweetness" = 1, "muffin" = 2, "meat" = 2)) ////////////////////////////////////////////PANCAKES//////////////////////////////////////////// diff --git a/html/changelogs/DreamySkrell-momev-update.yml b/html/changelogs/DreamySkrell-momev-update.yml new file mode 100644 index 00000000000..b33bf065094 --- /dev/null +++ b/html/changelogs/DreamySkrell-momev-update.yml @@ -0,0 +1,7 @@ + +author: DreamySkrell + +delete-after: True + +changes: + - rscadd: "More muffins." diff --git a/icons/obj/item/reagent_containers/food/pastries.dmi b/icons/obj/item/reagent_containers/food/pastries.dmi index b7454d5b308..63f515aea07 100644 Binary files a/icons/obj/item/reagent_containers/food/pastries.dmi and b/icons/obj/item/reagent_containers/food/pastries.dmi differ diff --git a/maps/away/away_site/pirate_base/pirate_base.dmm b/maps/away/away_site/pirate_base/pirate_base.dmm index 54929b4a0ee..a74798a532c 100644 --- a/maps/away/away_site/pirate_base/pirate_base.dmm +++ b/maps/away/away_site/pirate_base/pirate_base.dmm @@ -234,7 +234,7 @@ /obj/item/reagent_containers/bowl/plate{ pixel_x = 2 }, -/obj/item/reagent_containers/food/snacks/berrymuffin{ +/obj/item/reagent_containers/food/snacks/muffin/berry{ pixel_x = 3; pixel_y = 4 }, diff --git a/maps/event/idris_cruise/idris_cruise-1.dmm b/maps/event/idris_cruise/idris_cruise-1.dmm index 878465b9a40..f209af48ca4 100644 --- a/maps/event/idris_cruise/idris_cruise-1.dmm +++ b/maps/event/idris_cruise/idris_cruise-1.dmm @@ -21009,12 +21009,12 @@ /area/cruise/jungle) "qSo" = ( /obj/structure/table/rack, -/obj/item/reagent_containers/food/snacks/berrymuffin, -/obj/item/reagent_containers/food/snacks/berrymuffin, -/obj/item/reagent_containers/food/snacks/berrymuffin, -/obj/item/reagent_containers/food/snacks/berrymuffin, -/obj/item/reagent_containers/food/snacks/berrymuffin, -/obj/item/reagent_containers/food/snacks/berrymuffin, +/obj/item/reagent_containers/food/snacks/muffin/berry, +/obj/item/reagent_containers/food/snacks/muffin/berry, +/obj/item/reagent_containers/food/snacks/muffin/berry, +/obj/item/reagent_containers/food/snacks/muffin/berry, +/obj/item/reagent_containers/food/snacks/muffin/berry, +/obj/item/reagent_containers/food/snacks/muffin/berry, /obj/structure/window/reinforced{ dir = 4 }, diff --git a/maps/event/rooftop/rooftop-1.dmm b/maps/event/rooftop/rooftop-1.dmm index e263d543b19..cc567a5e34f 100644 --- a/maps/event/rooftop/rooftop-1.dmm +++ b/maps/event/rooftop/rooftop-1.dmm @@ -6658,12 +6658,12 @@ /area/city/mendell/interior) "Mj" = ( /obj/structure/table/rack, -/obj/item/reagent_containers/food/snacks/berrymuffin, -/obj/item/reagent_containers/food/snacks/berrymuffin, -/obj/item/reagent_containers/food/snacks/berrymuffin, -/obj/item/reagent_containers/food/snacks/berrymuffin, -/obj/item/reagent_containers/food/snacks/berrymuffin, -/obj/item/reagent_containers/food/snacks/berrymuffin, +/obj/item/reagent_containers/food/snacks/muffin/berry, +/obj/item/reagent_containers/food/snacks/muffin/berry, +/obj/item/reagent_containers/food/snacks/muffin/berry, +/obj/item/reagent_containers/food/snacks/muffin/berry, +/obj/item/reagent_containers/food/snacks/muffin/berry, +/obj/item/reagent_containers/food/snacks/muffin/berry, /turf/simulated/floor/tiled/white, /area/city/mendell/interior) "Mm" = (