From 435328bb9ae8d31b5ce2fdc11c95dd9f625a02be Mon Sep 17 00:00:00 2001 From: SeeBeeSee <86379371+SeeBeeSee@users.noreply.github.com> Date: Tue, 2 Apr 2024 19:28:38 -0500 Subject: [PATCH 1/6] initial meloning --- .../modules/hydroponics/grown/honeydew.dm | 20 +++++++++++++++++++ tgstation.dme | 1 + 2 files changed, 21 insertions(+) create mode 100644 monkestation/code/modules/hydroponics/grown/honeydew.dm diff --git a/monkestation/code/modules/hydroponics/grown/honeydew.dm b/monkestation/code/modules/hydroponics/grown/honeydew.dm new file mode 100644 index 000000000000..4ba108692be0 --- /dev/null +++ b/monkestation/code/modules/hydroponics/grown/honeydew.dm @@ -0,0 +1,20 @@ +/obj/item/seeds/watermelon/honeydew + name = "pack of honeydew melon seeds" + desc = "These seeds grow into sweet honeydew melon plants." + icon_state = "seed-honeydew" + species = "honeydew" + plantname = "Honeydew Melon Vines" + product = /obj/item/food/grown/honeydew + lifespan = 60 + endurance = 40 + genes = list(/datum/plant_gene/trait/repeated_harvest) + reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.1, /datum/reagent/consumable/nutriment = 0.15) + rarity = 20 + graft_gene = /datum/plant_gene/trait/repeated_harvest + +/obj/item/food/grown/honeydew + seed = /obj/item/seeds/watermelon/honeydew + desc = "A sweet melon variant that, bizarrely, distills into honey." + icon_state = "honeydew" + foodtypes = FRUIT + distill_reagent = /datum/reagent/consumable/honey diff --git a/tgstation.dme b/tgstation.dme index 9808b909b6b2..c49eb65ed9be 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6250,6 +6250,7 @@ #include "monkestation\code\modules\hydroponics\plant_genes.dm" #include "monkestation\code\modules\hydroponics\seeds.dm" #include "monkestation\code\modules\hydroponics\grown\coconut.dm" +#include "monkestation\code\modules\hydroponics\grown\honeydew.dm" #include "monkestation\code\modules\hydroponics\machines\composter.dm" #include "monkestation\code\modules\hydroponics\machines\splicer.dm" #include "monkestation\code\modules\hydroponics\mutations\_mutations.dm" From 35fb1a72f98c63ff4dbecb8f5e45799f824ea85c Mon Sep 17 00:00:00 2001 From: SeeBeeSee <86379371+SeeBeeSee@users.noreply.github.com> Date: Tue, 2 Apr 2024 19:51:31 -0500 Subject: [PATCH 2/6] growth sprites --- .../code/modules/hydroponics/grown/honeydew.dm | 1 + monkestation/icons/obj/hydroponics/growing.dmi | Bin 441 -> 992 bytes 2 files changed, 1 insertion(+) diff --git a/monkestation/code/modules/hydroponics/grown/honeydew.dm b/monkestation/code/modules/hydroponics/grown/honeydew.dm index 4ba108692be0..645ff0c97e8b 100644 --- a/monkestation/code/modules/hydroponics/grown/honeydew.dm +++ b/monkestation/code/modules/hydroponics/grown/honeydew.dm @@ -7,6 +7,7 @@ product = /obj/item/food/grown/honeydew lifespan = 60 endurance = 40 + growing_icon = 'monkestation/icons/obj/hydroponics/growing.dmi' genes = list(/datum/plant_gene/trait/repeated_harvest) reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.1, /datum/reagent/consumable/nutriment = 0.15) rarity = 20 diff --git a/monkestation/icons/obj/hydroponics/growing.dmi b/monkestation/icons/obj/hydroponics/growing.dmi index b5671e37f2ddf1affb9f33a7b65a85140d4bcb30..4bec447cf04df7888b9961f735746b2bfc9fbcf4 100644 GIT binary patch delta 886 zcmV-+1Bv{(1K zMZmzoro<4Bs1ka3EnaX3UtS`cnIAc|04s+8AY%XkURdPfj;N+d%*$kee<2x90KmY& zMp!WwK>)h9Gc-XY9=wK00MzYL_t(&f$f=XbE_Z_g%NEE5y+_2CcVl3|C@IgqG@!2 zn)FU)?(DI7nK|frSl17m3c+HrSS%Kc#rnTgy*j#*FUyw_e;MS<03-rP1gQR173v}Y z{54pLr^=A-qPO@)ap0z9BV+{t^0_`po?O=eumb|J5V-3mfHX4Q2k$=s$ds?HAwSk3 zacTwpfYBr_p|S+mt>*v$0Si$R46*%WC^ID4to3|8{X*(!b^Pgi2T zuA&x{{E(1v<|}9&zmNg?>MME#Ecr;F^7C`Jgb4Fpf1AS7;Yi~r{b^Ble%IHRFxDh} zjB#tgJKwZ6xgaM!Q3^6&9ip#WYbk=+H`dZS_z^*_M2EP>8AJby5`7K6ag<-0-%Gwe zTzBB;{K@BP7kwDyjmi}5}jK;s{&0`9NxLw>s= z`0kI^4((u<|3t@~d&KBILE8ybC_T*YM+mUvYJi@7VeF}GPs0MB`wH*ELw*Ox19t)w zwCJ4~$I%>9J}elA(`gu1E06$gfrtJ7`Ruj>ROo)1-=PPH34Zd08-ZZhEm!!jn0bZ{ z=sJJd3~-y@4fz|#ZT@$oHLLuafA-LY+w;Gv_zQw_$J~nZ<+36FFHx!&NIDeV(*OVf M07*qoM6N<$f=;NImjD0& delta 330 zcmV-Q0k!_%2e|`QiBL{Q4GJ0x0000DNk~Le0000$0000$1Oos709Z$C?EnA(7*I@9 zMZmzodU!3S#1LOzB9EvNo0%V8a0kG^z;KlQ9m1FbqYV;C2p**b&MB;06}@%G}-{ zL+*cuhNUuyq+^%74gaTaGlZzq=^U7wnbjWy(dsTj&;_1e!&QK2V>(Jyy<7$3#%)ys zp644zx4F}yhmiEZkvFRz2;o1B=Vf3-oS{oL}^{YyN#5qak-FzoT@?qBnua@wm?KEa(UqOC1H=u^&MPN clwY~!1F0w&S)imJRsaA107*qoM6N<$g4Uafs{jB1 From 3b5bddb33c626c29f9de8ef858df56670a0b8ed6 Mon Sep 17 00:00:00 2001 From: SeeBeeSee <86379371+SeeBeeSee@users.noreply.github.com> Date: Tue, 2 Apr 2024 20:07:50 -0500 Subject: [PATCH 3/6] harvest sprite --- monkestation/icons/obj/hydroponics/harvest.dmi | Bin 361 -> 811 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/monkestation/icons/obj/hydroponics/harvest.dmi b/monkestation/icons/obj/hydroponics/harvest.dmi index 776803f82b3cee34dac682423f851fa47ae45c60..7ec45274b7e72678fbd74b13a6a57e75c1fdda67 100644 GIT binary patch literal 811 zcmV+`1JwM9P)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex7wuvIWN;^NFm z%}mcIfpCgT5=&AQY!#G}^OF;EQWMjZxHwZXi;5L&6%4sJ(~1&vQz2})!i@a9)XJ39 za$E|P6aqX;0%%D@K~!jg?U>I?+h7>SKaHZHm^u$(eH{#? z4#Q6M-h)HNENe#Hn=Em@% ze^o+cF&t;p`q;ca@7(y-{;JSs$)C%=%3QUuztL)}`h|iH!1%aIqxCSBhFA#*n-AG- zEnQm@T8&k|R;~D@(hNcrX)4g^I85f({aUrsw~j>3fL3GGFO}}|Xr&BHV<{$vrlRGh zsh>HN%M0{tLf-~7h8O+t?W-rEw?60;)T$MK=FTm;-8wMM$FmQpwu|Qr&NT}|Q_0`F zi!p1kx4RNqOJWjGE-#SN6tY p8X#MMY*GVc3y@7}fNTM>`3XuI`R}eoB{l#6002ovPDHLkV1j;6d;S0b literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ{HlkBpgIwkmD&TAmmDh?%tMG*4$%ZCLrH+uB0W9h^e4owmEWyR$P^FA#IKpSn}pa)&hQ zIiS^BJzX3_B3hGe3LY>Vc3@h@xV82Q<6=IE(gPF94;W8t_|N>PA=QR&(fJ6bfBS0= z9Vz(dD&X3uaGH_No+WN?P16OhPUW^ZsRmYCW*|6T?YYBZ=R$)oP6-aO4Kjaj9N5GA zPR0H31+GTM@`fw(d3$y|IXC~usR<$*gqPcd$~bU4Y+~k7y_Wc6Qq29yPZ?$?gJeHE zIH=#Hqkfx_hli)YTXW-_Mj$BM5^wOTA&|YNf}MduS<+_W#ar?zKo2l@y85}Sb4q9e E0Lg5R@&Et; From d48407f35ba271e25e27c028774dac09b5c800af Mon Sep 17 00:00:00 2001 From: SeeBeeSee <86379371+SeeBeeSee@users.noreply.github.com> Date: Tue, 2 Apr 2024 20:20:19 -0500 Subject: [PATCH 4/6] mutation datum and seed sprite --- code/modules/hydroponics/grown/melon.dm | 2 +- .../code/modules/hydroponics/grown/honeydew.dm | 3 ++- .../code/modules/hydroponics/mutations/base.dm | 7 +++++++ monkestation/icons/obj/hydroponics/fruit.dmi | Bin 656 -> 740 bytes 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm index efdb9a7d4dde..52d0f30d8932 100644 --- a/code/modules/hydroponics/grown/melon.dm +++ b/code/modules/hydroponics/grown/melon.dm @@ -11,7 +11,7 @@ growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_dead = "watermelon-dead" genes = list(/datum/plant_gene/trait/repeated_harvest) - possible_mutations = list(/datum/hydroponics/plant_mutation/melon_barrel, /datum/hydroponics/plant_mutation/holy_melon) + possible_mutations = list(/datum/hydroponics/plant_mutation/melon_barrel, /datum/hydroponics/plant_mutation/holy_melon, /datum/hydroponics/plant_mutation/honeydew) reagents_add = list(/datum/reagent/water = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.2) /obj/item/seeds/watermelon/suicide_act(mob/living/user) diff --git a/monkestation/code/modules/hydroponics/grown/honeydew.dm b/monkestation/code/modules/hydroponics/grown/honeydew.dm index 645ff0c97e8b..f2bc1f885c0c 100644 --- a/monkestation/code/modules/hydroponics/grown/honeydew.dm +++ b/monkestation/code/modules/hydroponics/grown/honeydew.dm @@ -1,7 +1,8 @@ /obj/item/seeds/watermelon/honeydew name = "pack of honeydew melon seeds" desc = "These seeds grow into sweet honeydew melon plants." - icon_state = "seed-honeydew" + icon = 'monkestation/icons/obj/hydroponics/fruit.dmi' + icon_state = "honeydew-seed" species = "honeydew" plantname = "Honeydew Melon Vines" product = /obj/item/food/grown/honeydew diff --git a/monkestation/code/modules/hydroponics/mutations/base.dm b/monkestation/code/modules/hydroponics/mutations/base.dm index 85f4aed01fb1..4d01ae6db6b1 100644 --- a/monkestation/code/modules/hydroponics/mutations/base.dm +++ b/monkestation/code/modules/hydroponics/mutations/base.dm @@ -418,3 +418,10 @@ required_endurance = list(60, 70) required_yield = list(5, 10) required_lifespan = list(-INFINITY, 20) + +/datum/hydroponics/plant_mutation/honeydew + mutates_from = list(/obj/item/seeds/watermelon) + created_product = /obj/item/food/grown/honeydew + created_seed = /obj/item/seeds/watermelon/honeydew + required_yield = list(20, INFINITY) + required_lifespan = list(60, INFINITY) diff --git a/monkestation/icons/obj/hydroponics/fruit.dmi b/monkestation/icons/obj/hydroponics/fruit.dmi index 05967937abed8c2a9570d9055dd9e0cca04eecd8..69ec16c9a999b123816044d25a16292b8fe24966 100644 GIT binary patch delta 566 zcmV-60?GZ51>^;gBmqm2B_cv>HUM8=Usq94(&TNx(^gGQO?qf(mX?;Nrb*=DZRFyP zcXxNo$zI&rSgXxZmQ$~W00001bW%=J06^y0W&i*Hk&$$If1fA~8Tomsl_{y^y7*Kp zE4cc(fWr^~5y@j0yM45d00051Nklu!TE4278!6SEsMl(g^vq;nXdmpP_u zVbZD`|Ec8QFDG^dsj8x)XVS|}s{mk20G9`IC*h{YzyjV0xOOg80l*~yWR4JKDfKJB z2tWk@wW~?Ue?tup4O%qjl5=ff!2uA~)ChzKFa{%m1D(7{82RiVOMs?9qzu5?(F2Qr zIk5$3q5+i7AUS9Vo$xRNtQ+_5B0yX-wZIsgZvqfGA}N1rvSTZmCIAvU;B>D3NKl7h zLJ=>M9UuepCsgIf^iqzuAp>9uaGRWy0OJ7RDu61sfBGi?*8^}VmjRG6M85&JEMSfL zvi<_CAN0|M;9ku21}3 z_Z=h=+OFG8(X~R}_x*l~-b(TWReQtybAE%s{p8}1_dzY6@Wj4qgMgMS2PU}^BN!=!vcU70Hgzs;h+LG@4WMP`T?}1A3^P=?%*tXM*`y5=ZE|rlwcY+oo9n&ID+BxJtsN*Wf{w zfJf(67J$|O$ZR35D&+4#0YC)+dhW%DqX&~CPtM(Q9u2HGfKV@ggFy%Y=O_?#5ZjAH zoRNr)&SeYYyn~e(IJ2?l=?S-jss{a z&H$v)M9%;?3pgTwzpXz2XmY>S=6e8M>w6|Z3FkV9ADTa;iLwOj`R6w^H8lmj<2uav z$LDp__O}Vgcrq|1wXNfF$$qr+}on*1;&m;Pe{&_cl!g`x-aSi7?kC0e;*h?Zer4Q&s+^rl!;M Y1<&{uIKH=&NdN!<07*qoM6N<$f{`K6%>V!Z From 7bf79f4381cc5fa6c03e1284da8796a14fbbdcf3 Mon Sep 17 00:00:00 2001 From: SeeBeeSee <86379371+SeeBeeSee@users.noreply.github.com> Date: Tue, 2 Apr 2024 20:34:04 -0500 Subject: [PATCH 5/6] some minor fixes --- monkestation/code/modules/hydroponics/grown/honeydew.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/monkestation/code/modules/hydroponics/grown/honeydew.dm b/monkestation/code/modules/hydroponics/grown/honeydew.dm index f2bc1f885c0c..4a2df64dc763 100644 --- a/monkestation/code/modules/hydroponics/grown/honeydew.dm +++ b/monkestation/code/modules/hydroponics/grown/honeydew.dm @@ -3,6 +3,7 @@ desc = "These seeds grow into sweet honeydew melon plants." icon = 'monkestation/icons/obj/hydroponics/fruit.dmi' icon_state = "honeydew-seed" + icon_dead = "honeydew-dead" species = "honeydew" plantname = "Honeydew Melon Vines" product = /obj/item/food/grown/honeydew @@ -16,7 +17,9 @@ /obj/item/food/grown/honeydew seed = /obj/item/seeds/watermelon/honeydew + name = "honeydew melon" desc = "A sweet melon variant that, bizarrely, distills into honey." + icon = 'monkestation/icons/obj/hydroponics/harvest.dmi' icon_state = "honeydew" foodtypes = FRUIT distill_reagent = /datum/reagent/consumable/honey From 53561e6f3b79cfb2d5bfa8e149b16939b267f955 Mon Sep 17 00:00:00 2001 From: SeeBeeSee <86379371+SeeBeeSee@users.noreply.github.com> Date: Tue, 2 Apr 2024 20:59:15 -0500 Subject: [PATCH 6/6] sliceable honeydews --- monkestation/code/game/objects/items/food/misc.dm | 13 +++++++++++++ .../code/modules/hydroponics/grown/honeydew.dm | 3 +++ monkestation/icons/obj/food/misc.dmi | Bin 0 -> 331 bytes tgstation.dme | 1 + 4 files changed, 17 insertions(+) create mode 100644 monkestation/code/game/objects/items/food/misc.dm create mode 100644 monkestation/icons/obj/food/misc.dmi diff --git a/monkestation/code/game/objects/items/food/misc.dm b/monkestation/code/game/objects/items/food/misc.dm new file mode 100644 index 000000000000..ebffd34bc3a0 --- /dev/null +++ b/monkestation/code/game/objects/items/food/misc.dm @@ -0,0 +1,13 @@ +/obj/item/food/honeydewslice + name = "honeydew melon slice" + desc = "a sweet slice of honeydew" + icon = 'monkestation/icons/obj/food/misc.dmi' + icon_state = "honeydewslice" + food_reagents = list( + /datum/reagent/consumable/nutriment/vitamin = 0.25, + /datum/reagent/consumable/nutriment = 0.75 + ) + tastes = list("watery honey" = 1) + foodtypes = FRUIT + food_flags = FOOD_FINGER_FOOD + w_class = WEIGHT_CLASS_SMALL diff --git a/monkestation/code/modules/hydroponics/grown/honeydew.dm b/monkestation/code/modules/hydroponics/grown/honeydew.dm index 4a2df64dc763..020da4bbd2af 100644 --- a/monkestation/code/modules/hydroponics/grown/honeydew.dm +++ b/monkestation/code/modules/hydroponics/grown/honeydew.dm @@ -23,3 +23,6 @@ icon_state = "honeydew" foodtypes = FRUIT distill_reagent = /datum/reagent/consumable/honey + +/obj/item/food/grown/honeydew/make_processable() + AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/honeydewslice, 6, 20, screentip_verb = "Slice") diff --git a/monkestation/icons/obj/food/misc.dmi b/monkestation/icons/obj/food/misc.dmi new file mode 100644 index 0000000000000000000000000000000000000000..0dd7cf2936dcee76eafdea5064d74408cb68585f GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv^#Gp`*8>L*1kDUkYgaveGHz#~ zR@1J=3H{ppYpv(yJIp>YYsE6p%oXXDlg!#(9xM=*~k?l(=NP)`@f5RHk+2@-q_fs#|t3$187v$o(p&y}Xa8KT?$W?B}% zlH0+hC;Rfmg$o%AS$6zd(!9I;{k@7442lbsH8eC@Qq-<1sj8}OW%Vd4SnCx%^?<<} a28OOKp|*+loCARtFnGH9xvX