From f152821da18ec1343f6927cab68fb772c38f7894 Mon Sep 17 00:00:00 2001 From: Kip Date: Wed, 9 Oct 2024 22:44:31 +1100 Subject: [PATCH 1/2] new dranks --- .gitignore | 1 + .../Locale/en-US/flavors/flavor-profiles.ftl | 1 + .../meta/consumable/drink/alcohol.ftl | 5 +- .../reagents/meta/consumable/drink/soda.ftl | 9 ++- Resources/Prototypes/Flavors/flavors.yml | 7 +- .../Reagents/Consumable/Drink/alcohol.yml | 35 +++++++-- .../Reagents/Consumable/Drink/soda.yml | 27 +++++++ .../Prototypes/Recipes/Reactions/drinks.yml | 29 ++++++++ .../Drinks/starrynight.rsi/fill-1.png | Bin 0 -> 245 bytes .../Drinks/starrynight.rsi/fill-2.png | Bin 0 -> 580 bytes .../Drinks/starrynight.rsi/fill-3.png | Bin 0 -> 913 bytes .../Drinks/starrynight.rsi/fill-4.png | Bin 0 -> 1178 bytes .../Drinks/starrynight.rsi/icon.png | Bin 0 -> 1407 bytes .../Drinks/starrynight.rsi/icon_empty.png | Bin 0 -> 523 bytes .../Drinks/starrynight.rsi/meta.json | 67 ++++++++++++++++++ .../Drinks/zombieslushie.rsi/fill-1.png | Bin 0 -> 331 bytes .../Drinks/zombieslushie.rsi/fill-2.png | Bin 0 -> 518 bytes .../Drinks/zombieslushie.rsi/fill-3.png | Bin 0 -> 782 bytes .../Drinks/zombieslushie.rsi/fill-4.png | Bin 0 -> 1136 bytes .../Drinks/zombieslushie.rsi/icon.png | Bin 0 -> 1363 bytes .../Drinks/zombieslushie.rsi/icon_empty.png | Bin 0 -> 619 bytes .../Drinks/zombieslushie.rsi/meta.json | 32 +++++++++ 22 files changed, 204 insertions(+), 9 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/starrynight.rsi/fill-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/starrynight.rsi/fill-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/starrynight.rsi/fill-3.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/starrynight.rsi/fill-4.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/starrynight.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/starrynight.rsi/icon_empty.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/starrynight.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/zombieslushie.rsi/fill-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/zombieslushie.rsi/fill-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/zombieslushie.rsi/fill-3.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/zombieslushie.rsi/fill-4.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/zombieslushie.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/zombieslushie.rsi/icon_empty.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/zombieslushie.rsi/meta.json diff --git a/.gitignore b/.gitignore index 2dd5912047c6..f3f50ab4b9d1 100644 --- a/.gitignore +++ b/.gitignore @@ -306,3 +306,4 @@ Resources/MapImages # Direnv stuff .direnv/ +Resources/Textures/Objects/Consumable/Drinks/thavenbadglass.rsi/master.aseprite diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index abe2cd0f41b1..d18aca580e08 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -271,6 +271,7 @@ flavor-complex-antifreeze = warm flavor-complex-cottonbool = like an angry cloud flavor-complex-genderfluid = transitional flavor-complex-thavenbad = like you need to pretend you like it +flavor-complex-zombieslushie = like frostbitten meat ### This is exactly what pilk tastes like. I'm not even joking. I might've been a little drunk though flavor-complex-pilk = like sweet milk diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl index e3d751c58188..2fb12df189f6 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl @@ -326,4 +326,7 @@ reagent-name-cottonbool = cotton bool reagent-desc-cottonbool = A modern take on a Mothrine classic that's sure to cause a buzzz. reagent-name-thavenbad = bad -reagent-desc-thavenbad = A traditional Thaven delicacy. It's considered a great honour to share one with a new friend. \ No newline at end of file +reagent-desc-thavenbad = A traditional Thaven delicacy. It's considered a great honour to share one with a new friend. + +reagent-name-starrynight = Starry Night +reagent-desc-starrynight = A beautiful drink fashioned in memoriam of a great terran artist, proof that your works will be loved in ways you cannot imagine. \ No newline at end of file diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl index 4f7ce93dab2d..b24f3387031e 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl @@ -52,11 +52,14 @@ reagent-desc-fourteen-loko = A highly processed liquid substance barely-passing reagent-name-shamblers-juice = Shambler's Juice reagent-desc-shamblers-juice = ~Shake me up some of that Shambler's Juice!~ -reagent-name-kingsoda = King Soda +reagent-name-kingsoda = king Soda reagent-desc-kingsoda = A drink fit for a king. Or a seven year old. -reagent-name-hummingbird = Hummingbird's Delight +reagent-name-hummingbird = hummingbird's delight reagent-desc-hummingbird = A favourite of adolescent Vox just about everywhere. -reagent-name-genderfluid = Genderfluid +reagent-name-genderfluid = genderfluid reagent-desc-genderfluid = Looking at this drink makes you feel... ahem. Well. + +reagent-name-zombieslushie = zombie slushie +reagent-desc-zombieslushie = Ice, Cream, and Raw Meat come together to create... this? \ No newline at end of file diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 939e06a598ed..a2565c33d78f 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -1218,4 +1218,9 @@ - type: flavor id: thavenbad flavorType: Complex - description: flavor-complex-thavenbad \ No newline at end of file + description: flavor-complex-thavenbad + +- type: flavor + id: zombieslushie + flavorType: Complex + description: flavor-complex-zombieslushie \ No newline at end of file diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index d94846359785..dcdaf9b76957 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -2429,7 +2429,34 @@ effects: - !type:SatiateThirst factor: 2 - - !type:SatiateHunger - conditions: - factor: 2 - fizziness: .1 \ No newline at end of file + fizziness: .1 + +- type: reagent + id: StarryNight + name: reagent-name-starrynight + parent: BaseAlcohol + desc: reagent-desc-starrynight + physicalDesc: reagent-physical-desc-inky + flavor: paintthinner + color: "#080e17" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/starrynight.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 5 + - !type:Emote + conditions: + - !type:ReagentThreshold + reagent: StarryNight + min: 27 # this should proc only once after drinking 30u in one go + max: 27 + emote: Yawn + showInChat: true + fizziness: 0.5 + \ No newline at end of file diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml index 726fdbda486a..e8a5f89e437e 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml @@ -309,3 +309,30 @@ metamorphicMaxFillLevels: 4 metamorphicFillBaseName: fill- metamorphicChangeColor: true + +- type: reagent + id: ZombieSlushie + name: reagent-name-zombieslushie + parent: BaseSoda + desc: reagent-desc-zombieslushie + physicalDesc: reagent-physical-desc-clumpy + flavor: zombieslushie + color: "#ff6fa8" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/zombieslushie.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:SatiateHunger + factor: 4 + conditions: + - !type:OrganType + type: Moth + shouldHave: false + fizziness: 0.2 \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index dcf7bf5feb04..6791398d5716 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -1499,3 +1499,32 @@ amount: 1 products: ThavenBad: 2 + +- type: reaction + id: StarryNight + requiredMixerCategories: + - Stir + reactants: + BlueCuracao: + amount: 1 + Vodka: + amount: 1 + Plasma: + amount: 1 + products: + StarryNight: 3 + + +- type: reaction + id: ZombieSlushie + requiredMixerCategories: + - Shake + reactants: + Protein: + amount: 1 + Cream: + amount: 1 + Ice: + amount: 1 + products: + ZombieSlushie: 3 \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Drinks/starrynight.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/starrynight.rsi/fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..28db883c84d980f0f59ccc61877dc5987c89bb24 GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a@KpgIEG|2 zzP+)R>yUv++r#xcZeF~2Fk0Y9_NT1aJd4_~iL>#>py`-GZ-6(?JG#y85}Sb4q9e0N9mi9smFU literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/starrynight.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/starrynight.rsi/fill-2.png new file mode 100644 index 0000000000000000000000000000000000000000..c831da465938b43cfe55d2a25c36332432bfe080 GIT binary patch literal 580 zcmV-K0=xZ*P)Px${z*hZRA_H(yH4k)9G()uCey=9@WY>^2HUl%{}VVHv;>|R2NQ7KRGZLmI**?w~j9a zPD0>JjFX#OLW;f~{-J)?ZUOLhy-YG|Q1jy$&G+Oc9|!U)cR(ki?E+AGwTR_@$F^!T z+gn&kNp;?((6Vt5Iv?~Mhzo<#z(2<#1kkYTp%$0e0tS~dk z|MnyOgf#gsw8_DBBu(67M1_=CQ#RX6YdXCNB>(c>4PZ5-b3 S$SPx&OG!jQRA_kVMEw(XGw=h1d8II>yXb_uT2>XAoubrex2j2-)TBv!+UDb&I?D9)yrb*&w*pp9&<_EYA|#rd(IZrZxaci zG7?07`WTm@Wq*tH|IOGyCOg)rKOzyg)3)Xu2}LFv)^aVC7m~99yHt%_(^_!9Pys45 zotj}EPX9{)wlo}N*I#v`4Y(MtJx!B5LEtZyBggguFdhtA$#HJ~Z-;4`;Xior zCJzHDqt|w^)IQDR=yJ<`;T~Nje_{HkdH~qa{yj#Gi|~hQSz%MDcROizn2h)JbFKRj zp2`k)B*si%bC4@@aQmVbtP33 z5dv|Y8)rP+y6fZlXo3~eI?xN(|GE6HE`ExV=w)!o&rm?&#u*RKMr?Wcg$ocGzVOyK zqfX-gsS|rLMoVWesByGRjFHSAXtGNRSplnT20bNbU-5`gEv5ghJD!Wlb_iGG?}FIn;n z?|_*|dKv)#&F@gtV`yragdRn8n1m+plD|7_ z0y!_aeXnU|LZ;ld$6V_9vY7wd-|6>!e#o+4dPx(R7pfZRA_iclzBV4=_j7TAy3kJ<6ib|VOM zc3D0o{F6!MoxJn@p8xZ{@AJ;Uw*G&b3M$G*$FQliAqn|6bbCfNNb8<>wZP4=A~r(| zanlns%bD76vzs=swa}I{6{{8}V?C4eH1?L8s4Zt`Tbo3J%6^KLL=uD~r2IW7Lq8%E zz79a1m_TlZnH$bkH~`NTZH;Ukq4?@Y&(7GPk&06^F`jbNpx|*a_@il6LFjh2UeEAcM$IpS?MnT>_ zs!H=YarEa%ADywA4^FjF^L#lLvneW*E9t?NCX5x$;Bhcl{2JJ8SPJWSuBdv|e02#Z zt;2onU9@3=`SS+>$WP0nAX{1h_so38?Yr-hqIHm)V~E1y%F<_-p*20r_?R>9d{qfZ zaE>AVeH)|8A9?1s-Q{6VIMNQyzkt`HrEJdyye^TcN&iwq#Uvp$3$2iXXefz0UsVEh z{t$){JE_C>0jSOTh|%AA=yEP93Mt2Wx& z8?h!-V-MNl^$qYJzWK~GOn3U(e?U*>juiTXxfJWhv3EJ5=BqvhBx7pi{*PNtNGS;< z&Ny*+LR@aO@=KSUd*fd6gklKAZ~rgFe{k_2E^jCOgTo9uTwHFo(l@G!iLW{V6C+vL03-wBcjf7s1v_*eX*QFQ>Z@?DM_-1zBZCdP&+sPAOP?ZH`H6E$D; zhfsO-cMIBrM+!c~FHPbNO(E$OCT6e4I;?8#dgf8}cip;(?01nU%;R=D@%qQs zh~GY`083tC`DsN7Pbgy9DJ9u@WG(;OSL9m{HAc->zXFb#mR(mt{3Kc5Bp}Zrho$AZ zt(nA>0G8Sog0c@e=#J`L)iq!xY4k=gnvp|Z0>b(yV0xqntsx6p5s+oynzEMN29c|v sYTdWMYWUHXYqf*N{}|XD{H>>d0NwUK42SzBrvLx|07*qoM6N<$f;(A1&;S4c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/starrynight.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/starrynight.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bcb4636d925f530cca385cd0cf02b0c7c2b7514d GIT binary patch literal 1407 zcmV-_1%UdAP)Px)IY~r8RA_Hq?YgahZr4B8hq}MC z+wDIFiQnX=J?EZtKEL1ZoZmh7T=-uPpBw>6T5cO2D5WJJZLsK|bD`-lU@3m8lo74c zXR%1bOBi8L2|~30sgN8#q&XGZKM?gvof63fw9F(MLHC*$})|F>NLoVbi!5M@LF7&lj7v^ zbGiAPcFZoNcz1=leIHc*lF{k$Nm7McKtU!dAsexz9I5X|gtC_bDAubeT4AI>uc5E+ zCfEONAw!*yB#zPJlc-Q9Hv`lBmBw0BS$YbLdHmIK0?W2NIPIh4YO>I466Y&rSy5U? z2nhXGoOT}I+3mGduFj({cZwS~GysHsP6Ts(BK}5IMco_d^9soz2SFR8?$t)}jBC&v z^sHU2WL=p#Vg8Zk`{-5bTJem1#hClcY7~)JHs>O;N%l{JqoJJPvCXwag6$-4V91ttpSCQgI-gWa=xqp zDE&b+16H*Cw*lB{_>jRXopg1DIQzrCnRY93&+_e;dpL6RC=RPbmH~1kxJJky7=q@ceoFojL|`Kcz@NhV2iL4-UTtfOBXl9v_$HUpz$7 z0{(#mO?22qhR?i-S~1D^@T$1^vi4|4K$2<=&(S{-dEnI693!OBF}l8j;tY{|qZU(^ zg!586XU-qQtg7cb=g&N;H>Bj0wvcb!|2u`(d)Tlki~LnN^aP5iR1RZpvBk}ol>)s! zC!$U}Q~vYnA;cUNnPYZro*)+*&HUP8<<_v5Vxba(smuRp{5vPN;PN)pbF-hDHWwEf z&2$fDB*d2$fO2&{BLm;es|$BQp5rZ3pA# z%YGGpZ(Tvmdjb4pn_pupG(jjV#%!027US!4rZ8nZHwLHV4!q3#e*p@u1&l#N+b;kB N002ovPDHLkV1lxbthoRH literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/starrynight.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/starrynight.rsi/icon_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..34068287bfc55451b234e90b8ca021816189323b GIT binary patch literal 523 zcmV+m0`&cfP)Px$#Ysd#R9J=WmCs57Q543%5j8C{a{9wq;>sw-D5!-k!i^BEf*zxKg^1`CqE~Pi zgo_B=R74x0AZAgvG0F+TiBOm*@wTu*CdavV#u;nTw;ARz=iDFPJ?9MYufM7SKzebG z$0(?ZB9VItVWh)a7a>dm=4&+$00g&AXH^bx{VJ#` z07Ml<$00b{2fL4i%m#rQwG~SQfR!O2;sumCaPkHe-}QM~&dwxfdIlBXutEqQXyoG_ zayh;@w=GE$M%4NqE${BBd{7&X$?Lp1fR|P%*$>E#_TscWEte+KDfp@LqhkR8me*Eg zD|uZ3D4$AOEH6n+#f@?;0~kqwb1qm0Q0^ZDfZYYh0i2dC02$7$=fCejD$H|9zb8{_ za7$AY(G38|h$6Lccx*sUg?Z|tV{)LV(#OfJm;e&Nh+*7`QMBcNwh^5e#jYGMn}kj| zwg7k^$ED9Ix<)k9LOdq(KJ&kzB>(`}oF3J^YnR_`A20*V1oiKI-z(Wj*@_DQZiyM- zqS_woPx$1xZ9fR9J=W(7j5-a1_SjpS2MRl8g#=u$zllAdcRGqqynd(%DInCzst;*NT<#zMi>?b9Ya1aC}Zl9&b8dSA%9Q#7^l1?A&Y$<7mL`gu;qD1okkx3sN5U_aGqt8*|TlqBqQ#M d!nE%1eF7@Px$z)3_wR9J=Wk}+r#VHk#=G)-$uyi17X($qpL4la%bsW>=vC;<@)g@U*`=%Ap3 zIEYZ(+#Fm4X>{n&p&bONh_pC~Rfr_lB8j$|q{^jtJ<{AIX?~}ui{!sST>fYLzL)oV z|Cb*W3WY+UP$(1%NknE_m^WVtA%y6rou5p1)pY2Q6&4FcYK=M@*H>6b-~a1@h4dXU zF?LbbmR?!m_wp`!B1Y=`6#jCPx7U`$#KW0TXP-&m7V)FQXwf(!A^k4-2J}P>fb!Za zJ{7je7dKg*dn^E+Oy3eo?Igpx#*krfEIA|{Ak_VzKVCa$B}Rx zfa51daV(oNk7lKP<-7U=(=_?K@rKm;T@o>$zGy$jh(Xn=2KJKv1D(UEY=l$uQgL7AR#pi+YcaIGJd7PDxllei;iF`_z$-U0oUU0S7g^tEhsJOA$j zw29zYHt%n&5b>*c&KKHsn{dsdR^1_=Tc>w?JWzmOeE}aXKM=zCMyuh{^j-G$EygN& zvP5vS0j}h7fjk2>05I_J833<6@7L_BrlIfGDYV-`?fySM0dVM~HL2`Spa1{>07*qo IM6N<$f)~{6bpQYW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/zombieslushie.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/zombieslushie.rsi/fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..dd73072271757614bda42055f28f4366fcac68a5 GIT binary patch literal 782 zcmV+p1M&QcP)Px%$Vo&&R9J=WluKw6Q51&1Bu(11lSyKWX;LFT!7cP~Sbg5q=G!i}y) zMA4;tL3E=oTqvk0T1CYA!gpzHVhv4eA4yx2Ofq@QOeb?)Xx(;36gT;nhjae(bI!RJ z8Z>Coph1HM^U!pNmrAJHoQ?td!`x``VUKx2>#SJlJWY07KKM zTXou^AyNZFBqn+Y`lA$U8BV>vXG`1m4Wx(Dl#Cjp#lyhY&(uwmp|KP`pO3_+0mkz0 z=n8ieYK^dd*)F@X_E#{SnIhO8BDQ54`t4Z|us9YcJuysH>7zr66Ana?r7$jG|8dzi z5NraBu_g^A6Y-hihX1Jih-3tzMwT z69!<>vN*+@!iI~xZR)Z7e{H~NuRccOM}Bq9Z=YgL-FQ<#(Q@tF!i zCGqbJSa>Ps6h5A~gICX^6-TjZ3Z6=iN`8#QU@uKempU@wY+k^p{TGBNPGA};v${&5 zlw(OYK|fxKvY(@agN`&EO#r|@a2R M07*qoM6N<$f@bY!<^TWy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/zombieslushie.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/zombieslushie.rsi/fill-4.png new file mode 100644 index 0000000000000000000000000000000000000000..9604cc5ad6c5fd78579ed98a29be797a3755af11 GIT binary patch literal 1136 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 VOkC~l0&xHU002ovPDHLkV1l+}cf|kz literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/zombieslushie.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/zombieslushie.rsi/icon_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..168e8479911b028304c95bbaee68f7650024d918 GIT binary patch literal 619 zcmV-x0+juUP)Px%B}qgRk?8kej$v5h*l4A<{?O}SbM(8^zU z@Ic_@vmI{V&GGFEoIMAF`Th03>!fpUUhQ!IVJ=+@aN?w+fQifR<;mMC(*T_~05E$i zRPR1qZOYYWTCB+dN>RjW5V&v~ktyKuweWeNpJ6>-4FXD0WPIqPkDByRknFxK0nIFH z*MU~{Lq-MwKGj9y-Ok>E(??Mw`Q`xxiwra#gR283`;7ud@}5_jiqo-e1~e*DF<@Gx`q@1IEFI7f za&f?h+**K!&Vc^Xbpy_wu-mW}Fg`?TzbOObL-qo4wuMWZKsACOfRC-6*b>yzro8}b z2ksr;3!-hU4Xg_x`9T3F9D(Iu`{zcF!TO)%-t-A>#9!PJE(!o28}0xA002ovPDHLk FV1kB469fPN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/zombieslushie.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/zombieslushie.rsi/meta.json new file mode 100644 index 000000000000..537e25d80a1b --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/zombieslushie.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "ghostphasemoon", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + } + ] +} + From d1f28e988416301f5fd53d3bf06f0b58badba3e8 Mon Sep 17 00:00:00 2001 From: Kip Date: Thu, 10 Oct 2024 17:34:59 +1100 Subject: [PATCH 2/2] fix --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f3f50ab4b9d1..d064c42bb110 100644 --- a/.gitignore +++ b/.gitignore @@ -306,4 +306,4 @@ Resources/MapImages # Direnv stuff .direnv/ -Resources/Textures/Objects/Consumable/Drinks/thavenbadglass.rsi/master.aseprite +