cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 16:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

More muffins (#19038)

Browse Source 
momev update


![image](https://github.com/Aurorastation/Aurora.3/assets/107256943/392b224f-1d47-4f61-85cb-77c2c94d33a1)

momev update

---------

Co-authored-by: DreamySkrell <>
This commit is contained in:
DreamySkrell
2024-05-01 22:36:14 +00:00
committed by GitHub
co-authored by DreamySkrell <>
parent 47ae292bac
commit 7d67044010
8 changed files with 122 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/bounties/chef.dm
+1 -1
View File
@@ -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"
code/modules/cooking/recipes/recipes_pastries.dm
+63 -9
View File
@@ -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////////////////////////////////////////////
code/modules/reagents/reagent_containers/food/snacks/pastries.dm
+38 -7
View File
@@ -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////////////////////////////////////////////
html/changelogs/DreamySkrell-momev-update.yml
+7
View File
@@ -0,0 +1,7 @@
author: DreamySkrell
delete-after: True
changes:
- rscadd: "More muffins."
icons/obj/item/reagent_containers/food/pastries.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 39 KiB

maps/away/away_site/pirate_base/pirate_base.dmm
+1 -1
View File
@@ -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
},
maps/event/idris_cruise/idris_cruise-1.dmm
+6 -6
View File
@@ -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
},
maps/event/rooftop/rooftop-1.dmm
+6 -6
View File
@@ -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" = (