From 22171de45a1c65b86785da3aafc8f45bbff8dee8 Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Wed, 18 Sep 2024 15:56:50 +0300
Subject: [PATCH] Fix soil refilling (#442)

* fix soil

* Revert "fix soil"

This reverts commit 8176355286a922fd6873c2f197f55d2fa62c214a.

* Reapply "fix soil"

This reverts commit 0c958f4c9c1d3bc90666a8803137c76a93367522.
---
 .../Chemistry/EntitySystems/InjectorSystem.cs |   8 ++++
 .../Structures/Specific/Farming/soil.yml      |  12 +++++-
 .../Specific/Farming/seedbed.rsi/liq-1.png    | Bin 0 -> 600 bytes
 .../Specific/Farming/seedbed.rsi/liq-2.png    | Bin 0 -> 852 bytes
 .../Specific/Farming/seedbed.rsi/liq-3.png    | Bin 0 -> 962 bytes
 .../Specific/Farming/seedbed.rsi/liq-4.png    | Bin 0 -> 940 bytes
 .../Specific/Farming/seedbed.rsi/meta.json    |  12 ++++++
 .../Specific/Farming/soil.rsi/liq-1.png       | Bin 632 -> 0 bytes
 .../Specific/Farming/soil.rsi/liq-2.png       | Bin 928 -> 0 bytes
 .../Specific/Farming/soil.rsi/liq-3.png       | Bin 1081 -> 0 bytes
 .../Specific/Farming/soil.rsi/liq-4.png       | Bin 1059 -> 0 bytes
 .../Specific/Farming/soil.rsi/meta.json       |  35 ------------------
 .../Specific/Farming/soil.rsi/soil1.png       | Bin 743 -> 0 bytes
 .../Specific/Farming/soil.rsi/soil2.png       | Bin 766 -> 0 bytes
 .../Specific/Farming/soil.rsi/soil3.png       | Bin 757 -> 0 bytes
 .../Specific/Farming/soil.rsi/soil4.png       | Bin 747 -> 0 bytes
 16 files changed, 31 insertions(+), 36 deletions(-)
 create mode 100644 Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-1.png
 create mode 100644 Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-2.png
 create mode 100644 Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-3.png
 create mode 100644 Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-4.png
 delete mode 100644 Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-1.png
 delete mode 100644 Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-2.png
 delete mode 100644 Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-3.png
 delete mode 100644 Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-4.png
 delete mode 100644 Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/meta.json
 delete mode 100644 Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil1.png
 delete mode 100644 Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil2.png
 delete mode 100644 Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil3.png
 delete mode 100644 Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil4.png

diff --git a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
index a62b68e953..309dd47071 100644
--- a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
+using Content.Shared._CP14.Farming;
 using Content.Shared._CP14.Skills;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
@@ -88,6 +89,13 @@ public sealed class InjectorSystem : SharedInjectorSystem
         if (args.Target is not { Valid: true } target || !HasComp<SolutionContainerManagerComponent>(entity))
             return;
 
+
+        //CP14 - Shitcode retarget plant -> soil
+        //TODO: fix it
+        if (TryComp<CP14PlantComponent>(args.Target, out var plant) && plant.SoilUid is not null)
+            target = plant.SoilUid.Value;
+        //CP14 - end shitcode
+
         // Is the target a mob? If yes, use a do-after to give them time to respond.
         if (HasComp<MobStateComponent>(target) || HasComp<BloodstreamComponent>(target))
         {
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/soil.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/soil.yml
index 5b9f4af05a..3c7347c80e 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/soil.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/soil.yml
@@ -24,11 +24,14 @@
     solutions:
       soil:
         maxVol: 200
-  - type: RefillableSolution
+  - type: RefillableSolution 
     solution: soil
     maxRefill: 50
+  - type: ExaminableSolution
+    solution: soil
   - type: Transform
     anchored: true
+    noRot: true
   - type: CP14Soil
     solution: soil
 
@@ -50,6 +53,9 @@
     sprite: _CP14/Structures/Specific/Farming/seedbed.rsi
     layers:
       - state: seedbed_default
+      - state: liq-1
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: false
       - map: [ "enum.EdgeLayer.South" ]
         state: seedbed_default_south
       - map: [ "enum.EdgeLayer.East" ]
@@ -61,3 +67,7 @@
   - type: Construction
     graph: CP14Seedbed
     node: CP14SeedbedWooden
+  - type: SolutionContainerVisuals
+    maxFillLevels: 4
+    fillBaseName: liq-
+    solutionName: soil
diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-1.png b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8e7d86a66d15543b952b9f6083c2b48ac0915e7
GIT binary patch
literal 600
zcmV-e0;m0nP)<h;3K|Lk000e1NJLTq001KZ001Kh1^@s69@(>500001b5ch_0Itp)
z=>Px%5=lfsR9J=Wmcee*Komufla!iJ847KoMnzDuVHqi3)DP<yMd~-OF_fsGaZ=JG
zZp`9dt42hL9i+1Hlb%L$GBaoHyKii0qKPJ&XyX4wu*;;2em?+Or36?Nc{v#5PXc3*
z4iExeVBhO3fw^-5Jk$ki*M;fDaoZqAz!~rncn`b*4h+{ZVBU-4{3=N*0qqLY1>OOl
zfiE7<4EV~ww^7-$UL3Eg0PO<P;!&9o2Kj{4dF$s9QfCR=0}BIfT)R^j2FSh16u1Ra
z<dMjE=&=Rd0b`Gu=hlN+(=FwW!3+Ncz5>sXX=CJ@5Gfu4&w;(t{EhJ!%$jZqy&$MV
z7S0T~Mk?I^C%`fA(*ON|l$)0hQ4hwa*au!C4;-T|X?x=dl0NlDDKG<u208E=sbN#k
z+iKu-Fac5`LZ&=NozwLRr$~vR$FX5@<c*m(Pf;nSKvw0x*<|3NToG`JR0>gf#=yux
zLsX6eV&>mgxSW@R!OmqWx@F>xz9IRGJVfn#YN#7$>N&SwV@yTkZh~1MFN}~n#R+Ff
z@)P8X0Ch`b_zc}CJH78<&82shB=q7q_u_Npg9$o$%43NN-&_MpDZl&K$a9xfUk4jc
zanbL$keOeg5*?u~i%`d5;4<tT@XL8mMe}ZjF;IXM+(Tsv4N|E3z@KmHrJvRQoTyyi
mEw}PNf6Fw{L=#OsMf?V6u*B*Vq-??f0000<MNUMnLSTaUy9}fN

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-2.png b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..84037c9c80a1c39c377192fb3dbebd97e974e2eb
GIT binary patch
literal 852
zcmV-a1FQUrP)<h;3K|Lk000e1NJLTq001KZ001Kh1^@s69@(>500001b5ch_0Itp)
z=>Px&4oO5oR9J=Wm+ey8P!NWngrI;HTWh~)onC`8xgsviD`Lir=#*-uVo|;m(jVtt
zv!Ei@X@9XZI|<1-yYIgHkppaHD_hyhzm@1Eo7-s`t=K34PCK3AzkzWe5?#$s0W3_P
z3+hQQavV!5&iRge9y=h}if#<*9vJ7`oK}Ecpe9Z9+uMi)CIhC@iLNss-vm%3096-x
z1*kd}65ti^4tOg@@R3upG6TlIt<#Y}Jqak$^-xjoO6z);%h7A#D{urfwP!4yI$%>^
z2n>L}0>S~#Hvx03sP}<Afr%8^P|O?yAG9u3!~?CF0CNYXrZu_PngLlmP1n|sf%yo0
z5d(W-Cj)xYMA6j*Y{xl-vbHR>xmat+R-$*t^ja_`Mx{kFRm5|aYoV_9_U<lvf%Y9}
z`lJ|`a~U#Ls(Nmn5ev+<_SCh00Q?rf8D(paR={o4+7*D4Rx6j$Uxc*u3AxYZ{D6=a
z138n!8_K$|VxH=L<aA=dPFk(vtlM47%oSzMcL{}jNT`j57~5yLFfBzn<<!k7JEo%j
zb*+mOOx8}*1<R8<zXNmH>CAz7J56IPNMs<Eu>;_ZfLY5&EZ4}61D0!FU3;2h%jzuC
z{Y1<SJu_Z>gpt_Tm%%+fvq;TGgR(XvXD1Vg;R=`;A;mr5@-Z;hO*X`AO;wR6l*MSY
zCt@&h_rA@opl<}o*tnFhfjM7lISr(RLvJ-<MR`jo^uDemfwNQ|5~lPK@E-U?m|vgu
zyQ!cemw|=(w{d+ZXWedb(rVc^sZK~!T|fqeV!slY31z+1WY5^m-Tg>=&Vlbh7x*D|
zuFtyNiKXBnu?gCfgIhwE#RS@|W*Ty2gR<)0Td)P8CN6+)0@9}(2V-;k7?_2k?rHIb
z9Q$)ig;3D``xQ~9G;{XGV&*4dmJJ2i+8bDNxN_$jE5?}RbBv|2DXqC6#&TxGZbQ=8
z$R7G&ZhY(%IDgWM3AJJeuL|Xv#y$mb{{;Bxm;0q>;MF$vlenN{rr7wT_qQTY-p-5u
e9c*PQ&y_zbP+!{gW~7$@0000<MNUMnLSTXfQjeMd

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-3.png b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..1011d52dab55bfe6b83f5f7e1214ec33920e00d3
GIT binary patch
literal 962
zcmV;z13mnSP)<h;3K|Lk000e1NJLTq001KZ001Kh1^@s69@(>500001b5ch_0Itp)
z=>Px&d`Uz>R9J=Wm)}m?FcijrY15XjWo0lfmPylIp;DiS2jht<?HzW}X>0<@%Ab}d
z*+sr@cGAE=<6;+BvYaON@z3A!Id<W-yq4GUG9`KJ<H>B6wDc?ea5|rtykKdC5kyC|
zt2Plxq1GUI1X=zI<PMBLx<DV;Q|+s70c_P8ssPr4axH-Jxln1#yN)K`2M&P);Ee!t
z;9fv^^m`4gfLlFpf&64PD}dsuP=Ay;na%8$9xw*p10R780_qWzG0eRHu7C^R9QXy?
z0h<{5DL{!pQms6ta?3;zpMg)nvDE2kT&YRc0{H=a2hM<>4V5;6{wq)yV47tkU<iz;
z+;bphj@2Fl?|>t{^ZSY5o9_0)tb75K(=02$EEW&K*vP(CK2$qqcb}Amy)@KBH&Sb>
zJ_v3}aNR{?&h6in`6x9GfVa_vJwk}5z(A7?G`1w{i$t)aXnaZt`2^@pv#gwE8DAEQ
z9hVvAlML+3*dS8PgAC-n6N8ijA89d%dhQckHc;&Y`83P&CQw^w8^FnIP2~<7^J<5h
zD4}xc9w9NV1vFMYri!v9)dueY->5eE4$LiK!)-<1i@rOT7%CC0SK5zMvkiZL3tVgL
zIq+3BmrWSEX+X8(<Ahca5@0`?*hd3ueRSA;{+_D;m?{z{vaz*7(=5Bz{;4UmqRI!i
zl01$K9}V_DGI&RD=T_s>226(#d3}x9Cq(NY8e4OdRq<v-oyUX-+ap9+F5?EXn_PPY
z_n|&M!_vs^O%uit31Ls{5hCM=Dmr?E1JjD!H(ZrQ)o#tT;0v{h7B|tnSEwVW^SO-|
z)bqtVLiU|#HACvBxHorOy`hStORCL#sdt6kWLFU@(=1&=C_9`Twy`2UcS?eL3fXXL
zH#)Re1b3BDzZ#4`Sfx#5q#)!MZ#W-<IdvCx2`S&o`D9;Gxyov-G)Jp49(+wD>p+H_
z&>-Ane95vM=cRtMIG<~F*HRFdg8QX!b(qunywqiAtwCK;pAj~0tRjREcH}tM#0uZb
z&PtP8p*vM)`c`E&8njg#Phx;LdYr8t@>V2PaIJ~0&_=a(HGS+39On%uvKYh%r`;1@
z+H-b+yy4fU^Lgtv;=#Wv(LaP{>TfF3ZS;!+A+ElD{)wI^!#n^Nk1-I`RcWg{2Jvi|
kN8p-v{^`HdYx(cXZ>!C5<xp&jYXATM07*qoM6N<$g7&bzi2wiq

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-4.png b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..4df37911cfabf389c1931a6a975db66507066a8d
GIT binary patch
literal 940
zcmV;d15^BoP)<h;3K|Lk000e1NJLTq001KZ001Kh1^@s69@(>500001b5ch_0Itp)
z=>Px&W=TXrR9J=WmsxJxFcd|PWqHcjbl8bj<b`EL-bjlAZ5%ruBwPK^z2cMXCh33z
z1ww$3MRPd3Zy*J4<*oe3W$@aL^P)KEd%sxJ{|rU|nQH7?hi9yR1b7xEK#YJ~)j(eO
z7@h|`+xk0DColpT0#jh7Iu;NCzz`Ks_G%0FD^U5FwoCw5z%6hCT+pbL3Fe?$0()Q+
z>Q-$PP|b_t2-L5EYL%H6g?(cRTmyH&2jIPcrUBln>;&)_>XU#<1Cf;SCeA805J*mA
znp_~az(?Sd>YbFDs2^Hn2dsey;5)DsOsfpZj0Rr|w(0|Ur}m2(a7i-HO@O=Ae-UV}
z#g_tl)WTlmsQ0b@`vQChz6PaEV6JKWVyXqN^gbp<)L3nog3h&QDWH`Wtpz(InbIIr
z^<S&~ER0piwctz&#E{Okz&P|7X}rx)>3yjFl|Zb-H*IDN<nyBFn9490q;MXSLOIuh
zRw&kq`bQrswJ6&4MjMGH$u)LFW9C+!EU47arUMPS0^ZR$aX-xa#Yxf5y`eGTMxX<d
zZ%(968_`x~Bl>}Au6LX5jwZyfgKFNfYfOHXcD>barwr$=CCSGe`Yp^-i+bWr?}q?q
z=N<=;I!tE2aR#>kSlt6D`kV?@1XCGiO-e|$+P9><u+}6q8Xp;vd?lV&RhZnS9)*o<
z1a?V^-koa4O!n%b7WKs5$wZ2kBnLFmk*;a1sE-fNosrVSRCS~OT9`_WL;d!y(8Nw!
z1N}CPL%*b(T|GXdoA{htB9zlZ=d6i-V1@E9;hyAl&LhJxZcjP}tOC8U?NOj{PL2uY
zezB<MMG>zCvG|nsByNk~Zu7gN5>lA2NKv$*>suXVJXt?7EPW=J{uROr%Zo>~te8z?
zm<K)A0qQJ_!_U`(vD#KNwsquK!RVNlJYG>f-&TwJnz7W=W;=oLVDG{Q-I{b#_wT_`
zjbX2kj{qz4L`oA*6~1mjZ*pI-VuEwpcKVOLU<dS=cyYISzRy@4=Pv)=$Aj|R9oRed
zVd#sORUj-H6^Z7FcVw&MD{2Ys?iULOLt9?@I`B~tRf*N$@&EYs(1$wE-0(X0m}g;r
z0v7v6m<Z<*L%##}+{OIWUz9z#K3II#{pa8Q@_ez(i(+u@6ZozCjq(Fs%%ak&17A%5
O0000<MNUMnLSTX*F~)5G

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/meta.json b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/meta.json
index eca3993994..09b8676bd1 100644
--- a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/meta.json
+++ b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/meta.json
@@ -21,6 +21,18 @@
     },
     {
       "name": "seedbed_default_south"
+    },
+    {
+      "name": "liq-1"
+    },
+    {
+      "name": "liq-2"
+    },
+    {
+      "name": "liq-3"
+    },
+    {
+      "name": "liq-4"
     }
   ]
 }
diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-1.png b/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-1.png
deleted file mode 100644
index 866669947fdde57c49a1a520beeb0aa4ed4ab6fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 632
zcmV-;0*C#HP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px%GD$>1RA_<im)&mDKoEt$#DTb>G8EcEjfwzq!)2sAQ6H>N6sga^jiE#hjgyil
zabqsdSaGFF$UotRInrn)JG(w-=gjN|91e%W;cz${4#)qBPTLD!j7A-xTMB?}5trj}
z-sbmO6=39hKnM(gzI|f@tSr{R11*UOnl4brFpdL6{unq1J_7H7H^3nh)I*~3VI1dI
zNzzEfJ_HPacfc3mtBvPK)GK=*AWLP#INml9(YAmty9|6l<UgS-ytU^M%EAV?2i7K{
z);D|2X+J`ah%JCyAVr>!ERJmK0(Zd7#?0ncMr8p{beVFe!N~jqz5&ls;l`*ALX`Co
zH~^lN=GQ_c0Z(+9&`5wf%i1CXu2D8_fK%WEcxk`=i88ceCw%_`&~EjC*T~Z+sJjG4
zc8+Y38o3l$0uv*DXltZMU~2Pf7jabq9kk;SD$LKQ;|$PFF3^roY@C^Z9C>|dgi~a*
z1&}p459$_iVWkK-L)i$Cb!NcSL`;xX3gSz9x5cb>IUfI03l&{vZsfirYZP&WTIHDu
zxv@xX&aJI6qhawDs48HKygfx(D0Xs*>~M;F-a%a^LV`2Y^IN}rRXWJ7l7wL#=SFCS
zd_6}yoU*e|Q3uyRQi>n;Y-)2iO|KHQcjRI;>Y{>vf$VdPx>JNY6-Z=R;2rSW;+}>D
z3=LCi=R$yl9H2t(v&-xQk8hzHd)C_3x)o3U<#gWLe*uTX;cz${4u`|h2!8-(3&iS{
S6)DyL0000<MNUMnLSTZ?Y7_7P

diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-2.png b/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-2.png
deleted file mode 100644
index 8ef3440ed83652352e9bec0d0dccddfa366b9a3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 928
zcmV;R17G}!P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&T1iAfRA_<inCns+K@f$%g+)OPF*lQ7Qh5fe_KA2fpUA2_L@Fdk6BPvkS;&t*
zof!!jxmfu#r>bk0y-lC)K0Px)LPA19LPA19Lc;$-_EaBk7ezMn{VBll$;ot+<7}Kj
z<an;5k1+)%Zkr;q76Cb1kyQx}Z$;ND1n0*ywl<Na2t*FMqg7xVsLOKwj=!IYz!(_H
z20D&_avc&65@;7imHQE{0yRRkbKn{926%-<9-;^nqCWy|ft$$sBC;}x`~l}{SX6g(
z+?F-;UMc7Hflt6|psCkyWy6Tf5a<D2;6gzlB3W*ffSi2+9AMGi19n9q!y?$jGVl?2
ztLG|MWV?E10Nh0c>UyTcvN8h3?V?yo4|55$iz3HLr3t(PK46jF6|pgJF3Yhf)<tG3
zauR}8yzELWJ3IPTu6v%*^$9G1r`e-6#3Fmg{n~EmzTf*3Wf6@#m)pu%L}04HyTEr1
z?$NL58Sf|+5xCU%8hXA9T#3|(&_??+gw|@K)p-|>S}i9rmUCCYPpo7vuv#wV@N=wW
zoY+WCUK4cSf*$I;AKAdk9JN~0&z;Uv1Qxc@Ig^z4{5{|$)^!drq3`Ru&jBOux5|+S
zmsn<9<d-_mX62qeB<@E~WbLA;$U*P>hlK9)5)-Aj*8!HLJ{IviU7rwi<XQ3zxo*Zf
zAMl8IVi^$=IZ$Hc>saKQm_{-=;ep9T%xgW1zT@TDn;|d~v2);zkcqVkco*`C$=|PG
ztuv1X$#gx(N-&Sk<Cf~8z7`3O`kBV+5|$!!@#q$&6ix_H^0IJY-e6+C(6O(98<@~t
zH?E!c*!*&+-%SM~BV_uYU21L@T7=J?&h)6&@-<KcE1`y*?*hMMS6DQCWm?x*p2adc
z@9UlKz*nFHe8aME2@H-;P8KdRmel}+ne<#v-C*LbU?t%i*pYKC+FEp<h)@qW1-{7n
z3xcq3`NtY*6#^41y5}0;RL;ih{wgNwc)gSn%55Bd?-t9z4{WaKiR7a;J}Yf#qB+6^
z=`GgbCDxSHBjVmx-7#;e9`*4ui@J?$DMcvWkyWtT_svd~uqW^d3;y1zExjUr%02OH
z%k+Nk0(M8IPqrgl2O<)W@g)CBBqSsxBqSsxtbyNjnRxvs8DQf80000<MNUMnLSTYR
C#;>ga

diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-3.png b/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-3.png
deleted file mode 100644
index c49454b9767dbbcac97c46327aad6766c9d1a921..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1081
zcmV-91jhS`P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&^GQTORA_<im|bq$NDzcSiTbf@B~qODVP}CLS0KO>>0myQ0N+BvZWgw+alE$7
zpFB)gW=Ko6C_Bl+vVp-+6v?UTuI_0PI_s>n&N}O?v(Em%);sjZMV9H__!*TB&X>!I
zUtp~X81TN0#O59zd}*`57dHPm_u9l-5isxxFanNjjO;ljklQRGC2)@?qEQ0XYY`c=
zyuNRM-vFn;95}|4Du4$(i6Z)a58MF%*>MgOi!3XF@})%fiohbvB$**F1wH_O0)H5Z
zAt3@H@L-_-1+IWg;45$kY+|A>A@L-E2zY{z))6o>;Gckxz!^RYeY>qPVD|?83-A~4
zH}DVjXl#t=!6cGrzz+@d1USJ<XO54+na!ubJK(*Y)A^a*+mxxCA?KAql{!~ltX8cF
zY|ViP`~>ga<LG$GW8GJT+?W`+TYOY<y9Oh)Cdlflv2@;+z}5()&Ly_k6nKmG`rM8M
za!4qr17K|TjP1D<LFYXqcoN+|Ae7f0&`+JKQs=l>t@f7FE&|fK2)wazVgMC6EhG}!
z7h>?0kv*|zo!aq;Ag8g75m2Pg75kESBq6KyPbIgK6nrAyMgZj1iGl0k<#t5a?Cy=k
z)W#XUI<4_ZJ_J7F6a86x6oHG?iqyHd@(2jjHz|cazOMPagnA*E*zvIuo*J1C_~<0~
zd|6+tR)-M)NS#v@w40XHH>r}asf`HXS6hM2YC9w?{Xeklr}zpsvuEU3BvR+TSw0*@
z0D_lQX&wlgPHe$ryq@JzC3f5wm3E)1QEunu07);$?-7@HDcu4+E3Z5AVJiWXQM|ak
z4k00Dc<;>#l|_ju;sU*)zHy0!lKl>!2bVV1c5MZesdMG7NbKx|Y-cPMSr+SkZ1WMJ
zqP#akLqby*gO6o2h=wFr;1l-B=AJoZM!lM;aMY~7?PP<90F~71`8&ccJj3f*Q4kR|
zbKAx(-s{(RuV34_lCXJ>pTpR;8-<|%xO6Jvo3ha^tqLU>YL4Zz#^-?A?`9soh(KJ8
z3InHwOG5q6sq4L<E}w+ZE+|6kSl4(NDJnO%M*dWz*Cqm5@EbnlV_RIC6a=m6#YSrk
z3A&d<RNW+{wE@32LSOB_C;Owl-^dnOrv6CDJExw!GI>k&en_ZJed>{Xz<c?|04oxA
zHj4A*a%=L++D2ew3*|P)zyvz3IwK<x?+@|oWsaBI9U&4M8+*NW9{Nrkw+`A}WAJM3
zB%S!hzu+;6AA805a@ne-KIpSb^kt&iHZ&uUG_H$_K|J(oxwG25DuJeL`9>rXQ1||}
z!6Cq9uR@?{5uxT9Kjqs{XPtG{S!bPf_PgvmLR_A)uF)~`00000NkvXXu0mjff%OVg

diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-4.png b/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-4.png
deleted file mode 100644
index 6d9e10a71ef623585fff71e733d077aac837bf1a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1059
zcmV+;1l;?HP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&-AP12RA_<im|1SyKoCTqL`mMV*-3tU3j;in4(1aH$SndS2;g{;wOjd^DovBI
z)+qT28yHZchGbWFb#+tFSYwSf)>vbWHFmJIj&YNIS^jpP+reOYjC*ghg8|6twpP5)
zG92UjE1>oU5FGCU9W8^fvoGPe&~den31lw-a=rjgfitZh2?S)P?f4v+)z%8oF@SWo
zZ>d;YPQL-(1Mh%yQa0KGu+W+TQ(zR<Sm)-zykC|t!17Ok?396iS(@voz+2!F_y}AH
z#3?x#j{ZbWKZf-z5Ho`yXT-qw%FIRp!SO;4z9mKe6YyE<l9Z7X?L&@DfFW=X`~)5Z
zV3h$f#SC^Rfb(5Jtfi2g?~*v)BT?sqOr3WD(0lzBK}_ZFgFrmWSv&Tk?_>S;9ry<P
zAZO$-0Kxe)635R;G`S!}`&^)`L_M9m&@~-7IunQ|Il2_Uf=n|zf2#dMoj)7^i8gl1
z(eCK`87b0HK25V;*wfX$Op&?17ur9U^N#qP0?-3G{j%JNMw<Y1<mfqBI!!0*zbV$O
ztrP8!H8GQ;kfJ*h_(&H&vrD4j)-1H^C#3cD;;whqmLBv5_&_S;x}?_4jm`x=BGGFk
za4mAJoshDyRV9CWkkaO;SjWd&6LKU?sY{ZaT2h@c7wJT69GteC&dKsz?=8JGf!GW{
z=7(EFhGC7!>1_#!3;aT#y8_|H7J*nsp_;`js+n{xYy?rfcJk)>8me=RXB&?aE><hg
z3Ar|0q;Wnn06XtmumGU*V+AQTyv5D+_43Qtudf1l6`g1lDdg10E^3{>Cn?AsS?|5i
z;Jx2ebOu+GDp@#sq%2xAI&5gTYa5wC^ve<fDCCGUft+w7YU#68#4<ah+GTxxn`$$&
z_D3M5;{E`Fy^!V3(eh|vC#K|PWeOGHx+zuex5K@C?P`o5Q?+1AA#Vk6I~XkcWf^NB
znyKao`&<O;bN(J>+LHQ25{oCQA`$EGFaW^;PmcBBt1STaaoSDD4#%uGGp3IL+>=$$
zKxUgd@;(4!Q9qJ6y3oVBWW|Z9MR447i1p*b9+F4y2OT4&*4jQVG^WZEc^Dg#C(!zP
zag2IV+v7&*3_MfqHEwp(+rePtII;69r5Z|XT5kCs9U`|~gubTU7c8xHd5v9vy2~)P
z?>n(0>VeITD>fuM8Y3U66W^Jg1;2jIfXVG(u#q+g0}u#1>oFomKQ4ofzt_8a1hOE#
ziS6_ra4>*1VB)<ZfC$JIWwrw7keB<T{4-|@<L|oTvVQzm|KR<R^~<ug%WU6RV~sV|
dSY!X4{Q`V)$4dPc!qxx)002ovPDHLkV1j*N_IdyS

diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/meta.json b/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/meta.json
deleted file mode 100644
index 74df594902..0000000000
--- a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/meta.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "version": 1,
-    "license": "CLA",
-    "copyright": "Created by TheShuEd for CrystallPunk14",
-    "size": {
-      "x": 48,
-      "y": 48
-    },
-    "states": [
-      {
-        "name": "liq-1"
-      },
-      {
-        "name": "liq-2"
-      },
-      {
-        "name": "liq-3"
-      },
-      {
-        "name": "liq-4"
-      },
-      {
-        "name": "soil1"
-      },
-      {
-        "name": "soil2"
-      },
-      {
-        "name": "soil3"
-      },
-      {
-        "name": "soil4"
-      }
-    ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil1.png b/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil1.png
deleted file mode 100644
index 67eb9b052e49e4fc9e86b35c44f10e39688f2d74..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 743
zcmV<D0vP>?P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px%p-DtRRA_<iSWRofKoA|F(S(Ldu{TfRq2Q(95AfDs-J3r^=tby3dh+O@lA=~2
zJ(Ni&liA(be6+Oe12NIv&3iku^AUi6fPjF2fIp00-HDG6_c^_PdVZ<BRuj~EC@0T>
zV(7T81bQth5s&*(aee$aJJ*nem^MTs+Bje_o8|xjgXl{9pArZ7A|Lmok_caM5?mrG
zrnZ3-I-M`YJr~La;vDVze7s3W<wx9k7qY_<MmK5cx7|Ji0D$q`Exf%SDszU{Nnt5U
zkP^pvd_!=vmg`N4v(-HF$+#pYO=59z8>p2yhSy1PEeS@@=bg@%k_hj};Bq&~@6j^2
z0a|2-V{yHD-RfM(1WH`;ZyTsDb1~WB2x$_RzHNj#oP+p|bN}TB*(8pNz&V5H3Qp%s
ziM*D$RRBN8)RX{F+A;i}x(D@HTQs7PrEX>~1}$dOTq4R({bDxFm+MV$J{jk$*KLm;
zbYCAg36-qNc~k^60To02*n~8REAA#mArone*6S0rBnqNda#=`2_}`(CVt(*2MEXXO
zCg`M`rZANNu64YlkQPlcF<Qo!6nVj?szx<vD-%=Dq$mkN;Q$RviMp9sB5f<jDSXO_
z)-$nGsrnGFT}m{~#Jo3<TtXtQsW?>v>cVuWC9<|YqHfdQY82Y-vx-~!G(Q0TLR5o&
z;=T*6URhJXQ5Xl<NNXB)TYQiEkyyM*)>7vIU%~)i6(l``qnp(Dx&^Nh*vKGw6-(XE
zCZY%M9X6#X<bqT>o96KnTFMoaERBrbiA;JU!DBx{S{!?WHiX!qKJh5XCsw<<HK~X0
ztQKklD&E!Hn8L35&0H72tj+Jy$EA`)dh_QSVt)+t$v8*L;5P=A#cZ16=QlY91Ox=g
Z_ylyP^PVQ+Yy|)S002ovPDHLkV1j&IRVDxc

diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil2.png b/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil2.png
deleted file mode 100644
index 735fc692aa5198d21107b5ac412aff149c48f666..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 766
zcmV<a0s;MrP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px%xJg7oRA_<iSWRo&KoET@ks}k4Qqr4F!iRt_0sR2q@~eBx4>0r+=ppE&qYpJI
zQmlY-D5H$Vv#ZsI3!(eKco8$Z?`d~FR)B|xhlj`ijNo4_^!RY!()h>EUyH3fX(CRB
zLnCIgHQA5F=m~6uY=~B2H?B`jH=ZlP*_jjPWF#RC(q8kKDrC@Ux81Y=a2;Otp1(G4
z0D!MI>oZbBxIQ(ARv~`>sm|slzqvxJ#=GsN<;01!1};P+3;<<S0|4T6)O#*p4qxl(
z`Nhi7S#6dk-4T)mY|zLNY%gSpIAL-Ck)U`Tp{(lOKhP&W6f=io*^T3M<V+p_zD(c_
z0NCe6u+NJ?k}s=TCC^DmtFU{{$?x+b06yZ*1+!9^mQrQ9G#wL)hkafIrbGe!J!ZBY
zS*(z`5+`V6O|`-%Vw3<$Tszw~;zXMJX&H-l=k7K}v<f>hnh+-ert0f@JS1^0l*i6K
zFM=#hTJocLfPS*zB2)o9h~!ouj%Al=c-G;QXKB*L>!|m}>r>P7B_B>&eH(MJ+iqI=
zadDJJvovXWjWB`R^Z&V6O!cL^P7`KN>=M|7O9+`=iGh!7!9k52jR{MOnAA>7B3YWW
zceioRo+>N_vnj`G^NoSk$#e(cd6{5q+6b}*UqXn{`0?Ss9V$3Oq&3mBGs*XFJ=>}G
zf-@sqBSi(ob~_t_Y!L{imoX${kygTVq)g&85!c}rUYj?RRSg+WeBRNmgxnEc-T|E5
z1NfMT5o~wk!?EmIkEiFCfUi5c8<l+s5tS3k#bocI!F0DCbBW=YoRf!oc;2MRBOx)T
zHaI!j$l7{%>2rx%V04hA=k)MA@4J3en)OxU5<R>ImkO<c@6=gPF4@DAAhPF~ii>o?
wq#(ak53gaj-L!PKaJ^%AczAetczk-i1GkM9r+xl6QUCw|07*qoM6N<$g3v=|IsgCw

diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil3.png b/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil3.png
deleted file mode 100644
index c4a342ff3beb7a17d56063484b9d289020297565..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 757
zcmV<R0t)?!P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px%uSrBfRA_<iSj%eLP!K&TRxA;bEV9fhXi@N{kPpzVU)`NQz|f7M3*(h{4W+@w
ziWN{7VU*Em?n75{A@m+F7V>?ZGk5Mh3`9gkL`3}0NakGZ>zB_hJ%9WDW7f4zm}L`A
zTtX9K8XqEhvH(sdyGpzF^|=XJZ>)%50n&<`Ji#SG&f(*Ig^U(pBL4f&X)yNoI!AqO
zx-mqM6Q_C0bkUpp(!2ry*4v$xqf<b&DqC#>z6s%YssR8+o~diyUgzDjCYZqYdTCy*
zBD_z4gt#`8kRoj$0|3Bgf0*Bes#V$YP3~@r-tRV_CLzaDjUvx_-(v_%eDWPgC%`v)
zdOmi<wFt!DEz^ZcezQL$q2vL_2~?}HwfX*fyGtG)?pwg@_sewQ46jp?o^hfi?;_#y
z^-BpEOyI<`s}%LQ>0Cv#GLI}o$|gn%;qwS%g!Bf|CFPfkh?Bc)_J`#0;lAa*EQxU;
zzHX+$M@X>mNil@usm9$+(VZUfCWJ05HxiBK&oZ*{({v@ZV3397w`-0ZPm!)#l`VZ-
z>s++t9b2V_;35J{6)G_8!fKdZfJUAdbOavVfbdK_TR9C3a|K;qU|4oMJs*3d<$C|D
zoCby^wXL`#@aV$x4#BrK@D|`|U=BZj0eH9cnC?tVd@@0rL^uVQB8g@}K<~_K&@62W
zpE4JyrG!Qdc=OvL&#+7vod6&5bRXopGIL8IK5$l}^t|5gl4@19R2pcm!U+>NaV-P$
zk_8x+8<Sf~6HKk9sgRSk6_F#O$h9?LnwUv>z?Nx&cb6k;yLyWd4ndQAasa_~S8Tn7
zkEluiN=Pz9i06g5dJB`7-b<HDXryI?;kZO^VHLpPQ_2!aPLAGjaxPaG+gpsjFI2nJ
n$5&hkLVAmch=_=Yh!2auR^Je(G*H;%00000NkvXXu0mjf@}6CZ

diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil4.png b/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil4.png
deleted file mode 100644
index 6e4e3688791cfe58099c9caf848be5607df12cef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 747
zcmV<H0u=p;P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px%rAb6VRA_<in6YZ(KoEw1L!4OH#6?P1M#X`e13!Sed+Kz407Du>3ggP%h2w$`
zD^@^PjTz0(?5^ZEz9aiVupO<m|G&GMnOz`}NF)-8|CqtGI{xwfTf=`pK0Wu+axnv3
zAc>QrC4Edp-C%XBbr=!}0HfRC>3emoqn>LKY#1X*!xA~V9ilqct?RN4=dFGR04&!V
zRjX-$3y<y0YOmcx!T{iIcoUozjmM|wfn%U7@`fI&bvPYoPDj)^jqL9~2dA^?IK%Ge
zF95*9{iJp6<#mrqHi{B0XQK6^Eb@j6=cA+vA~eB-90(uO-~Ldw{=eGp%#~tZSj=aq
zB@{b41PP##?y@|(MxyA(WN4C&us>9-PfawSzY9LNxmY8e<L+WUYq<Ek;mv94`Es$u
zSI63Ufq8p5Lm?y427H;5u7#ox7cOUy28AP+t`<s70~Cz_ca(g>V&Fno+udL>pEaxP
zZcr9^BSn@)-e|_CUDOP4GlUGMZ}qz~f)W~KE;^=vAH5!+8RC!;E|lIKE2Dl{K6NxG
z6w6H9x0D9Xh(aL&R!QRHBIUFc?kns_fE?+oWMW=QJls!I;a2h?{+Ue7%Lt8_a+sUF
zN+u>K9BRZE;T7jaGqI0Qr7Dd8u9=tDJ%CTj#2UV+q?Hy{G&(1Q0zC|L-6K<p!Iz87
z1DuQO2eiTth}-*~LyVbTrxMx{nT|8(^noLdbv199@fslUveJ|hgElr&oOOIcFEHK9
zD_hytf(!){nXDkS8IhsW+8=1;cFca;3a`uc#ywWCI9Iq<`)lFY$_duq;X`U6O}N~3
zh58}LRO~%bCv%+8@}R`jMZ`IrI<P_|&^|fSN`U2h<7^Q>YRlM*vdA0yqu(ToKKc4h
dBoc|Q%U^Ag@Sd8o<~INU002ovPDHLkV1g@ATa^F+