From fe1c301be5bcd25f77e4411009cb01defd1d849e Mon Sep 17 00:00:00 2001 From: ERROR404 <100093430+ERORR404V1@users.noreply.github.com> Date: Wed, 20 Dec 2023 09:57:02 +0500 Subject: [PATCH] New plant (#22704) New plant --- .../Markers/Spawners/Random/pottedplants.yml | 5 ++-- .../Structures/Furniture/potted_plants.yml | 22 ++++++++++++------ .../Furniture/potted_plants.rsi/meta.json | 17 ++++++++++++-- .../Furniture/potted_plants.rsi/plant-26.png | Bin 633 -> 636 bytes .../Furniture/potted_plants.rsi/plant-27.png | Bin 725 -> 633 bytes .../Furniture/potted_plants.rsi/plant-28.png | Bin 624 -> 725 bytes .../Furniture/potted_plants.rsi/plant-29.png | Bin 593 -> 624 bytes .../Furniture/potted_plants.rsi/plant-30.png | Bin 0 -> 593 bytes 8 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-30.png diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/pottedplants.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/pottedplants.yml index 36b646a3e3..a61af1467b 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/pottedplants.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/pottedplants.yml @@ -35,6 +35,7 @@ - PottedPlant22 - PottedPlant23 - PottedPlant24 + - PottedPlant26 chance: 1 - type: entity @@ -46,12 +47,12 @@ layers: - state: red - sprite: Structures/Furniture/potted_plants.rsi - state: plant-26 + state: plant-27 - type: RandomSpawner offset: 0 prototypes: - - PottedPlant26 - PottedPlant27 - PottedPlant28 - PottedPlant29 + - PottedPlant30 chance: 1 diff --git a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml index 98f5a001da..72a445a8a4 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml @@ -235,34 +235,42 @@ - type: Sprite state: plant-25 -#these are all the plastic plants. They inherit from the first one because they don't have -#enough differences to warrant getting a unique abstract prototype. It's just the name and description. - type: entity id: PottedPlant26 parent: PottedPlantBase - name: plastic potted plant - description: A fake, cheap looking, plastic tree. Perfect for people who kill every plant they touch. + description: Is it just me, or is it blinking? components: - type: Sprite state: plant-26 +#these are all the plastic plants. They inherit from the first one because they don't have +#enough differences to warrant getting a unique abstract prototype. It's just the name and description. - type: entity id: PottedPlant27 - parent: PottedPlant26 + parent: PottedPlantBase + name: plastic potted plant + description: A fake, cheap looking, plastic tree. Perfect for people who kill every plant they touch. components: - type: Sprite state: plant-27 - type: entity id: PottedPlant28 - parent: PottedPlant26 + parent: PottedPlant27 components: - type: Sprite state: plant-28 - type: entity id: PottedPlant29 - parent: PottedPlant26 + parent: PottedPlant27 components: - type: Sprite state: plant-29 + +- type: entity + id: PottedPlant30 + parent: PottedPlant27 + components: + - type: Sprite + state: plant-30 \ No newline at end of file diff --git a/Resources/Textures/Structures/Furniture/potted_plants.rsi/meta.json b/Resources/Textures/Structures/Furniture/potted_plants.rsi/meta.json index 72ae51dc54..19f57fd672 100644 --- a/Resources/Textures/Structures/Furniture/potted_plants.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/potted_plants.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation", + "copyright": "Taken from tgstation, plant-26 made by Fazansen(https://github.com/Fazansen)", "size": { "x": 32, "y": 32 @@ -227,7 +227,12 @@ "name": "plant-26", "delays": [ [ - 1.0 + 5, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 ] ] }, @@ -254,6 +259,14 @@ 1.0 ] ] + }, + { + "name": "plant-30", + "delays": [ + [ + 1.0 + ] + ] } ] } \ No newline at end of file diff --git a/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-26.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-26.png index a79b9e2da8c8a60ca18040f0806d06ebb0424aa5..10b4667d89d5e65cbac9d31d764b560e170c88db 100644 GIT binary patch literal 636 zcmeAS@N?(olHy`uVBq!ia0vp^3xL>xg&9cZFHM{Sq!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb#MAiyWY6-YZpTD<$upkc10?4fmET*bc9GqFB& z{=HREt1>N&^k#I{#fNwoBuDkfxC0fhyqw?!q!>$r{DK)Ap4~_Tagw~{P+VW9&mr)xt7&2XY!N@#cXW*T5I-x*q-`};akVU9q%?SX@33t;H=&6 z)Yea%d${wx`L;ccn({ei(y8yvcE4^uHe=K0-e$R9j-tF(DFS;pwa4A$Zu;a{vac}V z^}%L^jNHekBx1|>{P>^TnbCbPkw0wvlU-GB=HI`Toh5YIqUE8>b-nD11#4Vo9wkOM z7mKYJptc`vavbTz)POW;cD6&B<>1PUYn1%ugcj zQHMT1jhwab?$XTVYgJ`JY&L)Ud+*lI`{FbB7Np<&^g3tf3~fpF6Y@XXud=Q?{Cd#? z=Ti?)i1{qF**_umTe0EPPk)>~o(R@tuQ>VU|Ne%z6GTq@oG07*MOJ)L@*Br1W;q4> z-rifF{`b_9_d6!+d)!pr&-%_<55jT!)%Uk$1y~%+-0}WKGYA7^FYJ2^6ykmfQu?EL z1rYB5tJ`$C_B-!g3!&I2E{t8k_~T2B@J#ddWzYh$Ie-`hE(K2pQJ$`TF6*2Ung9if BA^HFS literal 633 zcmV-<0*3vGP)~dsUpzKiLogZN+(YW z-W24aP%vZ@1Yv_sjk9#P4)rOjt)Dwd9SVJm(D&Wld*8e7?tuUJr(kO=?wNv0&hSr z_HSI%iST<)b>viWdI7=h$si`Z008={@unC_NKd4c`qegHJcT=7;ClQ60AN{` z^m@@ZVFYon*Yjha-oHUG)@U@CtPmjqlu|Yr3^1F`FdmOL@;nw4A}T_-2ROOoI5<7n z!?({L{MYaFU=NPtgo?`rlv3t-9`ihp!PZ!<3|1?HmGla$mEp(um|&kILAVFH-7W|r z@Lqle>_Fn}>T3hT;SjFtiY^I2;uKIyS-oBdAtZ8)>$>Ro`}sE^2O%W3!Z>lc2mpX; zwF*^L{eRwglgUJy9LR7J7K_ESQ}Yp!7lZ{^mZcbm5j(~(4C(7Q(_65PG;hH#8|^vJ TmYUf800000NkvXXu0mjfql6`8 diff --git a/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-27.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-27.png index 1019885b91b012cd35390112077b9f5a79cfd670..a79b9e2da8c8a60ca18040f0806d06ebb0424aa5 100644 GIT binary patch delta 608 zcmV-m0-ycW1^EP!B!56jL_t(|ob6RTXxl&-eJai35{SWD&r?C*twy0s$qk+}+E8ar zpwZUBTQDgUPtBmIBGAl;EuYcF`W1rr?K`_>6G?=UqApw+9 zHW&;ro6RsDk2mr>78D{XLbwMwx#KuEJ=nvy&ma8P@AO~~j^l)i%LSBD=6N3TJdeTF zSgj0JD}$Bv3agdj$M~3FpCm!J2fE!Z2qExZeg*76;_d2d1H<7EuIq{}2|(f$P)b?7 zUI!s0a#@V)y6E@&`8Od4AtbiKIB~fM0Dx+>3RPA8f8KbL$wZnQ$Z!)Di^a54^AV62 ugaufZr5J`0JH{{!>FYStTdV>EYz<)JH{KMo*SlN)u*|(*| zdLS$VxF--lf8cX$+V5l+b9Rv{xBU9pm~vQ>>_;e9Y{J3(V>9&Cq2;e zh){l6B3f9Y6fu^&g6dMO0Fsqp_XGkU_kyt9!0Rk2{%yseu(9=2>p$7&^eVpi{S`}l z)-2hNko^elZhw6xute(`BaVTuyiQX7=Hx=LQ=7N1ijFhwG1qygU*tt1Ir6!?;Q-at z&ytW=fiezfbF;S~wy@Kr*vb;ZW+aU3HeXk_3cz14h3rSjy@yx=*BEihgKs-cBEN~x zwl0ZVcAxaBJ&7qE4vB%@7bv9{Z02(FJ0MTev3I>Dw#sq^wOAQDX jFC?&Y8upsAY7X!ljOZ9*K>Flf00000NkvXXu0mjfNW)-w diff --git a/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-28.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-28.png index d5cbefe63a2a9f0f59412e1da1e35d4132695fed..1019885b91b012cd35390112077b9f5a79cfd670 100644 GIT binary patch delta 701 zcmV;u0z&=p1l0wQB!8SqL_t(|ob8rDNKV>EYz<)JH{KMo*SlN)u*|(*| zdLS$VxF--lf8cX$+V5l+b9Rv{xBU9pm~vQ>>_;e9Y{J3(V>9&Cq2;e zh){l6B3f9Y6fu^&g6dMO0Fsqp_XGkU_kyt9!0Rk2{%yseu(9=2>p$7&^eVpi{S`}l z)-2hNko^elZhw6xute(`BaVTuyiQX7=Hx=LQ=7N1ijFhwG1qygU*tt1Ir6!?;Q-at z&ytW=fiezfbF;S~wy@Kr*vb;ZW+aU3HeXk_3cz14h3rSjy@yx=*BEihgKs-cBEN~x zwl0ZVcAxaBJ&7qE4vB%@7bv9{Z02(FJ0MTev3I>Dw#sq^wOAQDX jFC?&Y8upsAY7X!ljOZ9*K>Flf00000NkvXXu0mjfFdkrU delta 599 zcmV-d0;v7f1@HurB!4$aL_t(|ob8rPXwzUA$A1wwKSq$EZXJXjbD0V~cr+k82qGxb zA_yXaFuVv3!GnnGENX7zNyZMdG|2F)f~_gdbX-z2IVYxC>M`4_V;F-igrEM9(n z(QWR1XQ#Uz2=Wi2*!%tQmj^MW=0iFCitCtnBCfz${T50dn;Q?o#2E^(sQf4h1)y+U zcLBCrTWs0gP=BlX+b)XvA%t;Ke$?y?HH4zr;*VL5pE$+-u_N4mv@)>Pw4u8F5F{&}6_%nG0z=KFD zsTt69ou@Z1MDDFVyU&f!J5uIS0OfKSP19IOFsapQIF2I)AT@-=Vi8T#Vq+Y~!Llr= zA(XlWnoy=CUSSekCIA41LLo3{;;Cpho6_bm!kaLc%MF{F4M0{(4Pe{0Vwz@RjA@!u l0|=78lqB!4$aL_t(|ob8rPXwzUA$A1wwKSq$EZXJXjbD0V~cr+k82qGxb zA_yXaFuVv3!GnnGENX7zNyZMdG|2F)f~_gdbX-z2IVYxC>M`4_V;F-igrEM9(n z(QWR1XQ#Uz2=Wi2*!%tQmj^MW=0iFCitCtnBCfz${T50dn;Q?o#2E^(sQf4h1)y+U zcLBCrTWs0gP=BlX+b)XvA%t;Ke$?y?HH4zr;*VL5pE$+-u_N4mv@)>Pw4u8F5F{&}6_%nG0z=KFD zsTt69ou@Z1MDDFVyU&f!J5uIS0OfKSP19IOFsapQIF2I)AT@-=Vi8T#Vq+Y~!Llr= zA(XlWnoy=CUSSekCIA41LLo3{;;Cpho6_bm!kaLc%MF{F4M0{(4Pe{0Vwz@RjA@!u l0|=78}OE1knVLB!3u5L_t(|oaL4;j1xf=#(zr)0#prZ3=LVZo2HUEk3zHtiKw~c z9I`>2JhLIeoH$FGR-CG;VUsGj)N&2!nlYuKiWO@Ham=#2>@73h1q3gdWd48Oy!Ymt zf&bk+n@PdEt4)3NeB;&ik9z3yE4zIG?%04Qaf&IyysJk&bbnR9Su^UP>-Kaa0C04n zvU(DyoL}K3amxKi_X_>y^sRaziBmqj5|v~9@utxJc-pnawI^_WtSV1)eXP7Pu`;1n z2$V_K)c=VE^RCV(qODnZzy>^tQ~Ki#t|aar0tQ7rNa7UWCRu;fZOzF8`MaM#X_H*A zCSbsgCX`7WU4N*9647bFlXs#J-@HH>@hRs(K2%la6oRs=4QL+Rgs4B>{Nkl5Yjk(3 zG`}oPzYB{sfvS@j<#W;gvRQ?o{PG$1HU)PUMv>u_j}gsbzv;uo_|iK01SsiZR-u|x4?j}Rx2*g zP5^lP5Z=6e2EdEgZvpUq-*!vDQHXrs&%gn`eEm6gd3NFq4h|leOeP2+c>ig8>zw6s ziBjs;@hY>+woNj~De?SOPd%`+$tq=eRf}jvy%xoiRg~wnLyTvnCKlkr#$x?VK diff --git a/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-30.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-30.png new file mode 100644 index 0000000000000000000000000000000000000000..c59c7e427765396e34829890dbadd712bf8e447c GIT binary patch literal 593 zcmV-X0y zFN_mG6vlr`2m(|MY77lou$!imIgdiL28pP-6$U6qKXx3264=?yX-A9-30_MnPmQd-@Nzcn}Pq`Jex_uysJ%p^?c*i^^bb!^DDc3 z0q)p-Kaa0C04nvU(DyoL}K3amxKi_X_>y^sRaziBmqj z5|v~9@utxJc-pnawI^_WtSV1)eXP7Pu`;1n2$V_K)c=VE^RCV(qODnZzy>^tQ~Ki# zt|aar0tQ7rNa7UWCRu;fZOzF8`MaM#X_H*ACSbsgCX`7WU8sW+(P_bxccKvAyg(W8 zDd#{wR8{5_g0ia(Xdc{zs6XEP;-xBUba$&XzbsC_3yU>@s*@PybJ6~?S%skd@)`Fw z1&0=r@UId8kWywOo_>q?{6J=7Q55~T_drUirIdQR-DYLfqtG^UT=un+VkxCwEEeqd zd)Di9VJzRCPNx72heK`a4ePhSfUj07F3(N?c>ECFynF`0i`Q=f@O|HQOTbZxeBaN& z0ls|wId*w=;tUQB9+*rf2qAd?X?yFO<#LHq>elfpv(8#6r5+3h2vPk%1W-ybo6VeV zgVTRN2vK{&I&!TL00@Gh5NmS_cDtQ3I5hZ@bvm6xm$pNoEwd&NMUfYVVeOnS44vh; f(OXcqL*9b#J^C|?2il2N00000NkvXXu0mjfMmH6C literal 0 HcmV?d00001 -- 2.51.2