From 95edaac47c181e3515cdbdc2546a83fa553bc015 Mon Sep 17 00:00:00 2001 From: Ketrai Date: Fri, 31 May 2019 17:17:29 +0200 Subject: [PATCH] Adds monkfish ITS HOOG --- code/datums/supplypacks/hydroponics_vr.dm | 3 +- code/game/objects/items/trash_vr.dm | 7 +++- code/modules/food/food/snacks_vr.dm | 40 ++++++++++++++++++++++ code/modules/food/recipes_microwave_vr.dm | 7 ++++ icons/obj/food48x48_vr.dmi | Bin 0 -> 826 bytes icons/obj/food_vr.dmi | Bin 21570 -> 22163 bytes icons/obj/trash_vr.dmi | Bin 428 -> 587 bytes 7 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 icons/obj/food48x48_vr.dmi diff --git a/code/datums/supplypacks/hydroponics_vr.dm b/code/datums/supplypacks/hydroponics_vr.dm index c3781f6e68..c4003097a7 100644 --- a/code/datums/supplypacks/hydroponics_vr.dm +++ b/code/datums/supplypacks/hydroponics_vr.dm @@ -43,7 +43,8 @@ name = "Fish supply crate" contains = list( /obj/item/weapon/reagent_containers/food/snacks/lobster = 6, - /obj/item/weapon/reagent_containers/food/snacks/cuttlefish = 8 + /obj/item/weapon/reagent_containers/food/snacks/cuttlefish = 8, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/monkfish = 1 ) cost = 20 containertype = /obj/structure/closet/crate/freezer diff --git a/code/game/objects/items/trash_vr.dm b/code/game/objects/items/trash_vr.dm index a738179c7f..43cadda3f7 100644 --- a/code/game/objects/items/trash_vr.dm +++ b/code/game/objects/items/trash_vr.dm @@ -29,4 +29,9 @@ /obj/item/trash/liquidprotein name = "\improper \"LiquidProtein\" ration" icon = 'icons/obj/trash_vr.dmi' - icon_state = "liquidprotein" \ No newline at end of file + icon_state = "liquidprotein" + +/obj/item/trash/fancyplate + name = "dirty fancy plate" + icon = 'icons/obj/trash_vr.dmi' + icon_state = "fancyplate" diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index 9698c57cf0..4a43346179 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -328,6 +328,46 @@ bitesize = 5 reagents.add_reagent("protein", 10) +/obj/item/weapon/reagent_containers/food/snacks/sliceable/monkfish + name = "extra large monkfish" + desc = "it's a huge monkfish. better clean it first, you can't possibly eat it like this." + icon = 'icons/obj/food48x48_vr.dmi' + icon_state = "monkfish_raw" + nutriment_amt = 30 + w_class = ITEMSIZE_HUGE //Is that a monkfish in your pocket, or are you just happy to see me? + slice_path = /obj/item/weapon/reagent_containers/food/snacks/monkfishfillet + slices_num = 6 + +/obj/item/weapon/reagent_containers/food/snacks/monkfishraw/Initialize() + ..() + bitesize = 0.5 + +/obj/item/weapon/reagent_containers/food/snacks/monkfishfillet + name = "monkfish fillet" + desc = "it's a fillet sliced from a monkfish." + icon = 'icons/obj/food_vr.dmi' + icon_state = "monkfish_fillet" + nutriment_amt = 0.5 + +/obj/item/weapon/reagent_containers/food/snacks/cuttlefishcooked/Initialize() + ..() + bitesize = 3 + reagents.add_reagent("protein", 1) + +/obj/item/weapon/reagent_containers/food/snacks/monkfishcooked + name = "seasoned monkfish" + desc = "a delicious slice of monkfish prepared with sweet chili and spring onion." + icon = 'icons/obj/food_vr.dmi' + icon_state = "monkfish_cooked" + nutriment_amt = 10 + nutriment_desc = list("fish" = 3, "oil" = 1, "sweet chili" = 3, "spring onion" = 2) + trash = /obj/item/trash/fancyplate + +/obj/item/weapon/reagent_containers/food/snacks/cuttlefishcooked/Initialize() + ..() + bitesize = 4 + reagents.add_reagent("protein", 5) + /obj/item/weapon/reagent_containers/food/snacks/monkeycube/sobakacube name = "sobaka cube" monkey_type = "Sobaka" diff --git a/code/modules/food/recipes_microwave_vr.dm b/code/modules/food/recipes_microwave_vr.dm index 8fbd170d7e..bc375d0d70 100644 --- a/code/modules/food/recipes_microwave_vr.dm +++ b/code/modules/food/recipes_microwave_vr.dm @@ -166,6 +166,13 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/cuttlefishcooked +/datum/recipe/monkfish + fruit = list("chili" = 1, "onion" = 1) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/monkfishfillet + ) + result = /obj/item/weapon/reagent_containers/food/snacks/monkfishcooked + /datum/recipe/margheritapizzacargo reagents = list() items = list( diff --git a/icons/obj/food48x48_vr.dmi b/icons/obj/food48x48_vr.dmi new file mode 100644 index 0000000000000000000000000000000000000000..91d4307b37392d33c05911a625d376835088151f GIT binary patch literal 826 zcmV-A1I7G_P)xvZmNJQ%rvigZ&gaZf78m7ubrmu^cYYeyr#hmmMR zAGLXdwx^zVaZRvtdu2czhk;xa5e$}*Yo}ywtZQ^tFc45J51&?Fqg`f3Ck?}zpdua` zMkoy%7Zbvcn3REYsG5q>&AH3OvBbQowyT*Fd9mpL0004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#aV)qv zGg33tGfE(w;*!LYR3K9+H$N{sEweZyz9_L=iHkEOv#1y-Y{51e6JfFV)>kXI8@QJUmiPKsqbnkD6L?sU0m--gtM&5X&lQs-`rIF^ zm#cFGNhK-#WDG$NMI%3eSW^i71%W?F$6v6HQBx8I*HdPGmjHs31R2;Dl=shoALt^1 z!X&r|!Y$x8696SCrA3-Lgjo2L9ty$;0aO1%NcE_G3gg62Pl)PEgTgSH1>m4%mPt0& z7^3I=Ss*Ba+~A^Q?spN{qb6&uNyWH88yIiyRFc{n}W+t1VD*6iwuvjX+{quwQW^xCDWTy zv1oG41k2PQ4DMYPhRtplO#BGY6z|oZe!aiv%`VRyQxM#)5m6S0kI|o(T|lLo_WKzA zp zS>QD`f63J32Py>Bv)`_(^n@tN+tyx1?bbirzx5yMH}w50!SJ`_^Z)<=07*qoM6N<$ Ef^$1;djJ3c literal 0 HcmV?d00001 diff --git a/icons/obj/food_vr.dmi b/icons/obj/food_vr.dmi index 7d07c18fbcb60157bbb49a72c19ec57ffca1e72b..d5c4dbeaf8b5f9e94b14deb790482aaac558d006 100644 GIT binary patch delta 5373 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 RG4*664Fbz+?R=4|3*<=|pvZ-<8V4W5?RZkNMD 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 ZC;59~cRZb}U_Ug}qbRE?Qz~T?@IU8qpVj~X diff --git a/icons/obj/trash_vr.dmi b/icons/obj/trash_vr.dmi index 6c9d7ea7d3cfe6902c31820dd419c19bedaee64e..17004c289db4d069e7168f4d05846c8dd397797a 100644 GIT binary patch delta 452 zcmV;#0XzPz1Iq*@iBL{Q4GJ0x0000DNk~Le0000$0000W2m=5B0F^_Iwg3PCU6Ca& zNKZpUZ(dt#TUc~rUU_C>a9l}tU`=ygOK@60ZdpBFP)~kpW^P(XY*jF2Qb7O>asU8; z7LK~J00001bW%=J06^y0W&i*Hevxiyf5TO$CFUhp7UTeVxRfd@xca$(T>=1{pek8N z3|6H8009z7L_t(YiS3d>a>F1DMJ*HzHf|^;Zr#NA{>SWx=@Ky=vdK)VExgB<&@lYh zixm+m#g|Jjt}?Fm*eM_eT&hPv0~xl{WUbZX++iSMwSMzFO*ft zeTas8&am!BogY#nn?He7{k$0bN^v{{9tn~y25AZ~9J`2v*GcQlH#R}WhqBBmotbZB uXce}398adk7=Ph73*F2Asadt+%w)T!+I~#i08T_WnPH}!{c>^f1*3-o?#G?1^gwsNY z4LF#UIga&T`T2i;Z^3%C>*uDte#dd4@XuWafs3EdY+y0d?qpDn*(_XeVC%N9?5&r~ z*%sKjEiR1RTVMA3r2FoU(CtjZH5KpIt&-jsSFq5zPnZ2?!MS;tAMn0gFhOFYLU`2_ zn