From 65545b21ac11808ac078fe8481e1ed69ec779833 Mon Sep 17 00:00:00 2001 From: rosieposie Date: Tue, 13 Feb 2024 19:00:58 -0500 Subject: [PATCH] stalagamatmatmiets stalagamatmatmiets --- .../Objects/Decoration/stalagmites.yml | 49 ++++++++++++++++++ .../Entities/Objects/Decoration/flora.yml | 12 +++++ .../Flora/flora_grey_stalagmite.rsi/meta.json | 29 +++++++++++ .../flora_grey_stalagmite.rsi/stalagmite1.png | Bin 0 -> 914 bytes .../flora_grey_stalagmite.rsi/stalagmite2.png | Bin 0 -> 683 bytes .../flora_grey_stalagmite.rsi/stalagmite3.png | Bin 0 -> 822 bytes .../flora_grey_stalagmite.rsi/stalagmite4.png | Bin 0 -> 822 bytes .../flora_grey_stalagmite.rsi/stalagmite5.png | Bin 0 -> 692 bytes .../flora_grey_stalagmite.rsi/stalagmite6.png | Bin 0 -> 687 bytes 9 files changed, 90 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Decoration/stalagmites.yml create mode 100644 Resources/Textures/DeltaV/Objects/Decoration/Flora/flora_grey_stalagmite.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Decoration/Flora/flora_grey_stalagmite.rsi/stalagmite1.png create mode 100644 Resources/Textures/DeltaV/Objects/Decoration/Flora/flora_grey_stalagmite.rsi/stalagmite2.png create mode 100644 Resources/Textures/DeltaV/Objects/Decoration/Flora/flora_grey_stalagmite.rsi/stalagmite3.png create mode 100644 Resources/Textures/DeltaV/Objects/Decoration/Flora/flora_grey_stalagmite.rsi/stalagmite4.png create mode 100644 Resources/Textures/DeltaV/Objects/Decoration/Flora/flora_grey_stalagmite.rsi/stalagmite5.png create mode 100644 Resources/Textures/DeltaV/Objects/Decoration/Flora/flora_grey_stalagmite.rsi/stalagmite6.png diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Decoration/stalagmites.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Decoration/stalagmites.yml new file mode 100644 index 00000000000..1a307447ffb --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Decoration/stalagmites.yml @@ -0,0 +1,49 @@ +- type: entity + name: stalagmite + description: Natural stone spikes. + parent: FloraStalagmite1 + id: FloraGreyStalagmite1 + components: + - type: Sprite + sprite: DeltaV/Objects/Decoration/Flora/flora_grey_stalagmite.rsi + state: stalagmite1 + +- type: entity + parent: FloraGreyStalagmite1 + id: FloraGreyStalagmite2 + components: + - type: Sprite + sprite: DeltaV/Objects/Decoration/Flora/flora_grey_stalagmite.rsi + state: stalagmite2 + +- type: entity + parent: FloraGreyStalagmite1 + id: FloraGreyStalagmite3 + components: + - type: Sprite + sprite: DeltaV/Objects/Decoration/Flora/flora_grey_stalagmite.rsi + state: stalagmite3 + +- type: entity + parent: FloraGreyStalagmite1 + id: FloraGreyStalagmite4 + components: + - type: Sprite + sprite: DeltaV/Objects/Decoration/Flora/flora_grey_stalagmite.rsi + state: stalagmite4 + +- type: entity + parent: FloraGreyStalagmite1 + id: FloraGreyStalagmite5 + components: + - type: Sprite + sprite: DeltaV/Objects/Decoration/Flora/flora_grey_stalagmite.rsi + state: stalagmite5 + +- type: entity + parent: FloraGreyStalagmite1 + id: FloraGreyStalagmite6 + components: + - type: Sprite + sprite: DeltaV/Objects/Decoration/Flora/flora_grey_stalagmite.rsi + state: stalagmite6 diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml index 791127170f2..5940e42ab9c 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml @@ -176,6 +176,18 @@ - type: Sprite sprite: Objects/Decoration/Flora/flora_stalagmite.rsi state: stalagmite1 + # Delta-V - modify max damage of stalagmites to be *far* more sensible, stalagmites are very fragile IRL, and give it a noise too + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: GlassBreak - type: entity parent: FloraStalagmite1 diff --git a/Resources/Textures/DeltaV/Objects/Decoration/Flora/flora_grey_stalagmite.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Decoration/Flora/flora_grey_stalagmite.rsi/meta.json new file mode 100644 index 00000000000..4b8c7f5fa81 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Decoration/Flora/flora_grey_stalagmite.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGMC at commit https://github.com/tgstation/TerraGov-Marine-Corps/commit/4bf5d1aafbcbbb7bd2a7d0f52ef87f28e2bbb384, turned grey by rosieposieeee", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "stalagmite1" + }, + { + "name": "stalagmite2" + }, + { + "name": "stalagmite3" + }, + { + "name": "stalagmite4" + }, + { + "name": "stalagmite5" + }, + { + "name": "stalagmite6" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Decoration/Flora/flora_grey_stalagmite.rsi/stalagmite1.png b/Resources/Textures/DeltaV/Objects/Decoration/Flora/flora_grey_stalagmite.rsi/stalagmite1.png new file mode 100644 index 0000000000000000000000000000000000000000..f3da176d53ec50af270823fbf4df4e58e5adbee6 GIT binary patch literal 914 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 AssI20 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Decoration/Flora/flora_grey_stalagmite.rsi/stalagmite4.png b/Resources/Textures/DeltaV/Objects/Decoration/Flora/flora_grey_stalagmite.rsi/stalagmite4.png new file mode 100644 index 0000000000000000000000000000000000000000..0c0b6f81dae397fa1f4331538bc61ea20deed43c GIT binary patch literal 822 zcmV-61Ihe}P)pF8+1ijbW?9;ba!ELWdK8EY;$>YAX9X8WNB|8RBvx=!KdMT0008P zNkl{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&@#EAe75B81#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*Ze4!WvQ{P9;>3Vk>7?=$} zHC2sOi~bUI|nU!qpHB>idY6YHyQJXB%S`%&^H|BR-IcYt?*KRwQ%-;B5QMF0Q*07*qoM6N<$g3{S_ AJpcdz literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Decoration/Flora/flora_grey_stalagmite.rsi/stalagmite5.png b/Resources/Textures/DeltaV/Objects/Decoration/Flora/flora_grey_stalagmite.rsi/stalagmite5.png new file mode 100644 index 0000000000000000000000000000000000000000..5fee678add7d61ae062d15805f66d5ea9d27b298 GIT binary patch literal 692 zcmV;l0!#ggP)pF8+1ijbW?9;ba!ELWdK8EY;$>YAX9X8WNB|8RBvx=!KdMT0006% zNkl5*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|limzs@&aZ0H)VYdVVL z1ipWR+knCMeK`N7`vF*%#YO%_+Z*6+_#Jl!#u!$s6@nm$d>=#t7`n#azdM8D&fvN( zY}?Kly2dNj8mi?I0LTlm9m_d8bIXQ zajyXYK@i9>LWuk=QUDVf00AV`BxCp=K2e7powgMWBhMX`S4IxTTRD_}^I66Ao zSbQC@EebmU0ARlK;CUVZKv9%?pACW_IRFUL0ED{{fc28Q4HaG=bZujDuRq9`rYZYU2c*#+ a0sjFVBNX2O*jIc20000pF8+1ijbW?9;ba!ELWdK8EY;$>YAX9X8WNB|8RBvx=!KdMT0006y zNklkz$*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#PgaBgN#;N?2 zwGcwDnFc-pJc~#KM1Q2wY@x=gn0)h*&*$~JXj4*9BMKp~S}uMM;CY^&mJde*b9J~i~!TX*YAMU za)I(mC3Zhh2qAvy)tm|d0LB;q=!<1L2$c0(AQeE-ZZ%_zvVQgK4EU3A1RMcJz)#|d V@X#mXG2{RM002ovPDHLkV1mbkFCPE^ literal 0 HcmV?d00001