From 1cbcb2386d2cd597dcdc7bf1697e2140e95b6127 Mon Sep 17 00:00:00 2001
From: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Date: Sun, 11 Feb 2024 19:01:26 +0100
Subject: [PATCH] Rock 1.1 (#788)

<!-- 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

Texture update for the original rockfruit PR because I got yelled at.
Still not the best but eh better than whatever the fuck we had until now


Modularization.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

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

## Why It's Good For The Game


![Untitled-1](https://github.com/Bubberstation/Bubberstation/assets/49160555/0a979016-9984-4d45-b061-876a3dc7603c)

No longer will you have to pour bleach in your eyehole when you see the
rockfruit.
<!-- 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:
image: New rockfruit sprites
code: Modularized hydroponics
/: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. -->

<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->

---------

Co-authored-by: nevimer <77420409+nevimer@users.noreply.github.com>
Co-authored-by: pixelkitty286 <78038207+pixelkitty286@users.noreply.github.com>
Co-authored-by: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com>
Co-authored-by: Cursor <102828457+theselfish@users.noreply.github.com>
Co-authored-by: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com>
Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: xXPawnStarrXx <53197594+xXPawnStarrXx@users.noreply.github.com>
Co-authored-by: Bubberbot <151680451+Bubberbot@users.noreply.github.com>
---
 .../code/modules/food_and_drinks/icons/rocks.dmi | Bin 970 -> 0 bytes
 .../code/modules/hydroponics/icons/harvest.dmi   | Bin 1099 -> 0 bytes
 .../hydroponics/code}/grown/rocks.dm             |  12 ++++++------
 .../hydroponics/code}/vending/megaseed.dm        |   0
 .../modules/hydroponics/icons/growing_fruits.dmi | Bin
 .../modules/hydroponics/icons/harvest.dmi        | Bin 0 -> 1143 bytes
 .../modules/hydroponics/icons/seeds.dmi          | Bin
 modular_zubbers/modules/hydroponics/readme.txt   |   8 ++++++++
 tgstation.dme                                    |   4 ++--
 9 files changed, 16 insertions(+), 8 deletions(-)
 delete mode 100644 modular_zubbers/code/modules/food_and_drinks/icons/rocks.dmi
 delete mode 100644 modular_zubbers/code/modules/hydroponics/icons/harvest.dmi
 rename modular_zubbers/{code/modules/hydroponics => modules/hydroponics/code}/grown/rocks.dm (87%)
 rename modular_zubbers/{code/modules => modules/hydroponics/code}/vending/megaseed.dm (100%)
 rename modular_zubbers/{code => }/modules/hydroponics/icons/growing_fruits.dmi (100%)
 create mode 100644 modular_zubbers/modules/hydroponics/icons/harvest.dmi
 rename modular_zubbers/{code => }/modules/hydroponics/icons/seeds.dmi (100%)
 create mode 100644 modular_zubbers/modules/hydroponics/readme.txt

diff --git a/modular_zubbers/code/modules/food_and_drinks/icons/rocks.dmi b/modular_zubbers/code/modules/food_and_drinks/icons/rocks.dmi
deleted file mode 100644
index 190df5af8be48aca6b52f438fae10ed8904f3bfa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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(

diff --git a/modular_zubbers/code/modules/hydroponics/icons/harvest.dmi b/modular_zubbers/code/modules/hydroponics/icons/harvest.dmi
deleted file mode 100644
index 98161d0ba7f7ea9a6be7e38cd651df651f1ac777..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/modular_zubbers/code/modules/hydroponics/grown/rocks.dm b/modular_zubbers/modules/hydroponics/code/grown/rocks.dm
similarity index 87%
rename from modular_zubbers/code/modules/hydroponics/grown/rocks.dm
rename to modular_zubbers/modules/hydroponics/code/grown/rocks.dm
index f34101c35fe..bb993ad1a19 100644
--- a/modular_zubbers/code/modules/hydroponics/grown/rocks.dm
+++ b/modular_zubbers/modules/hydroponics/code/grown/rocks.dm
@@ -3,7 +3,7 @@
 	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 = 'modular_zubbers/modules/hydroponics/icons/seeds.dmi'
 	icon_state = "seed-rockfruit"
 	species = "rock"
 	plantname = "Rockfruits"
@@ -20,7 +20,7 @@
 
 
 	growthstages = 2
-	growing_icon = 'modular_zubbers/code/modules/hydroponics/icons/growing_fruits.dmi'
+	growing_icon = 'modular_zubbers/modules/hydroponics/icons/growing_fruits.dmi'
 
 	genes = list(/datum/plant_gene/trait/plant_type/weed_hardy,
 				/datum/plant_gene/trait/fire_resistance,
@@ -40,7 +40,7 @@
 	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 = 'modular_zubbers/modules/hydroponics/icons/harvest.dmi'
 	icon_state = "rockfruit"
 
 	var/product = /obj/item/food/grown/rockfruit
@@ -71,7 +71,7 @@
 
 	foodtypes = FRUIT
 
-	icon = 'modular_zubbers/code/modules/hydroponics/icons/harvest.dmi'
+	icon = 'modular_zubbers/modules/hydroponics/icons/harvest.dmi'
 	icon_state = "rockfruit-peeled"
 
 	tastes = list("mountains" = 1)
@@ -81,8 +81,8 @@
 	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"
+	icon = 'modular_zubbers/modules/hydroponics/icons/harvest.dmi'
+	icon_state = "rockfruit-trash"
 
 	foodtypes = STONE
 	food_reagents = list(/datum/reagent/consumable/nutriment/mineral = 5)
diff --git a/modular_zubbers/code/modules/vending/megaseed.dm b/modular_zubbers/modules/hydroponics/code/vending/megaseed.dm
similarity index 100%
rename from modular_zubbers/code/modules/vending/megaseed.dm
rename to modular_zubbers/modules/hydroponics/code/vending/megaseed.dm
diff --git a/modular_zubbers/code/modules/hydroponics/icons/growing_fruits.dmi b/modular_zubbers/modules/hydroponics/icons/growing_fruits.dmi
similarity index 100%
rename from modular_zubbers/code/modules/hydroponics/icons/growing_fruits.dmi
rename to modular_zubbers/modules/hydroponics/icons/growing_fruits.dmi
diff --git a/modular_zubbers/modules/hydroponics/icons/harvest.dmi b/modular_zubbers/modules/hydroponics/icons/harvest.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..433f82e9fdf8a61a4566bac485e47cff2558589a
GIT binary patch
literal 1143
zcmV--1c>{IP)<h;3K|Lk000e1NJLTq003YB003YJ0{{R3)kcR30001ZP)t-sz`($Q
z0syH30Ky3eRsaBC4hw<+0ErF@mjwl#6A)(?5{?%Vp&S-#9Tt%t7Nj8?i4Y5p84{5m
z7OoHru^AGx9u~zH5y&4H$t4_Z9~hG%7?U3uv>_O!Bpu2p9vF-mZg+4RR|1lql}1fS
zFg7)z|HDVbQ^3H$@9PAZ00001bW%=J06^y0W&i*Hl6q8FbVOxyV{&P5bZKvH004NL
zQ&w<tb@%jBaPjrzDoZUY&dkqKuvIY8GvMMZ&rB)F0CJ3txHvOXGt)ClAe`co#FA7X
zQ%Q-7GbOXA7|1l_;!G<_%uNNcO@N}QIf<1ZVLc-qB#h8ml%JfPR#ci<g53y1EGl&i
zQd4tMQ%KNIQj}PnflIxzf~%hk*w+A>%}2%Z*+75*00R$6L_t(&f$f*ua^f%yhQ%SI
zY0IflD9f@qhw}c9xRx9oDT(c}gl#YUk4G2I%>PBU$C3e}zF#AhGXjiJ&Im9;IphBT
zOi>gQNKla2nW_FhLs3j2ML}w3X8QXRied&C3NkzM!~n+H#ty((+t>jZYa0asBl(I!
zNe}?Pldl+*1Of0n`HDeF_y9=&kOlx*AK>{J2Twu*US4qUBqZSV6$ej(1B^RoNPuzY
z3<)sqoKXW3jNH9p5Fo|x+`VBCAj9w6y<v0!^EnPTV6njA1}v92T7V>3tybD`P3~`&
zq34r?7H6~BXvZzNzgvc$Pg7c)-EOBH_vHRz8G1g;u7I_6MC-%h*WqwYf&sSL5v`BM
z-^b%M2?p3}N3=ej{+v$NBpN`H;F`<{aA1I>2Bayj$$|h!21si_mf@N#32<V7tPKDH
z00V#k00DpjKmdRMzyMGmP_xMd00w{>P;W8;fB~Qe)SFBIU;yX>aEHNeau<L*40e;d
z0Ni1)n_L5$W4b258#|^WaZI-acxT6SERN}(03Ym_PTGJb_5+&O4`?C>Jp8J7{AD*9
zty*{WN?h0D@uqcGZ^U&yne1A3^-f;bSbMvGDFcjq05b-d^Z;1FF(s1&OvwaMGC9DM
zOb{iL15C-30M4*8yy!EAo#92FG3*QhqN1Y0?fK6Kg!=!X0M7n@002gJ|Nk&R+5<QT
zyn4TfN}@10gHp-^$bA4uQ5VWpQ52<{ke|Crg!+FjrK+M(%1Jn%KR-K!Q2)>U_1{<8
zzjFC&`^%+G2=)KM9|@%gaM5ej-iJ{CF97)amCGOS_w&v^hx&gGPzdlWk@oLfB7gtS
zRFc0N0C|p#4gjOO{}%+~?*z~}^#S_&e<{5{?gUH{?U_*j-zNC}zgMCD|8CuMRon&m
z!e#f50Du2K2*B6>4*>A@|3d+s{eM(cR8&+{RMbr>J#WWB{Oh;l!#I_q=Wki4Tf6hG
z0!k!kfB*C1E<&mBeWV_h0zF--()Yw0gc5jx4M2FXe^k^@)L%e^TG4ny1=aun002ov
JPDHLkV1n0-@K*o;

literal 0
HcmV?d00001

diff --git a/modular_zubbers/code/modules/hydroponics/icons/seeds.dmi b/modular_zubbers/modules/hydroponics/icons/seeds.dmi
similarity index 100%
rename from modular_zubbers/code/modules/hydroponics/icons/seeds.dmi
rename to modular_zubbers/modules/hydroponics/icons/seeds.dmi
diff --git a/modular_zubbers/modules/hydroponics/readme.txt b/modular_zubbers/modules/hydroponics/readme.txt
new file mode 100644
index 00000000000..81540f5dc08
--- /dev/null
+++ b/modular_zubbers/modules/hydroponics/readme.txt
@@ -0,0 +1,8 @@
+# BUBBERSTATION MODULAR HYDROPONICS
+
+## What to put here
+Any completely new seeds, produce, sprites, and mechanics.
+Do not put any actual craftable foods here, instead either create or use, (if already created) the relevant modular folder.
+
+
+Overrides of mechanics on parent repos (TG, Skyrat) should still be done in the code folder.
diff --git a/tgstation.dme b/tgstation.dme
index ef16a3b3a69..27578dfcbc6 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -8288,7 +8288,6 @@
 #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\job_estimation\code\dead.dm"
 #include "modular_zubbers\code\modules\jobs\_job.dm"
 #include "modular_zubbers\code\modules\jobs\job_types\blacksmith.dm"
@@ -8382,7 +8381,6 @@
 #include "modular_zubbers\code\modules\uplink\uplink_items\device_tools.dm"
 #include "modular_zubbers\code\modules\uplink\uplink_items\job.dm"
 #include "modular_zubbers\code\modules\vending\halloween_chocolate.dm"
-#include "modular_zubbers\code\modules\vending\megaseed.dm"
 #include "modular_zubbers\code\modules\~donator\choicebeacon.dm"
 #include "modular_zubbers\maps\biodome\area.dm"
 #include "modular_zubbers\maps\biodome\beach.dm"
@@ -8463,7 +8461,9 @@
 #include "modular_zubbers\modules\gladiator\code\game\objects\items\gladiator_items.dm"
 #include "modular_zubbers\modules\hemophages\code\limbgrower.dm"
 #include "modular_zubbers\modules\hemophages\code\species.dm"
+#include "modular_zubbers\modules\hydroponics\code\grown\rocks.dm"
 #include "modular_zubbers\modules\hydroponics\code\plantgenes\hydroponics.dm"
+#include "modular_zubbers\modules\hydroponics\code\vending\megaseed.dm"
 #include "modular_zubbers\modules\jobs\code\job_types\quartermaster.dm"
 #include "modular_zubbers\modules\jobs\code\job_types\warden.dm"
 #include "modular_zubbers\modules\jobs\code\trims\jobs.dm"