From 72089206545aaa1536171fdf88ea01b8b52f9e65 Mon Sep 17 00:00:00 2001 From: Alphas00 <154434082+Alphas00@users.noreply.github.com> Date: Sat, 29 Jun 2024 19:46:20 +0200 Subject: [PATCH] Adipolipus Added adipolipus, a xenoplant that can produce lipoifier. This can only be found through xenoarchaeology, by analyzing flora fossils. The fruits behave like coconuts, they can be cut open to drink from the fruit directly --- .../code/modules/hydroponics/lipoplant.dm | 31 ++++++++++-------- .../icons/obj/hydroponics/lipo_growing.dmi | Bin 0 -> 981 bytes .../icons/obj/hydroponics/lipo_harvest.dmi | Bin 0 -> 649 bytes .../icons/obj/hydroponics/lipo_seeds.dmi | Bin 0 -> 357 bytes code/modules/research/xenoarch/artifact.dm | 1 + 5 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 GainStation13/icons/obj/hydroponics/lipo_growing.dmi create mode 100644 GainStation13/icons/obj/hydroponics/lipo_harvest.dmi create mode 100644 GainStation13/icons/obj/hydroponics/lipo_seeds.dmi diff --git a/GainStation13/code/modules/hydroponics/lipoplant.dm b/GainStation13/code/modules/hydroponics/lipoplant.dm index e31d06b7..e321f7a2 100644 --- a/GainStation13/code/modules/hydroponics/lipoplant.dm +++ b/GainStation13/code/modules/hydroponics/lipoplant.dm @@ -1,7 +1,8 @@ -/*/obj/item/seeds/lipoplant +/obj/item/seeds/lipoplant name = "pack of adipolipus" desc = "These seeds grow into a foreign plant." - icon_state = "seed-fat" + icon = 'GainStation13/icons/obj/hydroponics/lipo_seeds.dmi' + icon_state = "lipo_seed" species = "adipolipus" plantname = "Adipolipus" product = /obj/item/reagent_containers/food/snacks/grown/lipofruit @@ -10,18 +11,19 @@ maturation = 8 production = 5 yield = 1 - growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' - icon_grow = "fat-grow" // Uses one growth icons set for all the subtypes - icon_dead = "fat-dead" // Same for the dead icon + growing_icon = 'GainStation13/icons/obj/hydroponics/lipo_growing.dmi' + icon_grow = "lipo-grow" // Uses one growth icons set for all the subtypes + icon_dead = "lipo-dead" // Same for the dead icon + icon_harvest = "lipo-harvest" reagents_add = list(/datum/reagent/consumable/lipoifier = 0.05) /obj/item/reagent_containers/food/snacks/grown/lipofruit seed = /obj/item/seeds/lipoplant name = "lipofruit" desc = "A foreign fruit with an hard shell. Perhaps something sharp could open it?" - icon = 'icons/obj/hydroponics/harvest.dmi' - icon_state = "lipofruit" - item_state = "lipofruit" + icon = 'GainStation13/icons/obj/hydroponics/lipo_harvest.dmi' + icon_state = "lipo_nut" + item_state = "lipo_nut" possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50) spillable = FALSE resistance_flags = ACID_PROOF @@ -33,6 +35,7 @@ attack_verb = list("klonked", "donked", "bonked") distill_reagent = "creme_de_coconut" var/opened = FALSE + sharpness = IS_BLUNT /obj/item/reagent_containers/food/snacks/grown/lipofruit/attackby(obj/item/W, mob/user, params) if(!opened && W.sharpness) @@ -41,7 +44,7 @@ spillable = TRUE reagent_flags = OPENCONTAINER ENABLE_BITFIELD(reagents.reagents_holder_flags, OPENCONTAINER) - icon_state = "lipofruit_opened" + icon_state = "lipo_nutcut_full" desc = "A foreign fruit with an hard shell, the liquid inside looks very inviting." playsound(user, W.hitsound, 50, 1, -1) return @@ -86,8 +89,8 @@ reagents.reaction(M, INGEST, fraction) addtimer(CALLBACK(reagents, TYPE_PROC_REF(/datum/reagents, trans_to), M, 5), 5) playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1) - if(!reagents || !reagents.total_volume) - icon_state = "lipofruit_empty" + if(!reagents || reagents.total_volume) + icon_state = "lipo_nutcut_empty" desc = "A foreign fruit with an hard shell." /obj/item/reagent_containers/food/snacks/grown/lipofruit/afterattack(obj/target, mob/user, proximity) @@ -118,7 +121,7 @@ "You splash the contents of [src] onto [target].") reagents.reaction(target, TOUCH) reagents.clear_reagents() - if(reagents && reagents.total_volume) - icon_state = "lipofruit_opened" + if(reagents && reagents.total_volume && opened) + icon_state = "lipo_nutcut_full" desc = "A foreign fruit with an hard shell, the liquid inside looks very inviting." -*/ + diff --git a/GainStation13/icons/obj/hydroponics/lipo_growing.dmi b/GainStation13/icons/obj/hydroponics/lipo_growing.dmi new file mode 100644 index 0000000000000000000000000000000000000000..53786034473339c88fb2f4aec9f88891200d0129 GIT binary patch literal 981 zcmV;`11kK9P)G8(C9|j)C}_yVnO2mTn+joLDm5ZrsWI_N zO^8=&O1x4t;*@427L}zImk_5oB{eYxmr7*?S3ehUOaK5E(Q}{K=sWNL00NasL_t(& zf$f=#ZtEZrL}L>$R4#TB+j;!|hu&Sl@dJ`Iby0g&MwJp})^qTq%FrGTSy_KhMVUCC z9n%t00}95DI|=Wv@qWPjO91%**h3&zxCOB55^MnMy96{~=L$&xF~CQk2VFk-JUBrC zxEOsAIG$J4nq_O5BZfCj|V`Iz+s{&!4H}cpcMK_`76YH@a^&F zhX^pFB*9dUfM{+27qo`0G!WSpU(hj+bDtsG_1a0 z{-tKk8i4r*fHHu1LV>4n0pST0ettI+Fu#i?lqCXK4PppbJfxVfJ97>wr0G}!6xXI{ z>>dK%6pMZjX}a%PN5I#v*Kq)a-Mx9Lkc)ng59VMAR$V{DJ*?c;`&s_-FZkEnZI}@t zf4JSQQTdkOBv<_&@&Nz@C&&jt1mU@Xu=@jV12F>bPVoR+?`QpfxkI>u9*@4i4@URC ze?0KB&45wT=7;}>1L`fHj}D#)MlbE&>Fa>3tY4{rl7%$6purpPQ%!1DP-Id}XI4*aT2uOI0QF-4 z@Ld2H0sZ0t0004WQchCV=-0C=2JR&a84_w-Y6 z@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DJQcaKR&Ot zM2U+tC9|j)C}haRnO2mTn+joLC`>LbiBBud$stKYYHmSEB`zJx3a)-GV8;Uh1Km2k zNb?uq0003zNklOR%l!X0+6kIMvkttdmGesOsfKiM ziz4$+LBOtfS(e)cI=)@-8Q&^E2;)5hL}*kH`o4&f>VQLe2y?*WK#bLt3co<7ZvgGE z9ye{*_eXMzeFBKz89-qR+JW7l=mT~OApf|+GC;oV#-5z?2(AGn=T8RCr9;rN2}Tgu zBao6Cr2KhC3!bN*kb_S!&(dH|sRd`oUTP{{op%6&xvDB51jeq{Tt?{BMK}coG6HRI z-2yNS@Etu{G=CexwFqhiHr2$lt7t87ooSR}90R+Kz68EAjlvgS6bqp*7iAWdWaj5FFjUM54l5`s{r)Am;N#aPTHd-^=gyoD z-VkbV(fGk5o%24LCmD)*dUseD2N_>B_EMPhXws2MAqv5o>YEkp_gR>lx^{LOt8QK) zp^m@jbZn9>HP^kO8h{J<2+p)Lo9mVUa%BuP!MnloU+zY zWcu&>p-cz0vfs2!v46NH!C~da<(YZP@3(F|pAooY+xBCB8=~YtFfcoC@ch^j(6A+M zX7k?;1$U*TpOY5ciMV&+BY&ubq{er(ckWxHkA$;$Y3xaT4z!8E)78&qol`;+0Bw_s A;Q#;t literal 0 HcmV?d00001 diff --git a/code/modules/research/xenoarch/artifact.dm b/code/modules/research/xenoarch/artifact.dm index 67254426..cfad6178 100644 --- a/code/modules/research/xenoarch/artifact.dm +++ b/code/modules/research/xenoarch/artifact.dm @@ -91,6 +91,7 @@ /obj/item/seeds/gatfruit, /obj/item/seeds/kudzu, /obj/item/seeds/firelemon, + /obj/item/seeds/lipoplant, //GS13 /obj/item/seeds/random ))