cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 19:13:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10892 from UmeFuu/master

Browse Source 
New cookies recipe (previous one was a bit silly)
This commit is contained in:
variableundefined
2019-02-26 17:04:31 +08:00
committed by GitHub
parent a1fc0efa63 51a33bba08
commit db26f9bcc4
9 changed files with 149 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/food/foods/baked_goods.dm
+2 -2
View File
@@ -201,7 +201,7 @@
icon_state = "COOKIE!!!"
bitesize = 1
filling_color = "#DBC94F"
list_reagents = list("nutriment" = 1)
list_reagents = list("nutriment" = 1, "sugar" = 3, "hot_coco" = 5 )
/obj/item/reagent_containers/food/snacks/fortunecookie
name = "fortune cookie"
@@ -215,7 +215,7 @@
name = "sugar cookie"
desc = "Just like your little sister used to make."
icon_state = "sugarcookie"
list_reagents = list("nutriment" = 3, "sugar" = 3)
list_reagents = list("nutriment" = 1, "sugar" = 3)
//////////////////////
code/modules/food_and_drinks/food/foods/ingredients.dm
+78
View File
@@ -129,6 +129,71 @@
list_reagents = list("nutriment" = 1)
///cookies by Ume
/obj/item/reagent_containers/food/snacks/cookiedough
var/flat = FALSE
name = "pastry dough"
icon = 'icons/obj/food/food_ingredients.dmi'
desc = "The base for tasty cookies."
icon_state = "cookiedough"
list_reagents = list("nutriment" = 5, "sugar" = 5)
/obj/item/reagent_containers/food/snacks/cookiedough/update_icon()
if(flat)
icon_state = "cookiedough_flat"
name = "flat pastry dough"
else
icon_state = "cookiedough"
// Dough + rolling pin = flat cookie dough // Flat dough + circular cutter = unbaked cookies
/obj/item/reagent_containers/food/snacks/cookiedough/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/kitchen/rollingpin) && !flat)
if(isturf(loc))
to_chat(user, "<span class='notice'>You flatten [src].</span>")
flat = TRUE
update_icon()
else
to_chat(user, "<span class='notice'>You need to put [src] on a surface to roll it out!</span>")
else if(istype(I, /obj/item/kitchen/cutter) && flat)
if(isturf(loc))
new /obj/item/reagent_containers/food/snacks/rawcookies(loc)
to_chat(user, "<span class='notice'>You cut [src] into cookies.</span>")
qdel(src)
else
to_chat(user, "<span class='notice'>You need to put [src] on a surface to cut it out!</span>")
else
return ..()
/obj/item/reagent_containers/food/snacks/rawcookies
name = "raw cookies"
desc = "Ready for oven!"
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "unbaked_cookies"
list_reagents = list("nutriment" = 5, "sugar" = 5)
/obj/item/reagent_containers/food/snacks/rawcookies/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/reagent_containers/food/snacks/choc_pile))
if(isturf(loc))
new /obj/item/reagent_containers/food/snacks/rawcookies/chocochips(loc)
to_chat(user, "<span class='notice'>You sprinkle [I] all over the cookies.</span>")
qdel(src)
qdel(I)
else
to_chat(user, "<span class='notice'>You need to put [src] on a surface to add this</span>")
else
return ..()
/obj/item/reagent_containers/food/snacks/rawcookies/chocochips
name = "raw cookies"
desc = "Ready for oven! They have little pieces of chocolate all over them"
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "unbaked_cookies_choco"
list_reagents = list("nutriment" = 5, "sugar" = 5, "chocolate" = 5)
//////////////////////
// Chocolate //
//////////////////////
@@ -140,6 +205,19 @@
filling_color = "#7D5F46"
list_reagents = list("nutriment" = 2, "sugar" = 2, "cocoa" = 2)
///Chocolate crumbles/pile
/obj/item/reagent_containers/food/snacks/chocolatebar/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/kitchen/knife))
if(isturf(loc))
new /obj/item/reagent_containers/food/snacks/choc_pile(loc)
to_chat(user, "<span class='notice'>You cut [src] into little crumbles.</span>")
qdel(src)
else
to_chat(user, "<span class='notice'>You need to put [src] on a surface to cut it out!</span>")
else
return ..()
/obj/item/reagent_containers/food/snacks/choc_pile //for reagent chocolate being spilled on turfs
name = "pile of chocolate"
desc = "A pile of pure chocolate pieces."
code/modules/food_and_drinks/recipes/recipes_oven.dm
+14 -13
View File
@@ -163,13 +163,22 @@
)
result = /obj/item/reagent_containers/food/snacks/loadedbakedpotato
/datum/recipe/oven/cookie
reagents = list("milk" = 5, "sugar" = 5)
////cookies by Ume
/datum/recipe/oven/cookies
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/chocolatebar,
/obj/item/reagent_containers/food/snacks/rawcookies/chocochips,
)
result = /obj/item/reagent_containers/food/snacks/cookie
result = /obj/item/storage/bag/tray/cookies_tray
/datum/recipe/oven/sugarcookies
items = list(
/obj/item/reagent_containers/food/snacks/rawcookies,
)
result = /obj/item/storage/bag/tray/cookies_tray/sugarcookie
////
/datum/recipe/oven/fortunecookie
reagents = list("sugar" = 5)
@@ -437,14 +446,6 @@
)
result = /obj/item/reagent_containers/food/snacks/cracker
/datum/recipe/oven/sugarcookie
reagents = list("sugar" = 5)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/egg,
)
result = /obj/item/reagent_containers/food/snacks/sugarcookie
/datum/recipe/oven/sugarcookie/make_food(obj/container)
var/obj/item/reagent_containers/food/snacks/sugarcookie/being_cooked = ..()
being_cooked.reagents.del_reagent("egg")
code/modules/reagents/chemistry/recipes/food.dm
+17 -1
View File
@@ -99,9 +99,25 @@
/datum/chemical_reaction/dough/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
for(var/i in 1 to created_volume)
new /obj/item/reagent_containers/food/snacks/dough(location)
///Cookies by Ume
/datum/chemical_reaction/cookiedough
name = "Dough"
id = "dough"
result = null
required_reagents = list("milk" = 10, "flour" = 10, "sugar" = 5)
result_amount = 1
mix_message = "The ingredients form a dough. It smells sweet and yummy."
/datum/chemical_reaction/cookiedough/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i in 1 to created_volume)
new /obj/item/reagent_containers/food/snacks/cookiedough(location)
/datum/chemical_reaction/corn_syrup
name = "corn_syrup"
id = "corn_syrup"