From e94d190adecd820eb8797a9617c7318b258ec30b Mon Sep 17 00:00:00 2001
From: rosieposie <52761126+rosieposieeee@users.noreply.github.com>
Date: Tue, 27 Feb 2024 14:24:17 -0500
Subject: [PATCH] Stalagmite Changes (#25646)

* initial commit

* remove unnecessary thing

* Revert "remove unnecessary thing"

This reverts commit c4e3aecbcb9088c4dee5bf41dc5cc88eaa81f505.

* fix (real)
---
 .../Entities/Objects/Decoration/flora.yml     |  60 ++++++++++++++++++
 .../flora_stalagmite.rsi/grey_stalagmite1.png | Bin 0 -> 914 bytes
 .../flora_stalagmite.rsi/grey_stalagmite2.png | Bin 0 -> 683 bytes
 .../flora_stalagmite.rsi/grey_stalagmite3.png | Bin 0 -> 822 bytes
 .../flora_stalagmite.rsi/grey_stalagmite4.png | Bin 0 -> 822 bytes
 .../flora_stalagmite.rsi/grey_stalagmite5.png | Bin 0 -> 692 bytes
 .../flora_stalagmite.rsi/grey_stalagmite6.png | Bin 0 -> 687 bytes
 .../Flora/flora_stalagmite.rsi/meta.json      |  20 +++++-
 8 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite1.png
 create mode 100644 Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite2.png
 create mode 100644 Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite3.png
 create mode 100644 Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite4.png
 create mode 100644 Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite5.png
 create mode 100644 Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite6.png

diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
index 6a622d7bea..a2dda827be 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
@@ -173,6 +173,17 @@
   parent: BaseRock
   id: FloraStalagmite1
   components:
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 5
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              collection: GlassBreak
   - type: Sprite
     sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
     state: stalagmite1
@@ -217,6 +228,55 @@
     sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
     state: stalagmite6
 
+- type: entity
+  parent: FloraStalagmite1
+  id: FloraGreyStalagmite1
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
+    state: grey_stalagmite1
+
+- type: entity
+  parent: FloraGreyStalagmite1
+  id: FloraGreyStalagmite2
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
+    state: grey_stalagmite2
+
+- type: entity
+  parent: FloraGreyStalagmite1
+  id: FloraGreyStalagmite3
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
+    state: grey_stalagmite3
+
+- type: entity
+  parent: FloraGreyStalagmite1
+  id: FloraGreyStalagmite4
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
+    state: grey_stalagmite4
+
+- type: entity
+  parent: FloraGreyStalagmite1
+  id: FloraGreyStalagmite5
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
+    state: grey_stalagmite5
+
+- type: entity
+  parent: FloraGreyStalagmite1
+  id: FloraGreyStalagmite6
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
+    state: grey_stalagmite6
+
+
 - type: entity
   parent: BaseTree
   id: FloraTree01
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite1.png b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite1.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3da176d53ec50af270823fbf4df4e58e5adbee6
GIT binary patch
literal 914
zcmV;D18w|?P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000id
z000id0mpBsWB>pF8+1ijbW?9;ba!ELWdK8EY;$>YAX9X8WNB|8RBvx=!KdMT0009W
zNkl<ZScUD@&r9229LMo@4^6CT?N(}OEz>F6+%0SaFFEC;coXp;c<}!lW4E!Lgn<l%
zO~PR4Hf$YKrIyax#+u~t>>$sxG;M9h+&paGW0EJ|S3b{=HX(%IHY*VqU|E*f-ri39
zyMVRT74iPVE(ewBjUr+LHaFJA+wFI^1F$ShJe-~8)&RC`i<xqf-H)Ge9Ov%?)>c=9
zks9Mm<r~LGwQEyYURo5dUcZTrj0M=-SQh|?wG$4jm1_ZOt1II9i<dVCuq;btGieI>
zoC0JfvO}k0ZFNN)oz#iDWn%%RiUo|+7;g8H&tDG!6u`D^v9-0On*Hi_jRkl(JB{1D
z#C0!dwL5e=9R&zCv~64Db9cB=!1B_fDCBdv-AfwHGko8t)9C<LDTL35<)uYo7~=y0
z(WHJG&^~W*P^l(1H`c}O$4}_Gj$s%KO29NtQ7#o3v^$0ZOw$y(T#l5kVHo28xb6jA
z&&T(Dj*n_Qo}Z_X&k+WsbdB2aNzWpcfW7_wzGSWiluN~)=0FeN+0!Q&sj)u?c=TXS
zH8+g$o&+>aW2RhGQ*&6Yke@7&&)ucb{LaqKP9mD*-u`~y79I+a+b>*=<{1FK?-K+8
zGxy5s-un-`3efd@n$0GT<0RzQ%WJ@BfK&q`*MLl>c6_3y0T>97<HFN06i_Y|fvY)B
z>6*IN^?Y2{rEyyC0kqmzTT|0C1ppMv_kDoTfbg8jhB66&R=YzG1bCiD^f}jcRRZ$J
zPN&monx>}B^StY)APkVP0c102^_5Y8d@cwAlF1~Rrg2!U0Fa+7kW41kIDp1!U8T?i
zFilhFx~^UVD1a>al3xKtYa{?r>Tpw8p6Ag%Z&8{m_do{$G80+kJ4XWMX77uzIE;vX
zefzvcW+IE+EzzXpaUBK7u|omj0mD*goYny-O<kP>a*;&=0PXV@@N+8U0VS(%5zfut
z7l2y9gA!<*)(75~jpg<5uV&wa!vN8;EK7u&%Lrv<Cb9s1O-D734Uo04uplJBah!xq
o3h4XkmB2WEN@4^4RQ(710D9xa-*!&Y^Z)<=07*qoM6N<$f_96hYXATM

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite2.png b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite2.png
new file mode 100644
index 0000000000000000000000000000000000000000..73a494c76ca8d78869505864b14590d2f542afcc
GIT binary patch
literal 683
zcmV;c0#yBpP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000id
z000id0mpBsWB>pF8+1ijbW?9;ba!ELWdK8EY;$>YAX9X8WNB|8RBvx=!KdMT0006u
zNkl<ZScUD@y>1#o5Ww+24VJkDtdnH{mSRATo$emsDk>0fU@1l36e$u)l|=61Cbkvv
zA%f0)>=_-+rm$vn*w`Efg(98?#KF$*W@h(D8DrRGq_zR@ec!a(?bOZy%|_jHdVMZ0
zFV{wF1@P(Ph56k6!q4lQ{}AB&zIk7H$IbxFM%_40hOghg?-tPQ4|vT^*a+Zxo;f?M
z0?_Rb=yf}5S7B>_VKCzM=K9|PeBU>v!VzJ34?w5aXF3^MM3Mt4G2roHp640Yb=lub
z+wY90dZ7)?M&10lx_YrHi2&6~*_@Osv|6nNz;UsF<75~HBLL>}IlXQNfNU<$ak0SG
z03XiJ?P7BGhwcFYVR+9hniB*80Mp6X0#+T-i2!o9aez{ad{*H&8N%?M@l>O=wt!;k
zm~{G~JueMsB0#NHGy8jKJ7n2ho_Gbi{Q&@4YtBxq-2UniMG>y+ZVr(0&!V~Qv6NRr
zt_ffmj0l1N*LCf0HUgZKE5P3&lk&<A5CA}_aP$PAwSIOERswwAH_}U4OiH`Imu40{
zB$kAS?!i(({Cr3Zs8-5G?p788EI>l8Nn7GOLMded*<AifB@zK7wALu40C-%L_)H9g
zJEADEN#pS<fFzCs;vsF3nHUCl53j!m3xH*FuyO`G&oh8cEJOGhpp;tJ_t{+j*}ks@
zs8-4but{Yb#w#J8NlYhW`+j49gq(hI)(c1mY*{3EG;ifk=_c_8cmuov{s5*#^w8`S
R7b*Y%002ovPDHLkV1m@|FhT$T

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite3.png b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite3.png
new file mode 100644
index 0000000000000000000000000000000000000000..afb185352e00c8c55724793d4cea1dea091a45c0
GIT binary patch
literal 822
zcmV-61Ihe}P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000id
z000id0mpBsWB>pF8+1ijbW?9;ba!ELWdK8EY;$>YAX9X8WNB|8RBvx=!KdMT0008P
zNkl<ZScTP>%}X0m6h}`sBbvnMBS>PPNyKU?l))C<%*vJGPQ*o_i~fJ5bXVGKK?*`!
zq)=*GOf2MsGz`Yf7@b+XF4FfpGmS}1qSCjVkh$mm?zxvFCZ*&qPwc-3uq;dN@9)R%
z3}A0}N4|LZN&}dtDGv`1hX$Gmz=w~YI4+fA0NY!e^7Wgyw+Hb2*;Dy$|Gfr?0^JJ0
zr_Wz#pS3tHm19w$8wIc|OWrTu<9q2RwQ7arY>Kr<4{<ve44cAO0NY!eav?2r!F-`e
zK9`}<wE22;bh7}aY06wSLp(l%>z-4o)oGu#c(A%k=hEY(T)KIHmE|RXe*og~8NU5E
zW|(mt3ZU0$1p%7&DW2z1t5$gOcnyGRy+N&78JNOQ0MTUwe+6tbZ912p22d@qZCg*q
zL;#{z2L)`}r%X>7RBCmE5KK=QLwhg~U}IxLro~)ntdxKYX#s%SxzHXc06=@u4`Lv|
z-tLYBLQ<KgDTNT^a~a&u1<>`twrvuL1gT^KfL7ZX=s{lqb$i!64@J6EEXaJJNLtKw
z6ZrGF=Xn4ahN0gv$c2FbD$XcCb}^@K+PU<Yo-$~)9UR9Ykw{<|2A=2PIL>GQ(c;ST
z<ZOyuHbbRWM=hdY3aSk%3H7~e1FWyF%e0sWy1fK6z{>KHUcIUfY8M0(0LBA|$K!gW
z)XRkssHsp}&vnmrQnqaaAcP13Bxh4SH{;L%04L>AXw~Mj8C_U8po*zB0DV2U62P)7
z31Op8$|b#ORph~_RUv@vVs0`3>Zn4|vCJ2W8X#CqrQkSSf5rv?@O_`Om=CoiyO`6q
z_W}S$b07-g`##NI4Si#v=g9SH!$?!m>!=L~VY`FEse-}h{r)#x3&6508H`&M>m}S(
zk&g`!eKyRGj)?&TL44om;NW27!eaqU^4vMVZ|X0l-vJOfCjbBd07*qoM6N<$f--w;
AssI20

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite4.png b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite4.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c0b6f81dae397fa1f4331538bc61ea20deed43c
GIT binary patch
literal 822
zcmV-61Ihe}P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000id
z000id0mpBsWB>pF8+1ijbW?9;ba!ELWdK8EY;$>YAX9X8WNB|8RBvx=!KdMT0008P
zNkl<ZScUDEO-mb56owxcnW;`<+98H~AbxD(ZfFbcvr^oNxDZ_UPlZD1N`nYuHcdiF
zm1G$6HO9HKxLwG-%tVbz8rzL$709{gJm)>{y(9}#O8#doyamAC?vA{!R{2@0FU$>~
zTrSJg)6-WA0-PKl$#36(%opJBU|*h{S0*a@CIFKb-P_%f*^Eu)@`{U#i}?UdQ}pEc
zNCN)`VAK~X&mTVE`}a&@#EAe75B8<C_~8ja)EDJ)SuUCembHZM-vi7K;N<v7`ojlY
zuY>1#8Y1e8QGj6}Xw++e4=^fg^X4`NP`SLqG)(|9_9rZB3D@fY%n!h_mH;$Bzt?4}
zR6_Z}G)*kaB4dBldBZ@&)S4TBlJ@JD&nRCg1=d!JIuDo#Vl05;II@_}#rCRVt(Zgk
zqEWArS;^`ZC;%X~vZ(+Z$B|0fMbpsD7fl1#yVKJGoSj!RKr|1)_3m)ntrxv87QnV`
zy;s-k=%UxvDqE$Jp0;^&i)or95(y0BF-HhNI+c9&HjD*O@~d#Y4!-Z>wp%fPZhruP
zVHgM@Vs*kWoLzxrGD$j>1kg>wFeC^9Y}<~l#`k?J%hKl+$Y3y_-|No40wIK+Oihzo
zPE*Y1bnY+^_`a`KAcUZh%hLGOBnX1p0ip`1NgMTA3}6@t4VOqH^!Y+At6$EU05&()
zWxi010SF<u`Q0S7oF<t}#tavYFbr8+EzS<$IF9W1x@1<e0D3aD|9-DazEIQv3SuyL
z^ohDXGXrdHtV=beYOLZpfT-bs*m^wA19%Z)EP#4qqs>*Ze4!WvQ{P9;>3Vk>7?=$}
zHC2sOi~<HhpnVa21p(Z4YdV1ER8U1y%V~fo>bUI|nU!qpHB>idY6YHyQJ<ADM?(R;
zq}bHg@U__9-hOg0>XB%S`%&^H|BR-IcYt?*KRwQ%-;B5QMF0Q*07*qoM6N<$g3{S_
AJpcdz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite5.png b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite5.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fee678add7d61ae062d15805f66d5ea9d27b298
GIT binary patch
literal 692
zcmV;l0!#ggP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000id
z000id0mpBsWB>pF8+1ijbW?9;ba!ELWdK8EY;$>YAX9X8WNB|8RBvx=!KdMT0006%
zNkl<ZScUD@&1>5*7zf~A4xL%!B%R1YJ{YmhSjS+9Zs1E!K5gt4LJor+_MZj@V-VPi
z8SGF>k}~o^X54((EmjWN!AK;f5Ie4uOLYp8Y(08ky>c>~b0lq+W${j@liB6j%tHX$
zttP*??7_C}*oX%KeEss7fBXIez5d`4uzvuhl%KtQgY(~i4s!-5rTo=P1Ea|l<Iym7
z6cPhIef+?)*<(2F3|E8x;Q+pWgW-4*I}M2e?N(F1V3#N)0#HghAp}Koa#+Aq<q2*B
z2F6(IgP0hgsw%4G5=N7$?2m&;1Tb`szdk)hHhT;J5|Ij^-D>imzs@&aZ0H)VYdVVL
z1ipWR+knCMeK`N7`vF*%#YO%_+Z*6+_#Jl!#u!$s6@nm$d>=#t7`n#azdM8D&fvN(
zY}?Kly2dNj8mi?I0LT<D#^8A#mWz3$C`1BKN_nkPhT~q#-5I*ZbNK>lm9m_d8bIXQ
zajyXYK@i9>LWuk=QUD<GIoJviyB8-M0O~JlxVY?LxtJrDFG$4t82}I|3XuSW5E)u=
z_1*<A7FI$k09921gcppc`>Vf00AV`BxCp=K2e7powgMWBhMX`S4IxTTRD_}^I66Ao
zSbQC@EebmU0ARlK;CUVZKv9%?pACW_IRFUL0ED{{fc28Q4<Hr?kQ^YIX_~x9o&g9W
zFdhw&%NHbIy*#5V9veU@<;%q!bxoJw{^IkJ9Pf6!>HaG=bZujDuRq9`rYZYU2c*#+
a0sjFVBNX2O*jIc20000<MNUMnLSTYvWg)Tv

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite6.png b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite6.png
new file mode 100644
index 0000000000000000000000000000000000000000..71598eaea71c8b056ad065142dde1d052065dadd
GIT binary patch
literal 687
zcmV;g0#N;lP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000id
z000id0mpBsWB>pF8+1ijbW?9;ba!ELWdK8EY;$>YAX9X8WNB|8RBvx=!KdMT0006y
zNkl<ZScUD@zi-+=6bJAx14dvI(1`)Zs`#O*WV70go^DE%t*ZL3R_(;Z*j8*Iiuj?*
z21Upza5UnU>kz$*jTE~slu9jcv2=IhKJVS*?3_{xe=~Cb41ja4y4`N>{{>uKUa0HA
z0K?HZ6Jl?G_wU}S&tJYC2C!Xj&bg|wDh>j0T~|4F9Une^(i>e}UMSNn;pTRTe!qVh
z0G+q%y6V--HUMC~{(-E0uor-1*I}9^1hYF#10TcDIOlnu>h*f5kW@glxm?#(mSv$*
zws1WdpnOsR0MOWCB{YC@t|sGAYBe$g9J`K(jYJrRvCSz67Om3W0RVKi_NfyC_|q8x
zz_IJ_r?b?iOa!!BO?Cd}HRj=WgkcEFvS1j7o}Y|IXf#_W79Pi_GE|kF0hIAPyvJs<
zfn_~qY8VD4;}Psr2ZmvwSTHmodQ7Y3BJmg!0i1JHEEt%F_W%$>5a6uS(b)rllu}no
zN~xPNGa%Y<>-8D{(0Jh>nB8drWlQm}k&sgA`JDlbF-R#PgaBg<HCDyV?NC>N#;N?2
zwGcwDnFc-pJc~#KM1Q2wY@x=gn0)h*&*$~JXj4*9BMKp~S}uMM;CY^&m<B%1Ivtp1
zDfW*bK=j=A4xkRFSgeFDF&zN`qECV+ZJr1Ko*Hp`bKvm?q>Jde*b9J~i~!TX*YAMU
za)I(mC3Zhh2qAvy)tm|d0LB;q=!<1L2$c0(AQeE-ZZ%_zvVQgK4EU3A1RMcJz)#|d
V@X#mXG2{RM002ovPDHLkV1mbkFCPE^

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/meta.json b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/meta.json
index 33dc4fa073..02e5b17b2b 100644
--- a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/meta.json
+++ b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from TGMC at commit https://github.com/tgstation/TerraGov-Marine-Corps/commit/4bf5d1aafbcbbb7bd2a7d0f52ef87f28e2bbb384",
+    "copyright": "Taken from TGMC at commit https://github.com/tgstation/TerraGov-Marine-Corps/commit/4bf5d1aafbcbbb7bd2a7d0f52ef87f28e2bbb384, grey ones recolored by rosieposieeee (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -24,6 +24,24 @@
         },
         {
             "name": "stalagmite6"
+        },
+        {
+            "name": "grey_stalagmite1"
+        },
+        {
+            "name": "grey_stalagmite2"
+        },
+        {
+            "name": "grey_stalagmite3"
+        },
+        {
+            "name": "grey_stalagmite4"
+        },
+        {
+            "name": "grey_stalagmite5"
+        },
+        {
+            "name": "grey_stalagmite6"
         }
     ]
 }
-- 
2.51.2