From ac03b1075d7897667f049b88b6b3017d30c89c87 Mon Sep 17 00:00:00 2001 From: SpoopyLizz Date: Sat, 10 Jun 2017 03:34:55 +0200 Subject: [PATCH 1/2] Added colored eggs and did some minor tweaks. --- .../vore/fluffstuff/custom_items_vr.dm | 28 ++++++++++++++---- icons/vore/roizeggs_temp.dmi | Bin 0 -> 2324 bytes 2 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 icons/vore/roizeggs_temp.dmi diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index f0c21ce237..d926159840 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -788,7 +788,25 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie /obj/item/weapon/reagent_containers/food/snacks/egg/roiz/New() ..() reagents.add_reagent("egg", 9) - bitesize = 4 + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/egg/roiz/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype( W, /obj/item/weapon/pen/crayon )) + var/obj/item/weapon/pen/crayon/C = W + var/clr = C.colourName + + if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow"))) + usr << "\blue The egg refuses to take on this color!" + return + + usr << "\blue You color \the [src] [clr]" + icon_state = "egg_roiz_[clr]" + desc = "It's a large lizard egg. It has been colored [clr]!" + if (clr == "rainbow") + var/number = rand(1,4) + icon_state = icon_state + num2text(number, 0) + else + ..() /obj/item/weapon/reagent_containers/food/snacks/friedegg/roiz name = "fried lizard egg" @@ -800,7 +818,7 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie /obj/item/weapon/reagent_containers/food/snacks/friedegg/roiz/New() ..() reagents.add_reagent("protein", 9) - bitesize = 4 + bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/boiledegg/roiz name = "boiled lizard egg" @@ -812,11 +830,11 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie /obj/item/weapon/reagent_containers/food/snacks/boiledegg/roiz/New() ..() reagents.add_reagent("protein", 6) - bitesize = 4 + bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/chocolateegg/roiz name = "chocolate lizard egg" - desc = "Such huge, sweet, fattening food." + desc = "Such huge, sweet, fattening food. You feel gluttonous just looking at it." icon = 'icons/vore/custom_items_vr.dmi' icon_state = "chocolateegg_roiz" filling_color = "#7D5F46" @@ -829,7 +847,7 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie reagents.add_reagent("sugar", 6) reagents.add_reagent("coco", 6) reagents.add_reagent("milk", 2) - bitesize = 6 + bitesize = 2 //PontifexMinimus: Lucius/Lucia Null /obj/item/weapon/fluff/dragor_dot diff --git a/icons/vore/roizeggs_temp.dmi b/icons/vore/roizeggs_temp.dmi new file mode 100644 index 0000000000000000000000000000000000000000..af18d5982bfe76c4b85561043e95b46107731a89 GIT binary patch literal 2324 zcmYk7dpy&98^?cNOiQ^{NKbb~g>2~{rJBm@(P8c~wW+FK?vNU0| z4mxfUcgZpBcB+}BcCd^{2ZyQT5c7Tb>v^u%>$0@U$577$=z+gp}}$k1VIdm z2V6X6J99Su(Ymws!_Cwf1kuTLKj^u)uC7kpioD9zmLl;>96nS_Lp-t!!BdL+RCa9Ej!f^>bNtG@kl&I*ED1s`N zE_z`ndrP)EC?ZG67$Um@8CgWJlckXb4{W7vMBBXrVvsakV9S;g1-`b@^F+=SEBU)X zD;y^oyYT^kJ9$i(y1EMC-CI!E=0Q&jCtSresf+~`pk&$ud&YjB2%IWI>mfF8f1av#m z6|#(-4Jw|3hG;OB3q%ffvLJHhAz0@JPuL0)iPExNupt<}V!+bVfPV`JHrYxK5xuN9 zoIv>lER2i-tP6l+V??!jy}SRsRNB*3c&KKmPhh9PLDhP2P%vD{h#!Ht)oyRCeGa<&809k6mXI zy5sYXSxoQ(mZE1UToeoL46dI>>Awm|45*K#lAkuEaD%pP^g$1$&4BF5DuqG)9{| zFxb+n=ZtEt<{+Q-*2m_|)wnr*e|k>e=WSmWz0UgwtG&swUTJp7x@-Qs>JttTBw?46 zx9OrPWrWduv={2aqi?DPodz$^b87c^O3?u?d>;;Hfpx{8GjHhL;B#0KD$c@s9|nE7 zST`_;!)o&0jCVt4>ge`ekWlC3WiTt7ylwpdos()faF?0Uj&(?O2iF5VLk##j4vqKZ zE1Xg2b?l<)5A!W;YNK`Lw`?lJ>x__aAdcC*uE=Qfq~0j7<{>zy`y#W(?+Z}A6~bwP zbL_6xO(vF>LhVzFOk|2)zf@e6B1ww+d1+{5f^c~`HtVB}Xr%Wp>*2-S}Z z{$gq|0^x!s_Rr@6Lb#6jN_+jv=wDad5SFrHkDmUC&NCNC z|6KRSS9)2lT(~3qR8}*}psS^_>X|bvu65h+a6>m%cDD-RoID&%9sGA?=B}(QAI}p~^VFX~PkeiTO{}AE~Jw zpmEpu$Jk(R>SD22lB?&DSXY#%7Y23G z%b%I=e%x(d{=E{mDaZ6lciGpxuX$~?6HDT2?me1Zj%FLT+$&7xH<3c#V61?EGqS zNksmYJ%;Z1-4G!-2d$ljy>(mZbV*Tt4>k0x#qy1K$Bk54z!cqiEg0)%S_lX;MZev zJTwaDyUq6L+3JT6ho%N(*JjL>1>)a^4D{lcmLZd!osN&UuAlg}kK#+Abdm~AZx1C* zJ?v~!4-bap!qigB?*0O|EXQ#Ced9^Hhk1I_s<-dozh4_06JI<|o=VAg8KwO>()qq{ zxNucZjF|z|R9k{iGgd`3pC7$N3a=$cBTI@z^BI~U&MG7>29Bua{aW=T4fUC%*4{M= zH$2;H_IY{Le$?o5^ORcWJ`L{|^Ww(be96EW0JNd!czx&K&YvLunf|&6&9eFA)p)KWh7&z^4t9!4;am Q*|&iZ_qw?}BKWiZ3*^dwv;Y7A literal 0 HcmV?d00001 From e3db32fd60525dc839ca8fc08f985985d1fe8e71 Mon Sep 17 00:00:00 2001 From: SpoopyLizz Date: Sun, 11 Jun 2017 02:51:29 +0200 Subject: [PATCH 2/2] hopefully fixed the problem this time --- code/modules/vore/fluffstuff/custom_items_vr.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index d926159840..31400a9708 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -796,10 +796,10 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie var/clr = C.colourName if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow"))) - usr << "\blue The egg refuses to take on this color!" + to_chat(user,"The egg refuses to take on this color!") return - usr << "\blue You color \the [src] [clr]" + to_chat(user,"You color \the [src] [clr]") icon_state = "egg_roiz_[clr]" desc = "It's a large lizard egg. It has been colored [clr]!" if (clr == "rainbow")