From 7942054cfe2576df90925433c4b23b321a7d27d1 Mon Sep 17 00:00:00 2001 From: UmeFuu <35434208+UmeFuu@users.noreply.github.com> Date: Tue, 12 Feb 2019 20:10:19 -0300 Subject: [PATCH 01/20] Add new cookies recipe sprites Added cookie dough, flat cookie dough and unbaked cookies. --- icons/obj/food/food_ingredients.dmi | Bin 4999 -> 6120 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/food/food_ingredients.dmi b/icons/obj/food/food_ingredients.dmi index f6fcf5228ac1667aa8aa12a651910afd761c3c1f..861dbb7827929b199f6bc2b16b260fb442458f69 100644 GIT binary patch literal 6120 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 DLua+E literal 4999 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 From fd487913e9f6521bb87db4c294095ed31237ea4d Mon Sep 17 00:00:00 2001 From: UmeFuu <35434208+UmeFuu@users.noreply.github.com> Date: Tue, 12 Feb 2019 20:12:46 -0300 Subject: [PATCH 02/20] Adds circular cutter sprite Needed for new cookies recipe --- icons/obj/kitchen.dmi | Bin 31771 -> 32083 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi index 16fb7801f0fa0fc2468213f4bec5b3dcab3848aa..2c3b244a41db7ff99d8981af6830ca1804fd04ca 100644 GIT binary patch delta 10216 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 PKOHUo8zqz)wxRzAv2}BV delta 9901 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 CqrE=> From e6eb81de3422fa829aedbbcc865503c07fecdaa7 Mon Sep 17 00:00:00 2001 From: UmeFuu <35434208+UmeFuu@users.noreply.github.com> Date: Tue, 12 Feb 2019 20:16:50 -0300 Subject: [PATCH 03/20] Balances cookies reagents Chocolate chips cookies now have hot_coco so they actually taste like chocolate and also sugar Sugar cookies now have 1u of nutriment (they had 3 before) so they're equal the chocolate chips cookies --- code/modules/food_and_drinks/food/foods/baked_goods.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/food/foods/baked_goods.dm b/code/modules/food_and_drinks/food/foods/baked_goods.dm index 1115b42014e..0746f37d113 100644 --- a/code/modules/food_and_drinks/food/foods/baked_goods.dm +++ b/code/modules/food_and_drinks/food/foods/baked_goods.dm @@ -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) ////////////////////// From 3b415b618e4c880edffd49bf3b57e813e1de3257 Mon Sep 17 00:00:00 2001 From: UmeFuu <35434208+UmeFuu@users.noreply.github.com> Date: Tue, 12 Feb 2019 20:19:04 -0300 Subject: [PATCH 04/20] Adds code for new cookies recipe Adds in special cookies dough, flat cookie dough and the same dough cutted into circles, ready to bake --- .../food_and_drinks/food/foods/ingredients.dm | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/code/modules/food_and_drinks/food/foods/ingredients.dm b/code/modules/food_and_drinks/food/foods/ingredients.dm index 8fb9773a48e..94d4f8a3dbd 100644 --- a/code/modules/food_and_drinks/food/foods/ingredients.dm +++ b/code/modules/food_and_drinks/food/foods/ingredients.dm @@ -129,6 +129,50 @@ list_reagents = list("nutriment" = 1) +///cookies by Ume + +/obj/item/reagent_containers/food/snacks/cookiedough + name = "cookie dough" + desc = "The base for tasty cookies." + icon_state = "cookiedough" + list_reagents = list("nutriment" = 5, "sugar" = 5) + +// Dough + rolling pin = flat cookie dough +/obj/item/reagent_containers/food/snacks/cookiedough/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/kitchen/rollingpin)) + if(isturf(loc)) + new /obj/item/reagent_containers/food/snacks/cookiedough_flat(loc) + to_chat(user, "You flatten [src].") + qdel(src) + else + to_chat(user, "You need to put [src] on a surface to roll it out!") + else + ..() + +/obj/item/reagent_containers/food/snacks/cookiedough_flat + name = "flat cookie dough" + desc = "The base for tasty cookies." + icon_state = "cookiedough_flat" + list_reagents = list("nutriment" = 5, "sugar" = 5) + +//Flat cookie dough + circular cutter = Raw cookies +/obj/item/reagent_containers/food/snacks/cookiedough_flat/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/kitchen/cutter)) + if(isturf(loc)) + new /obj/item/reagent_containers/food/snacks/rawcookies(loc) + to_chat(user, "You cut [src] into cookies.") + qdel(src) + else + to_chat(user, "You need to put [src] on a surface to cut it out!") + else + ..() + +/obj/item/reagent_containers/food/snacks/rawcookies + name = "raw cookies" + desc = "Ready for oven!" + icon_state = "unbaked_cookies" + list_reagents = list("nutriment" = 5, "sugar" = 5) + ////////////////////// // Chocolate // ////////////////////// From d3fc0a99504fcfb0a75474318a2497363c5b8e98 Mon Sep 17 00:00:00 2001 From: UmeFuu <35434208+UmeFuu@users.noreply.github.com> Date: Tue, 12 Feb 2019 20:21:27 -0300 Subject: [PATCH 05/20] New cookies recipe Deletes old one-single cookie recipe and replaces it for a more complex x6 cookies recipe (For both chocolate chips cookies and sugar cookies) --- .../food_and_drinks/recipes/recipes_oven.dm | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/recipes_oven.dm b/code/modules/food_and_drinks/recipes/recipes_oven.dm index a6e08ad8569..e9b560ace7d 100644 --- a/code/modules/food_and_drinks/recipes/recipes_oven.dm +++ b/code/modules/food_and_drinks/recipes/recipes_oven.dm @@ -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/rawcookies, /obj/item/reagent_containers/food/snacks/chocolatebar, ) - 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/sugarcookies_tray + +//// /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") From 649cf7a63a8cb6acfbeb666c1adb083fa98978bc Mon Sep 17 00:00:00 2001 From: UmeFuu <35434208+UmeFuu@users.noreply.github.com> Date: Tue, 12 Feb 2019 20:24:11 -0300 Subject: [PATCH 06/20] Adds new type of dough for cookies New chemist reaction that creates cookie dough 10u milk + 10u flour + 5u sugar --- code/modules/reagents/chemistry/recipes/food.dm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/code/modules/reagents/chemistry/recipes/food.dm b/code/modules/reagents/chemistry/recipes/food.dm index cbea3014773..cc399adb169 100644 --- a/code/modules/reagents/chemistry/recipes/food.dm +++ b/code/modules/reagents/chemistry/recipes/food.dm @@ -102,6 +102,22 @@ for(var/i = 1, i <= created_volume, i++) 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 = 1, i <= created_volume, i++) + new /obj/item/reagent_containers/food/snacks/cookiedough(location) + + /datum/chemical_reaction/corn_syrup name = "corn_syrup" id = "corn_syrup" From ca2fa7c3b31cbb195f4cf52f345486cdd0014d99 Mon Sep 17 00:00:00 2001 From: UmeFuu <35434208+UmeFuu@users.noreply.github.com> Date: Tue, 12 Feb 2019 20:26:12 -0300 Subject: [PATCH 07/20] Adds new circular cutter Needed for the new cookies recipe and maybe future recipes --- code/game/objects/items/weapons/kitchen.dm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 98422d8c680..d4a53e8e8b2 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -178,6 +178,21 @@ materials = list() origin_tech = "biotech=3;combat=2" attack_verb = list("shanked", "shivved") +/* + *cutter by Ume + */ + + /obj/item/kitchen/cutter + name = "generic circular cutter" + desc = "A generic circular cutter for cookies and other things." + icon_state = "circular_cutter" + force = 5 + throwforce = 5 + throw_speed = 3 + throw_range = 3 + sharp = 1 + w_class = WEIGHT_CLASS_SMALL + attack_verb = list("bashed", "slashed", "pricked", "thrashed") /* * Rolling Pins @@ -251,7 +266,7 @@ desc = "It has the shape of a sucker imprinted into it." icon_state = "mould_loli" -/* +/* * Sushi Mat */ /obj/item/kitchen/sushimat From 4f371cb7c2c8f79de984a11962a7d2d6123f0de5 Mon Sep 17 00:00:00 2001 From: UmeFuu <35434208+UmeFuu@users.noreply.github.com> Date: Tue, 12 Feb 2019 20:28:54 -0300 Subject: [PATCH 08/20] Adds trays with cookies Adds two trays, one with x6 cookies and the other with x6 sugar cookies, needed for the new cookies recipe. --- code/game/objects/items/weapons/storage/bags.dm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 26309f885fa..3ab3434fad7 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -460,6 +460,20 @@ return ..() +/obj/item/storage/bag/tray/cookies_tray/New() /// By Azule Utama, thank you a lot! + ..() + for(var/i in 1 to 6) + var/obj/item/C = new /obj/item/reagent_containers/food/snacks/cookie(src) + handle_item_insertion(C) // Done this way so the tray actually has the cookies visible when spawned + rebuild_overlays() + +/obj/item/storage/bag/tray/sugarcookies_tray/New() /// By Azule Utama, thank you a lot! + ..() + for(var/i in 1 to 6) + var/obj/item/C = new /obj/item/reagent_containers/food/snacks/sugarcookie(src) + handle_item_insertion(C) // Done this way so the tray actually has the cookies visible when spawned + rebuild_overlays() + /* * Chemistry bag */ From 5db7dafc387e615539551f994df7bcff0259eb5f Mon Sep 17 00:00:00 2001 From: UmeFuu <35434208+UmeFuu@users.noreply.github.com> Date: Wed, 13 Feb 2019 00:16:17 -0300 Subject: [PATCH 09/20] Adds new circular cutter Needed for the new cookies recipe and maybe future recipes ----- Fixed, it didn't work before for some reason --- code/game/objects/items/weapons/kitchen.dm | 36 +++++++++++++--------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index d4a53e8e8b2..a0810a0b96c 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -9,12 +9,16 @@ * Rolling Pins * Candy Moulds * Sushi Mat + * Circular cutter */ /obj/item/kitchen icon = 'icons/obj/kitchen.dmi' origin_tech = "materials=1" + + + /* * Utensils */ @@ -178,21 +182,7 @@ materials = list() origin_tech = "biotech=3;combat=2" attack_verb = list("shanked", "shivved") -/* - *cutter by Ume - */ - /obj/item/kitchen/cutter - name = "generic circular cutter" - desc = "A generic circular cutter for cookies and other things." - icon_state = "circular_cutter" - force = 5 - throwforce = 5 - throw_speed = 3 - throw_range = 3 - sharp = 1 - w_class = WEIGHT_CLASS_SMALL - attack_verb = list("bashed", "slashed", "pricked", "thrashed") /* * Rolling Pins @@ -278,4 +268,20 @@ throw_speed = 3 throw_range = 3 w_class = WEIGHT_CLASS_SMALL - attack_verb = list("rolled", "cracked", "battered", "thrashed") \ No newline at end of file + attack_verb = list("rolled", "cracked", "battered", "thrashed") + + + +/// circular cutter by Ume + +/obj/item/kitchen/cutter + name = "generic circular cutter" + desc = "A generic circular cutter for cookies and other things." + icon = 'icons/obj/kitchen.dmi' + icon_state = "circular_cutter" + force = 5 + throwforce = 5 + throw_speed = 3 + throw_range = 3 + w_class = WEIGHT_CLASS_SMALL + attack_verb = list("bashed", "slashed", "pricked", "thrashed") \ No newline at end of file From a77ca7dd5c4d7f144560b262faf395ccf731c832 Mon Sep 17 00:00:00 2001 From: UmeFuu <35434208+UmeFuu@users.noreply.github.com> Date: Wed, 13 Feb 2019 00:22:16 -0300 Subject: [PATCH 10/20] Adds cutter to dinnerware vendor Adds two generic circular cutters to the dinnerware, one extra just in case some idiot loses the first one (probably I'll be that idiot) --- code/game/machinery/vending.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index f2c0ab216f2..fb780e5d550 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1232,7 +1232,8 @@ /obj/item/kitchen/mould/bear = 1, /obj/item/kitchen/mould/worm = 1, /obj/item/kitchen/mould/bean = 1, /obj/item/kitchen/mould/ball = 1, /obj/item/kitchen/mould/cane = 1, /obj/item/kitchen/mould/cash = 1, - /obj/item/kitchen/mould/coin = 1, /obj/item/kitchen/mould/loli = 1) + /obj/item/kitchen/mould/coin = 1, /obj/item/kitchen/mould/loli = 1, + /obj/item/kitchen/cutter = 2) contraband = list(/obj/item/kitchen/rollingpin = 2, /obj/item/kitchen/knife/butcher = 2) armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0) From 83c824b01c4e1f9cf8789060a347c696fb73bcb6 Mon Sep 17 00:00:00 2001 From: UmeFuu <35434208+UmeFuu@users.noreply.github.com> Date: Wed, 13 Feb 2019 17:32:03 -0300 Subject: [PATCH 11/20] Adds unbaked/chocochips sprite for new recipe There's now one unbaked_cookies and one unbaked_cookies_choco sprite --- icons/obj/food/food_ingredients.dmi | Bin 6120 -> 6235 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/food/food_ingredients.dmi b/icons/obj/food/food_ingredients.dmi index 861dbb7827929b199f6bc2b16b260fb442458f69..e57f4854b1f2643b62d0f0e6a671caf7edaab540 100644 GIT binary patch literal 6235 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 F{x4g=4io?Y literal 6120 zcmbVwbx<2l&~|VL1TRi;Eyb-A2=2v-6p9v?G!!WAQmi->cZZUc0>Rzgixe+XGz5y< z%kQ7>&u`v&XYRSX*?VT^Zf|#I@1nFdl|eunAOHXWsj4XGK8->D0T=tJ?~%3~c^amD z^xnBE*tl7_I=HwyKtBQiUfHpeW57^;0-Tdt|L7k%Vi%v!1?hTv{IFCZvmfl3-khI% z68G~KwXvP3t33ENf^$D(%vBlSfBF&dh4kYm(Qva)Ugbsoo7buJOntnHj z`|CD)Rk*)}-?VB|6~Ib)gc%`|&)NeRUf`iCil7+pgc z4wg~c+sY4EJj`XduCIoJxz!BQnE&DOq}q6r^uCmvD>PUNk2a~Sn|z^~RqQZrV#_X+ zVSRjd$S~t6;lMs*l2t5}=e9FCdS;fpn}fV;x?jD_FJLBt62@>S2g1+ zVrDNZ4|V}RcG@G{Z1<@xgN6qTBV9N{4B*?}-Hc@brGiw?JKgR$zddv6-0fStq3DNs ze)4Rv6s6Lx_;PaXC)A8}b-W))BJ%m%Z~LcBih#2lvL zz2~?;!9Pt>QWq;KdE|f22KiIaEy%WL1(y~lWxDZ(`3H6%&@dM2TIIO$Cc^INjwF=+ zEPK}-uW514yZeq(IwJgz9?0JYb@bTPoJPos1_{_#jXb8N5P3;L{SE zopRK~5g@wb*?3I5HuPD&R;z02!&{=Wsw3p|^1Crz5;i(Q7FFO^B{C{YFRygC-$jxA zoZ55W6T(Cop6*AqTvN~5cRmRJ>2r@m&z)Y(ZSZ4ud3AN?&Gqkf_+wwey|06jH~3%u z=1M)5s$DlFfsQSoRU;g~s5)h`tRsABkx<{R%SlVl8>6kotjAGc>X&zR@cYMf{U+-T z!_m1oBgDA{V6crO;9=cZV9S-CJP2yi6ozHjkguIhH;v1Li-~@vq=bugFL~eMIqiry zEh?jEG!%Al4kFl@#oT7Y)=-Dam@fhX-^JsIP^fc}(iXFh~Ty zb838pg(1_<6@(=`$vkH+AcExR<>AGumgR@zs-*v&4L*bx;g)UMFsPQCJzzVY#Wns7b? z<}TiRRAWzf_epV_$s_WCu2#}r5DE#C_FD69bgr$1WO}EV{$p$058%lq{3|VUvJl|@ zlCrQSMMgMe?t}GZuKzy?DYRH))4Zxv4OZzVlX4-N)ZYmhX1Ql4fXrLZBa-GR8HwZ8 z{}G(677#vPxIzbeZ_eNOjEG9aJ-0G2eJN63AI3uRaPG$Nrv?X^UPr)1g#NbrzNr-X z&9G#UCGQ!wDnByD$zl*KP7@v49_ev>O}A8&@y(4dKXAgMjz;9j)Zf0&5xXPVv^p)( z>Ct)K4fM%!7G9JMH7l6-s)Y8it6h45toO|RD^ab6Ix1ZK~`V!l43DV z$C~rNENIJ~2cT|SQEdk?t7#{%bGWZpM_ZnejqT1v#g0(S#O4&vF)>*mo~~eL+`Z{D35sbIoG&c*7MnzZt;X_3kk68&ovt{WQ#m;?VnAiq4yV+vu#uYrZ(<{G7Aga|35d8+fqWe$V3nJh<`r zbYfkiQK+KPEzRUP6z^07HygJ}5zq)712J=BDz$wJJOsfh-YG0~-2AlmIi^9@Kp$39E=NgS=$E4)$A6djw6Mtf@*JOw3uvmO)|CcF z4ce-(`@l8)|z1gahWutb{Nyiez z*I&Qw1E(qojS5eZ4P7}~6jB2f{|O~J1WGij1Z1ELhslTH3ekYs|5rFX;*d%eT3`s5{I17oFdhC1%Uk8B+Ce_^)ze zct<%~%Pr}eIC+biK$=nlR@vkIJGtxbtDiHL=td`GO||@%M$PP04Oj~;-bIt|tN&IT zsJ&?>h{hv?=k)|$GiDCP663k~rJ% za^D=Q4gh{$m9W!4HJ=>OB11plDv|AP*32l{cE7o>wd9ha+s5*~+|Qn*1HTA%SFmG8 ztdK8jBpcuzH+Al4W1W!BQ!?Z!iFuAJC4WC4YI8(RQ(->HciARNNu>`ndG0RG9Flu- z>*erDEVw=xQNMmukb|hNL6#+B2O&fcc`57a6Q6eR9$@4Ls5d4H{0wST_BX5&8HMrY zx#aZvm#PV(lIJem2lWlnClM5x&uguG0f!f4?BY3f^_Eaa^ej-z3LykSjdWag$e&>7 z+$ACgV*PQbts4207ys`c$BL#I2RV=wh=sbwP@Pv#vlgM%J)m$M%EZ?S@L0h?;PjX7 zHUOMRf$Qj55N98nuTFr7c_Lyl*+LSFI%-WtGeZjVRYPf&lJ|p@2%Hb>>4MIPbiAL8 z6=-y3fvvRZE81H6Hrt#m8W*S67<&2!f-MEo(%63`er3595PDv`X_Q0@-rqiq#s z4pWTd#;ZLIEDq9_bH=$u8w~zuTf4m!i~>?{$s2p0z2pR8!XN9ES*+f@#{kkt@@+4u zqsZbe(fY{^s%Zt~uZb8tKQK$s1ObN7OJ7I6*1s~r4$J%{|J#_uqlLa~Ms?=K`7-?@ zTBZx4-V!Gp0-2mmLBaY#m_s2)E3G>2Im9(EgkVVyyXfVf61q)rzmQz>77J-)OK9mi zC`jnx-hCQPSXgAJDf!KDaxOlVO_=ZvN<+R=@DDYU{wZ_o*Q#fP5L-Qk6X9u~^Nuwu zf7Y_y=t|cfw#%tEDW{S6mFI9nYCprHcqUwuOqGJr>{AyO^)}dwK${gz4#(kiiN^ll z!_~*>-N^-3UQ~Lj7Zu4vr&K;G zzUp$JQcbdlA{E>Q-U>b7NTh!0O6zuvF{(iPKJjGOjoip9n-e(h@LVjP*|7tQqsEx2 z>j7O69lUkMAc;`f>l$ynDWr#$P^Na3K7qTZn=tu^P~C%4f!Xa=-A%A-5W1?I?i={6 zqs<1TVJ^=+Y?c2OY0AznD7&OAa9X5a2t!2oFB$)He8woS>9ToAz*HepKK{N7tk_29 z%`rMF)V)6Hck)0R!_oyms$r+-q0$F)5%uN zxQ^dZ5L-+ioWv5$2#9N(Q^F!h_+Uhr7O(z^N&jW&bQUhut#~RtlO+DgzYwJUgaXy5 z?{tslDa_qSd@a6MXjcXCpBB+7I8@|R4!f!mVDlKfSb;E{?nJQsJ=)H0`zyH&?+ELW zQqU_YY=%)J8z|fPa^UaG*0juN+26;am+Qd&U6%*aavX#k178r!xu=+9H2mVz@iV$o zKzW{jsine@bak6`6jiCmrxYA1^gS@;z1uO(MjrOg-$)-J+vBDz0433a zIbXm>ep%PgD8^eno^>1aDW7LKKwgLRNX=G%$^MG-+_+89;nsJaFL!9ftH|=C#6@{1 zmCG{?biCHAhm8TuF>rK;Mj^6z$C~i0Q9TSz=#1==UrE8w`lZTc7#SC3$B}_MTI8ZSvwZFhnuJbcGW-^sg7&99%hwzOz z7gGbrZm9;jdHrq!YUfc8#Zh(7KP1e5k_?a1txBwn=}>?~MU7YU@v~NN3T08FZn^4> z7aA@xjA0KnO0m&h^AD8j=RA_U960e8#Dv%tRj}gPvNV%X>?c#`-u>tmI(ALg8K@o* ze&vKmW5S2`*@%nA7q17RoDkNij{B)&$#KeYSdDs5T&-nq+RH3f9-hL|ivz4i$k_-o zvqmM%h&bjr50zZ;4^hb!Xe(gosBUoUEx7>@GYlNuAGCaN~$I{rm(_w!amY<8!SEwUe0XFv^7 zzzDuo;4fChO<>hi!iZgcx#2NWa*ABwDVzen@up^`=~`P=wOgb-V+lAoFp42c4hwk- z0X;(B2-FSwI}KZpqs5p?SVk>xb9!c#;oGHKrhOLV%pB6fLmq=7l%kO2I|W(bnrCD{ z+UtCssskaZ^|#(Ll+VwN0*1WqS-c|Lyf}WcDk^Z|PT@8$(G=>03v3bvVCcl= zT@)TW6x~DNQguWqALS*K}Vx!DkbgWx0YSx!HcAesz z9HXdO5(Zu2poj6YF{E@IH>0$8zQF#upZkLe^9HeIe8dIJtZvQUaS7A+frdAjj-s^3 zC%k0p>@?*QrE2w}OdFD;@DXesfl%;a)E zoRAS$p|S-A71Fs5J2SCL6C*5gxc(n9i&G*onY|=h?JFHouR;kJ=u53vhvpPm3mt*? zI`;bqxc@FlP}iYJYS-b}&zyUyX-~G_`3D~r@Kj;4V81CR~l?^_==@Xj% zFF>!`QS#XkZV*~MSCNCopUD?;HZ}QNd{VC>lUWm3nORt5hzf$A`wg@z^c4NkW~RYn z(k`DKIQK@Rqp_BdhAa7>N@|IR3_B{l zHBjqChL+3ZGagbiOK$aRgYg5QU|@LIup`qX()z>#Y+Oa-UlC`oFsb8eW5Ar_^NlZU zvxh(!u*FBd{MXwk^6mI3mmW8{4?Sanw%U~`T6YhcyNAe4voZSpefdA16kDP8IKs)) ze1QWUd)982fDr$Cj(#js;uwZvr)c*HR9Vkg;m*A+y|)DP=cK4`E>peWb_B)lu_pO2 zZnGd+ZVw@ko0?8}DklhAj{=`5o!%kXfTmB=6o^h z-bR&Lyufb`nOX-QcOt3Sw_?LE2*tRoLr#8ZJwxFrjbXE@M#uA&;wxfU2g$JrEdP;z z&r&eUiFeD48Nn=#*mx1%>ThWDR(~LBPhTIwy8qXwBq8Ym$0+=5Fz|>)}Ih&D` zr&XDXd3jbjFMDy(zFIRTfxt@jRQj3rs7zjAA2W&@BN5`*O|XX~`vbMi6u^NP6fT3y zx}9-WoAXLJ$!_Uon)-v46sBotVb3>Hcc_F89Y%3ihRchE3UUyCAJ2P)v)UP-2O5^< z6yX04r9_#r)z4PE!vwsI9DJ73*4`!Zh;5&T>)qPn$0a9t&aaI>b-cjTz8{7n@kTq6 ztH7;s+|0Ivu5ZG4Wr{ZuhAO!O1HFhvi7xI zhOt%1i`$zq?^{c*2oEFqkcUw#i5WxjQf6j9Pefw^l3phLIql`0rKTY))`!K?ibX4I zG&nCN={%&F`8eF2J!wnMv{0gA%(xmlp^ z%uZ|f%WgOGW>nK+6Gk!LLW1hBgUO;UD1 za(H4?2_uo-vz9Y9OXX(7fbLgyO3!WCrcXNwER1ElA zK%-7~4MuoY+*Ot+gfxbdFD|fQ(fPa2mdjnbgfF(y`JiP`-3$aT-pjnzOW=uzIOnSadJ*ke0o1+R>T z7YVaJ9>fm191b+lezyvn=sVofU@f6w6di!ZU49lk)#KN>Ga(j3>x^1d{%}N8Hc8JK zcem|ttNSevRv8!A?*CS+e{Uu=g}_BOAsH?IW9K2+j;IZNTd>b4J@utx1E0@VqZVjzTR7w zN;L{HnXy5Yy+4ZB1c!aK{L>%%VX9EEs2Tk!)$;y4AtnpFJYJdMB{vb4Ar*xzvF?oL z;PVgTW~`t4pox2(te2OX+g5_KTZK6Bstl@={-fLlfMY0L4m+B+cp{a`X4swuN@xpr ziVud^_{t7?&7)~hMq{Uk?FA@mA;{r)Jpb?I@W9}kdOwwAb71=Pbq`Qg)Kq}US%mx# DLua+E From 2ca07fe8032073c2e2b97d7bad97a240098d05d3 Mon Sep 17 00:00:00 2001 From: UmeFuu <35434208+UmeFuu@users.noreply.github.com> Date: Wed, 13 Feb 2019 17:34:36 -0300 Subject: [PATCH 12/20] Fixes code for the cookie dough Less code, more convenient. Also now you can cut a chocolate bar into chocolate crumbles. --- .../food_and_drinks/food/foods/ingredients.dm | 68 ++++++++++++++----- 1 file changed, 51 insertions(+), 17 deletions(-) diff --git a/code/modules/food_and_drinks/food/foods/ingredients.dm b/code/modules/food_and_drinks/food/foods/ingredients.dm index 94d4f8a3dbd..131b301702e 100644 --- a/code/modules/food_and_drinks/food/foods/ingredients.dm +++ b/code/modules/food_and_drinks/food/foods/ingredients.dm @@ -132,32 +132,32 @@ ///cookies by Ume /obj/item/reagent_containers/food/snacks/cookiedough + var/flat = FALSE name = "cookie dough" + icon = 'icons/obj/food/food_ingredients.dmi' desc = "The base for tasty cookies." icon_state = "cookiedough" list_reagents = list("nutriment" = 5, "sugar" = 5) -// Dough + rolling pin = flat cookie dough +/obj/item/reagent_containers/food/snacks/cookiedough/update_icon() + if(flat) + icon_state = "cookiedough_flat" + name = "flat cookie 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)) + if(istype(I, /obj/item/kitchen/rollingpin) && !flat) if(isturf(loc)) - new /obj/item/reagent_containers/food/snacks/cookiedough_flat(loc) to_chat(user, "You flatten [src].") - qdel(src) + flat = TRUE + update_icon() else to_chat(user, "You need to put [src] on a surface to roll it out!") - else - ..() - -/obj/item/reagent_containers/food/snacks/cookiedough_flat - name = "flat cookie dough" - desc = "The base for tasty cookies." - icon_state = "cookiedough_flat" - list_reagents = list("nutriment" = 5, "sugar" = 5) - -//Flat cookie dough + circular cutter = Raw cookies -/obj/item/reagent_containers/food/snacks/cookiedough_flat/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/kitchen/cutter)) + else if (istype(I, /obj/item/kitchen/cutter) && flat) if(isturf(loc)) new /obj/item/reagent_containers/food/snacks/rawcookies(loc) to_chat(user, "You cut [src] into cookies.") @@ -167,12 +167,33 @@ else ..() -/obj/item/reagent_containers/food/snacks/rawcookies + +/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, "You sprinkle [I] all over the cookies.") + qdel(src) + qdel(I) + else + to_chat(user, "You need to put [src] on a surface to add this") + else + ..() + +/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 // ////////////////////// @@ -184,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, "You cut [src] into little crumbles.") + qdel(src) + else + to_chat(user, "You need to put [src] on a surface to cut it out!") + else + ..() + + /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." From 9e1833530de2d61b4d6619827ae8b7c753aa488f Mon Sep 17 00:00:00 2001 From: UmeFuu <35434208+UmeFuu@users.noreply.github.com> Date: Wed, 13 Feb 2019 17:36:23 -0300 Subject: [PATCH 13/20] Fixes path and recipes for cookies Now the recipe is different again. --- code/modules/food_and_drinks/recipes/recipes_oven.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/recipes_oven.dm b/code/modules/food_and_drinks/recipes/recipes_oven.dm index e9b560ace7d..60b2c2184f7 100644 --- a/code/modules/food_and_drinks/recipes/recipes_oven.dm +++ b/code/modules/food_and_drinks/recipes/recipes_oven.dm @@ -167,8 +167,7 @@ /datum/recipe/oven/cookies items = list( - /obj/item/reagent_containers/food/snacks/rawcookies, - /obj/item/reagent_containers/food/snacks/chocolatebar, + /obj/item/reagent_containers/food/snacks/rawcookies/chocochips, ) result = /obj/item/storage/bag/tray/cookies_tray @@ -176,7 +175,8 @@ items = list( /obj/item/reagent_containers/food/snacks/rawcookies, ) - result = /obj/item/storage/bag/tray/sugarcookies_tray + result = /obj/item/storage/bag/tray/cookies_tray/sugarcookie +/// result = /obj/item/storage/bag/tray/sugarcookies_tray //// From c72a623ec604840a1a1cd53f757c9d14084ce428 Mon Sep 17 00:00:00 2001 From: UmeFuu <35434208+UmeFuu@users.noreply.github.com> Date: Wed, 13 Feb 2019 17:37:54 -0300 Subject: [PATCH 14/20] Fixes cookie tray code Makes it kinda shorter, more flexible for future variations of cookies. --- code/game/objects/items/weapons/storage/bags.dm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 3ab3434fad7..085d5d0c9da 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -460,20 +460,28 @@ return ..() +/obj/item/storage/bag/tray/cookies_tray/ + var/cookie = /obj/item/reagent_containers/food/snacks/cookie + /obj/item/storage/bag/tray/cookies_tray/New() /// By Azule Utama, thank you a lot! ..() for(var/i in 1 to 6) - var/obj/item/C = new /obj/item/reagent_containers/food/snacks/cookie(src) + var/obj/item/C = new cookie(src) handle_item_insertion(C) // Done this way so the tray actually has the cookies visible when spawned rebuild_overlays() - +/* /obj/item/storage/bag/tray/sugarcookies_tray/New() /// By Azule Utama, thank you a lot! ..() for(var/i in 1 to 6) var/obj/item/C = new /obj/item/reagent_containers/food/snacks/sugarcookie(src) handle_item_insertion(C) // Done this way so the tray actually has the cookies visible when spawned rebuild_overlays() +*/ +/obj/item/storage/bag/tray/cookies_tray/sugarcookie + cookie = /obj/item/reagent_containers/food/snacks/sugarcookie +//obj/item/storage/bag/tray/cookies_tray/cookie +/// cookie = /obj/item/reagent_containers/food/snacks/cookie(src) /* * Chemistry bag */ From 75f49c435cec80b72cd1e59aba9ae3a786976dff Mon Sep 17 00:00:00 2001 From: UmeFuu <35434208+UmeFuu@users.noreply.github.com> Date: Wed, 13 Feb 2019 21:34:36 -0300 Subject: [PATCH 15/20] Fix typo --- code/game/objects/items/weapons/storage/bags.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 085d5d0c9da..f7025c04e2c 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -460,7 +460,7 @@ return ..() -/obj/item/storage/bag/tray/cookies_tray/ +/obj/item/storage/bag/tray/cookies_tray var/cookie = /obj/item/reagent_containers/food/snacks/cookie /obj/item/storage/bag/tray/cookies_tray/New() /// By Azule Utama, thank you a lot! From 106a9183686f94fb663249dc72ac157ad164e5d4 Mon Sep 17 00:00:00 2001 From: UmeFuu <35434208+UmeFuu@users.noreply.github.com> Date: Wed, 13 Feb 2019 21:37:04 -0300 Subject: [PATCH 16/20] Fix typo and adds return Not sure why is needed but just in case --- .../food_and_drinks/food/foods/ingredients.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/food_and_drinks/food/foods/ingredients.dm b/code/modules/food_and_drinks/food/foods/ingredients.dm index 131b301702e..d9f6ddd2390 100644 --- a/code/modules/food_and_drinks/food/foods/ingredients.dm +++ b/code/modules/food_and_drinks/food/foods/ingredients.dm @@ -133,7 +133,7 @@ /obj/item/reagent_containers/food/snacks/cookiedough var/flat = FALSE - name = "cookie dough" + name = "pastry dough" icon = 'icons/obj/food/food_ingredients.dmi' desc = "The base for tasty cookies." icon_state = "cookiedough" @@ -142,7 +142,7 @@ /obj/item/reagent_containers/food/snacks/cookiedough/update_icon() if(flat) icon_state = "cookiedough_flat" - name = "flat cookie dough" + name = "flat pastry dough" else icon_state = "cookiedough" @@ -165,10 +165,10 @@ else to_chat(user, "You need to put [src] on a surface to cut it out!") else - ..() + return..() -/obj/item/reagent_containers/food/snacks/rawcookies/ +/obj/item/reagent_containers/food/snacks/rawcookies name = "raw cookies" desc = "Ready for oven!" icon = 'icons/obj/food/food_ingredients.dmi' @@ -185,7 +185,7 @@ else to_chat(user, "You need to put [src] on a surface to add this") else - ..() + return..() /obj/item/reagent_containers/food/snacks/rawcookies/chocochips name = "raw cookies" @@ -215,7 +215,7 @@ else to_chat(user, "You need to put [src] on a surface to cut it out!") else - ..() + return..() /obj/item/reagent_containers/food/snacks/choc_pile //for reagent chocolate being spilled on turfs From 923e372926a44cdf2ff944bc821d0e1529579705 Mon Sep 17 00:00:00 2001 From: UmeFuu <35434208+UmeFuu@users.noreply.github.com> Date: Mon, 25 Feb 2019 21:55:52 -0300 Subject: [PATCH 17/20] Deletes leftover code --- code/game/objects/items/weapons/storage/bags.dm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index f7025c04e2c..8b176dbfabd 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -469,19 +469,10 @@ var/obj/item/C = new cookie(src) handle_item_insertion(C) // Done this way so the tray actually has the cookies visible when spawned rebuild_overlays() -/* -/obj/item/storage/bag/tray/sugarcookies_tray/New() /// By Azule Utama, thank you a lot! - ..() - for(var/i in 1 to 6) - var/obj/item/C = new /obj/item/reagent_containers/food/snacks/sugarcookie(src) - handle_item_insertion(C) // Done this way so the tray actually has the cookies visible when spawned - rebuild_overlays() -*/ + /obj/item/storage/bag/tray/cookies_tray/sugarcookie cookie = /obj/item/reagent_containers/food/snacks/sugarcookie -//obj/item/storage/bag/tray/cookies_tray/cookie -/// cookie = /obj/item/reagent_containers/food/snacks/cookie(src) /* * Chemistry bag */ From 07b1b319e85aead58a115e452d69749b83448da6 Mon Sep 17 00:00:00 2001 From: UmeFuu <35434208+UmeFuu@users.noreply.github.com> Date: Mon, 25 Feb 2019 21:57:39 -0300 Subject: [PATCH 18/20] Adds/del some spacings where needed --- code/modules/food_and_drinks/food/foods/ingredients.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/food_and_drinks/food/foods/ingredients.dm b/code/modules/food_and_drinks/food/foods/ingredients.dm index d9f6ddd2390..7dda7c0a1c0 100644 --- a/code/modules/food_and_drinks/food/foods/ingredients.dm +++ b/code/modules/food_and_drinks/food/foods/ingredients.dm @@ -157,7 +157,7 @@ update_icon() else to_chat(user, "You need to put [src] on a surface to roll it out!") - else if (istype(I, /obj/item/kitchen/cutter) && flat) + else if(istype(I, /obj/item/kitchen/cutter) && flat) if(isturf(loc)) new /obj/item/reagent_containers/food/snacks/rawcookies(loc) to_chat(user, "You cut [src] into cookies.") @@ -165,7 +165,7 @@ else to_chat(user, "You need to put [src] on a surface to cut it out!") else - return..() + return ..() /obj/item/reagent_containers/food/snacks/rawcookies @@ -185,7 +185,7 @@ else to_chat(user, "You need to put [src] on a surface to add this") else - return..() + return ..() /obj/item/reagent_containers/food/snacks/rawcookies/chocochips name = "raw cookies" @@ -215,7 +215,7 @@ else to_chat(user, "You need to put [src] on a surface to cut it out!") else - return..() + return ..() /obj/item/reagent_containers/food/snacks/choc_pile //for reagent chocolate being spilled on turfs From de86d562852f79bfe4a26f42dc140c6c411ff310 Mon Sep 17 00:00:00 2001 From: UmeFuu <35434208+UmeFuu@users.noreply.github.com> Date: Mon, 25 Feb 2019 21:58:46 -0300 Subject: [PATCH 19/20] Deletes leftover code --- code/modules/food_and_drinks/recipes/recipes_oven.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/recipes/recipes_oven.dm b/code/modules/food_and_drinks/recipes/recipes_oven.dm index 60b2c2184f7..0a6072e51a9 100644 --- a/code/modules/food_and_drinks/recipes/recipes_oven.dm +++ b/code/modules/food_and_drinks/recipes/recipes_oven.dm @@ -176,7 +176,7 @@ /obj/item/reagent_containers/food/snacks/rawcookies, ) result = /obj/item/storage/bag/tray/cookies_tray/sugarcookie -/// result = /obj/item/storage/bag/tray/sugarcookies_tray + //// From 51a33bba08901ac3486add8b98b15cefb1296c1f Mon Sep 17 00:00:00 2001 From: UmeFuu <35434208+UmeFuu@users.noreply.github.com> Date: Mon, 25 Feb 2019 22:16:38 -0300 Subject: [PATCH 20/20] Changes some code From "for(var/i = 1, i <= created_volume, i++)" to "the for(var/i in 1 to created_volume)" on lines 102 & 117 in order to make it more understandable --- code/modules/reagents/chemistry/recipes/food.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/recipes/food.dm b/code/modules/reagents/chemistry/recipes/food.dm index cc399adb169..ec732bba858 100644 --- a/code/modules/reagents/chemistry/recipes/food.dm +++ b/code/modules/reagents/chemistry/recipes/food.dm @@ -99,7 +99,7 @@ /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 @@ -114,7 +114,7 @@ /datum/chemical_reaction/cookiedough/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/cookiedough(location)