From a643dc10ebb440491f3de7543070928fce3cfa1d Mon Sep 17 00:00:00 2001
From: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Date: Thu, 23 Nov 2023 05:41:39 +0100
Subject: [PATCH] Rock (#686)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Introduces the glorious rockfruit, a delish little fruit which just
happens to grow literal granite around it.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->


![image](https://github.com/Bubberstation/Bubberstation/assets/49160555/4bb9512a-2f8c-455a-b16a-c4011dd544b6)

![image](https://github.com/Bubberstation/Bubberstation/assets/49160555/ecaa4a5a-34b9-4446-99df-0db723e46d70)


I'm not the greatest spriter but I think these look good enough. It is
honestly hard to work with a desaturated, rocky palette when floors use
the same

<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game

More interesting food is good, plus this fits nicely into adding stone
type food later (Very soon)

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Rockfruit, the new awesome fruit that's literally just a plant
growing a granite shell

image: Rockfruit seeds, plant, fruit, and rocks
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: Cyprex <35031555+Cyprex@users.noreply.github.com>
Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
---
 .../modules/food_and_drinks/icons/rocks.dmi   | Bin 0 -> 970 bytes
 .../code/modules/hydroponics/grown/rocks.dm   |  93 ++++++++++++++++++
 .../hydroponics/icons/growing_fruits.dmi      | Bin 0 -> 1068 bytes
 .../modules/hydroponics/icons/harvest.dmi     | Bin 0 -> 1099 bytes
 .../code/modules/hydroponics/icons/seeds.dmi  | Bin 0 -> 1001 bytes
 .../code/modules/vending/megaseed.dm          |   6 ++
 tgstation.dme                                 |   2 +
 7 files changed, 101 insertions(+)
 create mode 100644 modular_zubbers/code/modules/food_and_drinks/icons/rocks.dmi
 create mode 100644 modular_zubbers/code/modules/hydroponics/grown/rocks.dm
 create mode 100644 modular_zubbers/code/modules/hydroponics/icons/growing_fruits.dmi
 create mode 100644 modular_zubbers/code/modules/hydroponics/icons/harvest.dmi
 create mode 100644 modular_zubbers/code/modules/hydroponics/icons/seeds.dmi
 create mode 100644 modular_zubbers/code/modules/vending/megaseed.dm

diff --git a/modular_zubbers/code/modules/food_and_drinks/icons/rocks.dmi b/modular_zubbers/code/modules/food_and_drinks/icons/rocks.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..190df5af8be48aca6b52f438fae10ed8904f3bfa
GIT binary patch
literal 970
zcmV;*12z1KP)<h;3K|Lk000e1NJLTq003YB002M;0{{R3(&~ad0001TP)t-sz`($Q
z0syH30Ky3eRsaBC4hw<+0ErF@mjwl#6A)(?5{?%Vp&S-#9Tt%t7Nj8?i4Y5p84{5m
z7OoHru^AGx9u~zH5y&4H$t4_Z9~hG%7?U3uv>_O!Bpu2p9>BoBSy@?BR8)C+c|t-$
zH#avN92^oEYIFbq00DGTPE!Ct=GbNc004Y?R9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`
z^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3KAHiHkEO
zv#1!zH00t;D@x2w1+h(lqNzEFl^|g~BON4+&{>q9oL!7vyCIjdf~%hk*g*iIyeKt=
z_I<<v00MqVL_t(oh3(dDZ=)~_0ALrIX4%%3j*gCToQ{?I|9|mfCk+k+*pBpGB&^6E
zg5*abQDT5K{(fvQMl(QyF`5BVjM4ljfGq}P0RjVro7w8`I}FMaBnC(~v(w)nFeocf
z7@*wD0|QKHmj{3;?eYLHrCs&_%v9GKv<L$5JJt0DErJ02PIbLOi<kn$3?OF!6#^a~
zaqva>z|#{Bz6c+9e#XHU!2wg98$MvFbHfKrb#7QdVCL03g8+%&dG*d9K;d^@y)y>D
zeve}uI2>?{1IHtd9w0=PWxC>ts=qix&kI36C(m<T@l4fUouTKYq@Pn1g|2v^>Tk}_
z^Ge--ldg!R%ksS}Z;N2SSy#l;RrRf^Zi`^RMOVbqb^X1rZ;R*vA@HB<2`CvLEFdNR
zlLG-21Ed9%!hdokpk{#T13&;U06YK)00w{u00F=Num{v^G6BE<uz=lU0)PQv0lUcr
z00UqM;0}Y^<RO4N3~rN$0PZljO}0RHOiu*7uw%OMj_H|zS9VMj@0eZ)cw@&j?E_s7
z16>XSUFN{uuZsI$cAHJsyQ?$rx=xb3cUR}$b)BX~@2)QV>l)wQA+TjY5&(7#NCN<S
zaLkj*0rO;n_hfRwJelA<nH(@rrVnt#&G1K`8E%F@`pj@M1gx>f8uRV>zYomy|FMA4
z{yzeMdA$F>8zAoigr3BBz{sP%9GL0<qXMD+e{sz9|51Rc{yzdR-Ty}f!u@{)0P}eN
z9~B7o|BGX;|BniU`v2v?C$EYhO#>evOMvOi?%KA^&$j&yVXpr-p=-BSCtRB^0#p6J
s1)9bHD4_KfV7mWb9CQ8u8vlL#0(f0Vz*f><HUIzs07*qoM6N<$g8Y-6?EnA(

literal 0
HcmV?d00001

diff --git a/modular_zubbers/code/modules/hydroponics/grown/rocks.dm b/modular_zubbers/code/modules/hydroponics/grown/rocks.dm
new file mode 100644
index 00000000000..f34101c35fe
--- /dev/null
+++ b/modular_zubbers/code/modules/hydroponics/grown/rocks.dm
@@ -0,0 +1,93 @@
+/obj/item/seeds/rockfruit
+	name = "pack of rockfruit seedlings"
+	desc = "Small seedlings of the golem rockfruit plant. There's a warning label on its packaging: \n\
+	\"Remember: Legally speaking, rocking is more legal than stoning. \n \
+	We are not liable for any injury, death, or complete body evaporation caused by using or growing these plants\""
+	icon = 'modular_zubbers/code/modules/hydroponics/icons/seeds.dmi'
+	icon_state = "seed-rockfruit"
+	species = "rock"
+	plantname = "Rockfruits"
+	product = /obj/item/grown/rockfruit
+
+	lifespan = 20
+	endurance = 45
+
+	potency = 15
+	maturation = 8
+	production = 4
+	yield = 2
+	instability = 0 // Rocks are very stable
+
+
+	growthstages = 2
+	growing_icon = 'modular_zubbers/code/modules/hydroponics/icons/growing_fruits.dmi'
+
+	genes = list(/datum/plant_gene/trait/plant_type/weed_hardy,
+				/datum/plant_gene/trait/fire_resistance,
+				/datum/plant_gene/trait/stable_stats, // It's a rock
+				/datum/plant_gene/trait/preserved)
+
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.01,
+						/datum/reagent/consumable/nutriment = 0.01,
+						)
+
+
+/obj/item/grown/rockfruit
+	seed = /obj/item/seeds/rockfruit
+
+	name = "Rockfruit"
+	desc = "Piece of rockfruit, commonly enjoyed by golem folk. The inside seems to be fruity, with the outside being a rocky shell."
+	force = 5 // Comparatively shit considering a nettle is 15
+	throwforce = 10 // Less shit but hey, it is a rock
+
+	icon = 'modular_zubbers/code/modules/hydroponics/icons/harvest.dmi'
+	icon_state = "rockfruit"
+
+	var/product = /obj/item/food/grown/rockfruit
+
+/obj/item/grown/rockfruit/attack_self(mob/user, modifiers)
+	user.show_message(span_notice("You begin peeling the rocky exterior..."))
+	if(!(do_after(user, 2 SECONDS)))
+		return
+	user.show_message(span_notice("You peel off the rocky shell of the rockfruit, revealing the fruity goodness inside!"))
+	balloon_alert(user, "peeled")
+
+	// The fruit inside
+	var/obj/item/food/grown/peel_prod
+	peel_prod = new product(user.loc, new_seed = seed) // I stole this from seed code and am physically crying and shaking
+
+	// The rocky shell
+	new /obj/item/food/golem_food/rocks(user.loc)
+
+	qdel(src)
+	user.put_in_hands(peel_prod)
+
+/obj/item/food/grown/rockfruit
+	seed = /obj/item/seeds/rockfruit
+
+	name = "Rockfruit core"
+	desc = "The fruity insides of a rockfruit! Not too sugary, but still tasty. Golem folk use this to complement their rock foods. \
+	Curiously enough, they don't like to eat this on its own"
+
+	foodtypes = FRUIT
+
+	icon = 'modular_zubbers/code/modules/hydroponics/icons/harvest.dmi'
+	icon_state = "rockfruit-peeled"
+
+	tastes = list("mountains" = 1)
+
+/obj/item/food/golem_food/rocks
+	name = "Peeled rockfruit shell"
+	desc = "The peeled shell of a rockfruit, or as you may call it, \"Literal pile of rocks\". \
+	Probably not edible, but a golem will try to prove you otherwise"
+
+	icon = 'modular_zubbers/code/modules/food_and_drinks/icons/rocks.dmi'
+	icon_state = "rocks"
+
+	foodtypes = STONE
+	food_reagents = list(/datum/reagent/consumable/nutriment/mineral = 5)
+
+	tastes = list("rocks and stones" = 1)
+
+/datum/reagent/consumable/nutriment/mineral
+	taste_description = "rocks and stones"
diff --git a/modular_zubbers/code/modules/hydroponics/icons/growing_fruits.dmi b/modular_zubbers/code/modules/hydroponics/icons/growing_fruits.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..31f0e39ad1bc1cc971833ccf27ee65bd59304377
GIT binary patch
literal 1068
zcmV+{1k?M8P)<h;3K|Lk000e1NJLTq003YB003YJ0{{R3)kcR30001TP)t-sz`($Q
z0syH30Ky3eRsaBC4hw<+0ErF@mjwl#6A)(?5{?%Vp&S-#9Tt%t7Nj8?i4Y5p84{5m
z7OoHru^AGx9u~zH5y&4H$t4_Z9~hG%7?U3uv>_O!Bpu2p9yd2PSy@@Yz`z<B8YCnn
z95^3&d3m^W#LWNz00DGTPE!Ct=GbNc005SHR9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`
z^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3KAHiHkEO
zv#1!zH00t;D@x2w1+h(lqNzEFl^|g~BON4+&{>q9oUNN)lwWR$-3&u4N{xt9nvqyk
zmRejwoZ^(!#1vdAl@(n5T)^Q104lIg$z74!HUIzu#z{m$RA_<imf>>hAP|LDBhs{0
zW3{nfn;R$9_kYF9E`%&eNJb^S{@@I=&Om#<Au#L#i2DDUp}ZAfj`CK31m&&20a&1@
z3J@p|c4nd0mnf<dBnqURS*rCH6x9?`6r^_Mg#om+tsQ{2wzUJ$*0wqTtmNwq+5`b`
zoqU}^n;-zLldm&q6GH$o0+1tsv=8w5ii2;$1-!lC;G1v(@9#MHCOAO5bA}7h?wsKQ
zv^!@QfWXS#8wLR+u5<T>L4Xw3xqHLt09Gp;e!zN-!w=YOaI^qIWLc&hx8(j|8ERe#
z`Z&AYPC4$${nIkkyp;5D@;q0L2Xg<i3^kvoHDIe8(fWA&b3E3YV1T`HMC;S(`*f-|
z!2k#4h}K2%w<zjOGyoy+o2&?MWB_3RQsOsR6X3)E(g4yFzsZIG1p}mQ01yBe02}}i
z02lxq01yBe0L%r|hfDxq05AY^$OHfe00S_GOaNd2=mPMB!5(rKfF}(0kh=gpVX%j6
z0L?Ys65xYf)0uNk_XPN4*L3b&(*ps%*fmYsfTs2Xn%WO&DhEvdR80Ta&1PBat<Ie1
zdOqK^-s+w6TqjB1daHByxyIhx1uPg~-UC=NK+*$X4M(?34$v(VoR-M}x@CgXGC4rE
zOc%fzc7`{7#;`NI=`)6%AwX1A)Ob99e!y7%4+Ze%{{R52{`@}~Ku!VZYl-0io~Hgd
zU?l$s1@z_rhc%Y}g8+u|e*nO6{tpP~&;J1cSpE4wD4;L@KdiC*9~97+{~rfT{!~o=
z*bV3ZAb_F#9{@0%|3d-1`TxmOo~JU<3uS43@30;=Fbik>Q{J%==YPs`n^3yz4}Yns
zsHmu@sHmu@r`Jeot*YwhF5gS-e>r=tnRE41-AvHV<)x0{w;GH|r(@-B;&<qHT%zTb
m0M~{S9$=*W%j?je-=Kf@r%!!50m-ib0000<MNUMnLSTZE+tl9x

literal 0
HcmV?d00001

diff --git a/modular_zubbers/code/modules/hydroponics/icons/harvest.dmi b/modular_zubbers/code/modules/hydroponics/icons/harvest.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..98161d0ba7f7ea9a6be7e38cd651df651f1ac777
GIT binary patch
literal 1099
zcmV-R1ho5!P)<h;3K|Lk000e1NJLTq003YB002M;0{{R3(&~ad0001rP)t-sz`($Q
z0syH30Ky3eRsaBC4hw<+0ErF@mjwl#6A)(?5{?%Vp&S-#9Tt%t7Nj8?i4Y5p84{5m
z7OoHru^AGx9u~zH5y&4H$t4_Z9~hG%7?U3uv>_O!Bpu2p9(j3rSy@?WX=y%sLsT_2
zEm<))H#Z%6B_u~D2sjNwLP8uk9~W62R8&+hE-rIl5E}ph00DGTPE!Ct=GbNc004`6
zR9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainG
zjE%TBGg33tGfE(w;*!LYR3KAHiHkEOv#1!zH00t;D@x2w1+h(lqNzEFl^|g~BON4+
z&{>q9oSjxwnpuL~2tzC?bqi8cb5c`qX;4;h^>YFH0st}`IRC`RSq=aI0@z7JK~z|U
z?bds5+At6R@Z(|JwB=POlrcugyoLh%{$Fptb8yaf919h?P2yzv4@bIR{E&SB_xStK
z!HD(%U5scC(8GxKUjg(ns23nGK-iJK{yxB<UV_8`X-5Y7`vV5`8Dtoc*^vhZnAElp
z0F&DG0bo+w-T|<uyiTJ@5P;t)uhVD}1mJhd>ol4~8z2&ZOaNIE@c4+0Pr?PBp0M#r
zxWMx>Ha-asnC#qe0h65@E?}~AqXGo>JbP^rAn`lTUK<2t_?>63jQ|)9vBiPW2wNN&
zkFj}x5R=J7XPi>@7i;KoA!u=Cvzg8~r|hrR(Bo3l;w%;mopDLo->jj>v+N8^bw*6R
zT76rs&XZukTxZ18>-G2b`aB5+EOkaqz1jTOY|fLY0U>Zrh6Jn_ASysgT$2$2YX-;)
z$TD1$F##I}WIg}{00Y1QfB;|sH~<g;41nr@noTAE7yuPeZ88DC0H}a!lL-I@KnUOt
zgWcp1z#Rs=$svF{40e+%pgyKk0$$iL?KsDDPQWWWrd{WlE(v&J$F%1Ib>9rseKSz^
z9Ju*aar?`z)0ud8^~AZZyWN?0SI?a5y4PEHclE-(uJP>+fj$Ge4Zwf_y#|0iIOfUZ
zfO#^(c``X*o=k9_Ob(bQ(*?L;NBE=93_HRfeP-AZ0`75-d!)<re;-KI|JMSd_5T$B
z?Bn(S%>a1|py^4x9uRrdKMy48|EmH`_5Y_MRsRRE-R2hqZS{YUf0thhwAcS`6vZw9
z{EP$5^}qZ3+nvhuU(xJEp&9_}<MqFnKhITs0>!&3_iaE^{qF!efBtcZ1M0XhOK&h$
z|2q@NTY-0_R9X6;Q}w?;fm6#4994PP`)hQ;Rbf`B1<)(B_gCnW%dXHT=;L=ZKOFT6
z9fAc+)&G0~O11ny3VMZt!BqXvf&9?&{}{mrK)U{C!0FVUzBy9$|2_Wu_yY))Q?aC`
RDI)*?002ovPDHLkV1lq%+|2+0

literal 0
HcmV?d00001

diff --git a/modular_zubbers/code/modules/hydroponics/icons/seeds.dmi b/modular_zubbers/code/modules/hydroponics/icons/seeds.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..e11eb208888720ccf4e58ccfe62c876376ebc3be
GIT binary patch
literal 1001
zcmV<F0~Y*=P)<h;3K|Lk000e1NJLTq003YB002M;0{{R3(&~ad0001QP)t-sz`($Q
z0syH30Ky3eRsaBC4hw<+0ErF@mjwl#6A)(?5{?%Vp&S-#9Tt%t7Nj8?i4Y5p84{5m
z7OoHru^AGx9u~zH5y&4H$t4_Z9~hG%7?U3uv>_O!Bpu2p9>BoBE-o%NH#byNRC#%M
zX=!QgW*BJz0004WQchC<K<3zH0001mdQ@0+L}hbha%pgMX>V=-0C=2JR&a84_w-Y6
z@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5Nr{UyC9|j)
z$TZ~QOe;#vO$D({fTF26iIpH>JtG|?jL=z}nwp|pl%JfPR#ci<g54ZLE@cH*KNqme
z08Bh9x+5MnV*mgGmq|oHR9J=W)@^U%Fbn`-LkU^80cB-njN?QZ|Nl2$?4*g^HqFtM
zdyz1aKLp8-(nN^?9`W~Mh7rvGbBt&P$S|V$PXG%H$_f+)C_l3>|1U8pYtR^={mjz*
z|Aav~ha3ZPKl8)@TiWLiU`zYl0c>fX1%R3Aib0DY0RN}DV$dQ8!2hYP7_^8XKqUa3
z0P;TI`56aagalq*aPUP);Pn*;Ujzqib#6$&R_BHUY;|rpKw;+9gF%4C|9SOb5Rl{l
zym~M?z-omf4y@NW;=pEuqXj5c6osj{rRs0qF!M^$$0^IwRNPVZcW;<^t?A=bRb?vf
zsrrXE%zU0Vz}8g6(uc$6;m|CC0XtI>OCOIvj>l#Z4A`5BSo(DOc{(+V2!K-fO;!XP
z7@!=WHGY#d0Y?UC2jn?^lMMkU2IOr32ml6v0Du5s00;mG00w|Npmvi900w{q+$IwM
z3;+kXO(p;s09^og82l!80o-Bmo7@F(hrw^M1Hv)g67a^3=}a8c9Rcs`n9jv9-4pP^
zj%n5gLhc7b?gv8Vz}>Hk`(JjmS<$+y3vpe~=Vj}zF2!}7WmW60uH<!%Z*Lb^Fks#T
zEE$mX0PMlBPbLTKlL_L<<bZuLK|GlpuurB0xZ!8`qt6UK!ykQS_!$Bo@rXyH+w*@P
zNcI0y0nz?{0swQo|MzjO&$Ww50Nn!4m-CnVU2YOmPhu1GrK$fl5{NwN3~1s;AkqI%
z3iS2=5~%B&fmHu506aotfT8}M1NAsyxc_ehBR<h^|IY!t1vdkj<Ndz?#+;&5|Nm_u
z)&B?J>gr#|1AYB}04`S>m-}25P=~ms{%>D)qa)S-PXY|}{}TYi{r^-zwEus^e;>a9
XYLQ#Bsk2%!00000NkvXXu0mjfCz7kS

literal 0
HcmV?d00001

diff --git a/modular_zubbers/code/modules/vending/megaseed.dm b/modular_zubbers/code/modules/vending/megaseed.dm
new file mode 100644
index 00000000000..562529c8c61
--- /dev/null
+++ b/modular_zubbers/code/modules/vending/megaseed.dm
@@ -0,0 +1,6 @@
+/obj/machinery/vending/hydroseeds/Initialize(mapload)
+	for(var/category in product_categories)
+		if(category["name"] == "Fruits")
+			category["products"] += list(/obj/item/seeds/rockfruit = 3)
+
+	return ..()
diff --git a/tgstation.dme b/tgstation.dme
index 7e0c4e34375..bd797af6d53 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -8087,6 +8087,7 @@
 #include "modular_zubbers\code\modules\ghostcafe\hilbertshotel_silicon.dm"
 #include "modular_zubbers\code\modules\hydroponics\gene_modder.dm"
 #include "modular_zubbers\code\modules\hydroponics\plant_genes.dm"
+#include "modular_zubbers\code\modules\hydroponics\grown\rocks.dm"
 #include "modular_zubbers\code\modules\jobs\job_types\blacksmith.dm"
 #include "modular_zubbers\code\modules\jobs\job_types\blueshield.dm"
 #include "modular_zubbers\code\modules\jobs\job_types\cargo_technician.dm"
@@ -8157,6 +8158,7 @@
 #include "modular_zubbers\code\modules\synths\code\designs\exofab_designs.dm"
 #include "modular_zubbers\code\modules\traitor\goal_overrides.dm"
 #include "modular_zubbers\code\modules\vending\halloween_chocolate.dm"
+#include "modular_zubbers\code\modules\vending\megaseed.dm"
 #include "modular_zubbers\code\modules\vending\wardrobe.dm"
 #include "modular_zubbers\maps\biodome\area.dm"
 #include "modular_zubbers\maps\biodome\beach.dm"