From 3789e82f7bd0b2009b64ab7f5f072749fef8f604 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 10 Jan 2014 00:26:23 +1030 Subject: [PATCH] Roasted diona, for ZomgPonies/Paradise. Conflicts: code/modules/reagents/reagent_containers/food/snacks.dm icons/obj/food.dmi --- code/modules/food/recipes_microwave.dm | 11 ++++++++++- .../reagent_containers/food/snacks.dm | 12 ++++++++++++ icons/obj/food.dmi | Bin 95835 -> 96545 bytes 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 886573d03a0..697b67ae5e7 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -33,6 +33,15 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/boiledegg +/datum/recipe/dionaroast + reagents = list("radium" = 5) + items = list( + /obj/item/weapon/diona_holder, + /obj/item/weapon/reagent_containers/food/snacks/grown/apple + ) + result = /obj/item/weapon/reagent_containers/food/snacks/dionaroast + + /* /datum/recipe/bananaphone reagents = list("psilocybin" = 5) //Trippin' balls, man. @@ -1236,4 +1245,4 @@ /obj/item/weapon/reagent_containers/food/snacks/tofu, /obj/item/weapon/reagent_containers/food/snacks/stuffing, ) - result = /obj/item/weapon/reagent_containers/food/snacks/tofurkey \ No newline at end of file + result = /obj/item/weapon/reagent_containers/food/snacks/tofurkey diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 8819f68d23c..0d23b0b588c 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -2602,6 +2602,7 @@ /obj/item/pizzabox/meat/New() pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza(src) boxtag = "Meatlover's Supreme" + ////////////////////////////////FOOD ADDITIONS//////////////////////////////////////////// /obj/item/weapon/reagent_containers/food/snacks/wrap @@ -2707,3 +2708,14 @@ ..() reagents.add_reagent("nutriment", 3) bitesize = 1 + +/obj/item/weapon/reagent_containers/food/snacks/dionaroast + name = "roast diona" + desc = "It's like an enormous, leathery carrot. With an eye." + icon_state = "dionaroast" + trash = /obj/item/trash/plate + New() + ..() + reagents.add_reagent("nutriment", 6) + reagents.add_reagent("radium", 2) + bitesize = 2 diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index c36e17d490d848793202b36c261d071c6f0d100e..bde7134bdd65da74445f898c6d6ba2f7559ec08f 100644 GIT binary patch delta 4105 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 delta 3390 zcmahrc|6mP`yxk0CW?@eyAZ-qwk$;MB7`PKC@kbEyyZS~-)GK*?JG1#tP&bI!W=ns zjfQ=;5wo$c&mX`4ey`W}`R93F&wad}=k>g$u+MC=r%9c-)F{ovA;gqT4+jnoh`D3A zh_1OKK^4Ub3hVQNohSQ2SnxO>Jm2w#Ch&35koMk&m> z*>u*0{pWe^-0hP;GC-QAl$X;$aGCs??UIcRx}-_4;fRT$whFE5C?6MEvooK!GBFzCK~ekkfYYQqEBma&C8;s8{9&pi@W@bq6>FS ztC41UU3>{1)}l8U7lW8|apS*964QRf3+7wf2+Iz-O|Uu-N!+-cZOW5P*8Msr1nj@J zDT435b{s?3;MTX+7D^3g8>x#P(KUvg1jc3Bd~}Ok=0~L6`yAS5?;n#=$ReyppGaGX zf~IezyoqlJQTB}@#)o`sArutx5j{7LQJxM7{N=P=(iLkV%q#KDf+ytMdytPkW7FAv zqTcS)(E-smr{|iO&_N7`&C!myx3_n_V@J+&%^z>wd2z5_KFSs^R>z4_rzQr#vfx#bY5mj%jSNE=}SZl)vSP$h4v^Z-}>^q4D=>wO})zlD7 zg(*cEL6Jpvft;6wCb$e|c)W+4Fh1#_xLgLV@LF`9(CK!e;*i`8FI&u;R}boin!EPb z3V#B%slWWDk6pOTX!x)FxY#UqHcmG5Xmh&BuH`AdY`3?!*K!zP0qX!Z($QxhG3kQl zio#nA{Edcc>#H?qA0m{Sg2t)Lkono_n#d?bl1vBIZJcVO?l884S&bqr9MIP+hl8lp z($2jqK2I;N83Tau+qW$ltI(q)(-etf=T9*>p&3G1iFoMkt@zU;OFK5aXB4hqVOecn zYIai$Y;h(Ao_QHu22@qCN7yPD*x6lV;o;#ytzut!IBgB}v}VDwVJ-P=PtOovOwKcp zl6A@gGpk#3m~nc6x4b!XG2|jbLkKhpsp@iP>O_Bo7BE`;Az`*w=MDe z>d2V~+0yVc;|xSa>Ubl`?k!g>vi;@e?>;Plm482kKT$T;94OQs@{}w|PH)?jz7s}# z8(EN+djsM7TvR|`q7av1R&y#Qu~F4dtu)cCK!7tzMe&T|9-q0?cUwC()9#vQmFMII ztR+BPPBR*H)eXYArfDFTsxpqs_V#w>QFp4&1OO1%1_l3c-tibfr6Fg+5Jw9$H0n`b z=}Xr(B25PdwEc7S(~gL{F6u+Zi^AT@T%Tnb`VeuK*$>B>6Irr`KmPLsjn~yGbKT+ zM=a2}J_v~+hQH2?T;Gl|>G;e2r=r(sak6rc-Ys@O zdy8tRjXzi(wCMg_)C&Bx2bzJ-t<|?ZNl}x47uk%6rZKLS>8Xa`mV3S|O7H%p=%ZnF z0L7(oDsPP!qeSDEWd6k0O}D!lGuQk0&7oRLv{kn;iz4k$^FE?<18rwOT#V$pOhJxj zZdSG|LtgYjT_zzD7L^>D=MItD9p>a68xo;?^y#nRt*RPG;@YI;%`>O_A6RF*ceNA) z4rFj}D#vSuUw%>7J3Tc$G75-Qoj$-7`tVCbAUNlswxt=v$wgQSy^xZ=?f9dnBX#V) zz~hC#-TSDk%OtT-4(tNVnSLie!D&iT+#Z75M&4Aa?NDP)2k#2iF&OXSW@s#KZf=Ja zVuIjUU#j5q@Nt)0b5(q4$09l{j8Y-yl8t?mOhwyb`x%V&xTXBKEuBPQ^15Kp9@dLi ziU~PFi}h7lU2iClZ|T4er*1Q4t%i5AY?>*>rPzMhtS=xp-<#ZCSk^@E`^k-fyTeB5Aa`tzPz97+kVru zqZZwT|BS{0@fX;-t^>o1!{FA;ah%yr&ZlHrs13$HI?pLqomF-A0H47)gDwTL;~-!k z0&mUngsw7sF5NJYhAoaMH^@By^L@%Y_=CEaJxwSvh(n8@c6a;Xqb`yP;}=immQJug z&*sZTBcEFP*Y5+Ds&arff-eePl$5R$Z(fL);?O)>`>^#lfMglAvLK8cG%ei2xSnbv z zF5kvT;WUXuR$=`N;P>u8e?Nz4V!jCpLFrQhh}EWPgG(*mpFR%qJ_>&Pjbh!C^uAVT z|7f-~zMyHJI3EApG0GeW(VO9`pU4P)yC zoY(WE+zwG?-i9?}p*z22US{1Zn1`|FKlmfqt333?13IcpJfqlr<@v+C=i7p&R_f#T zcAeO$J2UT$3APyzrkD?Tku4?5%Q`9_`q;dt7vdlD6ahCCzqxAEH#tGk+r4&jnOa~a z(Lh{k_=*T0h64MSr|eS5qy^x>;o*Nvz*e%O^_{FXTIw0e7?7_B>SRdf674Hi z4XKZv8+{b6vPDc1zxcX-v6WB)H0t@%T>9Sdyu(jSv}>^b#N*Y=E}V{$(T9GPEe%yI z`{*^TI!S?beqCzwNr_-=FMf_$yfCqW>SXRUygu`Ku2LSg3gP_#`gPB0l5&SiMM{~x zK=9$lO%ju|jVh}_3W@0-?^EJA~gT7`R2C4tD&| zrJmQ%7ogRc6$_6Y0zhkk7d7bS*YlJx)C#coovcf3QtD*p+Cwjm9m0N<0_ZgmWHc+c zSSG#xD|lVXJGhJ|5qj)`momO7;0a@0mG7KL8op(HNr_Q=BP z^x7*PB7RzNj_6NcV^c(or05sy>S}8xL=#44X3j+Tg-7cFmP*MH(UN>i2`5>ahF}QZ z{e0{D-R%KHu9K`b9j~JEEMfyJK5RP`_tk3@4~_?5!5ts}wBA3r+V zO|*JLqw_W^Pw>H$jcL7aaqT1V+%alm@K7y7w#(5%lS)WE)C)^Uw{j&Jv}CL&43hYk y8>w~yZlb`hs3#K*f^(^y``7yT!6p75J_7UXs_@_CYDKdggOR?O-bobPDe}L)>CN~6