From fbc4254ce7d17797172bc5811e26e71024d8eca4 Mon Sep 17 00:00:00 2001 From: Adrian16199 Date: Thu, 6 Jun 2024 11:30:06 +0200 Subject: [PATCH] eh --- .../Locale/en-US/deltav/markings/felinid.ftl | 4 + .../Mobs/Customization/Markings/felinid.yml | 13 -- .../Felinid/tiger_tail.rsi/meta.json | 2 +- .../m_waggingtail_tiger_primary-test.png | Bin 3110 -> 0 bytes .../m_waggingtail_tiger_secondary-test.png | Bin 2926 -> 0 bytes .../m_waggingtail_tiger_tertiary-test.png | Bin 2591 -> 0 bytes .../Felinid/wagging_tiger_tail.rsi/meta.json | 173 ------------------ 7 files changed, 5 insertions(+), 187 deletions(-) delete mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_primary-test.png delete mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_secondary-test.png delete mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_tertiary-test.png delete mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/meta.json diff --git a/Resources/Locale/en-US/deltav/markings/felinid.ftl b/Resources/Locale/en-US/deltav/markings/felinid.ftl index add82918ea3..cac87110ac3 100644 --- a/Resources/Locale/en-US/deltav/markings/felinid.ftl +++ b/Resources/Locale/en-US/deltav/markings/felinid.ftl @@ -5,3 +5,7 @@ marking-FelinidFluffyTail = Fluffy Tail marking-FelinidFluffyTailRings = Fluffy Tail with rings marking-FelinidAlternativeTail = Alternative Wagging Tail marking-FelinidAlternativeTail-m_waggingtail_cat_FRONT = Alternative Wagging Tail +marking-FelinidTiger = Tiger tail +marking-FelinidTiger-m_tail_tiger_primary = Primary colour +marking-FelinidTiger-m_tail_tiger_secondary = Tip of tail colour +marking-FelinidTiger-m_tail_tiger_tertiary = Stripes diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/felinid.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/felinid.yml index 7083db7cfb7..dfacda5154b 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/felinid.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/felinid.yml @@ -39,16 +39,3 @@ state: m_tail_tiger_secondary - sprite: DeltaV/Mobs/Customization/Felinid/tiger_tail.rsi state: m_tail_tiger_tertiary - -- type: marking - id: FelinidWaggingTiger - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Felinid] - sprites: - - sprite: DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi - state: m_waggingtail_tiger_primary-test - - sprite: DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi - state: m_waggingtail_tiger_secondary-test - - sprite: DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi - state: m_waggingtail_tiger_tertiary-test diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Felinid/tiger_tail.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Felinid/tiger_tail.rsi/meta.json index 7b725574c8e..9b91c3a2f8d 100644 --- a/Resources/Textures/DeltaV/Mobs/Customization/Felinid/tiger_tail.rsi/meta.json +++ b/Resources/Textures/DeltaV/Mobs/Customization/Felinid/tiger_tail.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "null for now", + "copyright": "Taken from https://github.com/Bubberstation/Bubberstation/commit/4485ffb39b8c824167ef23a217bfe335b545778a on Bubberstation fork.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_primary-test.png b/Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_primary-test.png deleted file mode 100644 index aa57011619fd7b65e429a470f9471ad45e1efdb9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3110 zcmcJRX*e6`7RO_&owlmRbV4*$hOv}Ri&TlIRE=6%qIR{UwlGv^V((>AZ5dm&wpgmD zb)*Doq_oo_Vwu_#Le-WujD5>;JNMpC^W2Z-!+GBGKJW9K59fE@|M@?#zYdp``c?`6 z0LWTjwRHS?&Hw;H0Er`CvzIEEv9A|YAPi<7=<5prXl6!bQf-7CPP|VDx}D==54B8^ zet7bT!%>~Lpo^mxvQ3jqyHc?-hS#prOKhb}uMEE!D-)EoKn_M291$taBjEP&OVB zV)>TfjW8uYQ!U)>bRF%M&X77-Z)+MYgvULAIJrE!3jEa+XZ;i;^!kh@!7BZ@ucLI< z1hZqUJuIm#=KMYOP5pP7YTBNZD*xsDto)Ov>UQaAy}an+08B*L&=e4`nC(xNy&o(d zj4cOYG>nKGgOuc?id!X(STtw6=NY)T?a5@q2ybf&5c0zdz@b zYcH#s#WN1ZVPgpbKCjS;$Wzp)DR=9uHDRzG7aOumt6B$XcEn(9D0)|8q)2G+$aZ%L zLNyWGLaFcNd?p)m-93p$^UPz24hIa5Ccxf)XYG>{GvSf(Xe7Ei3ycoghKy%9Rp<5i zM7NSU52lUJ>3{Nzx=y{6Vh#okridIyFaO5mp72Le6Pq6&nBWNusW=Qj{|g~U&zS0J zC(n(OA7^!;#xdZQSUhik#N#&^J5#Rdp)K;Q=p_^o-a>Z%Ho3@{v<-1!+y-{84BEa3~E8sAkOl^BJecu=E z2MII9>L%Gj0OgN^rdXDPC~QUuttBRae^glgjqcm%)d>0V*`fS`|B8#Ub-TVHM4nZ`EJ zkZhn+wVPpV#%qzNT>L2LyX*7RFv|K) zgBK;WQd4(6=jJ;_3YRjhx1qqHjJ8Z_DEAl#PhDf?b!b+?p%0lQo^7Ugi z(~iH`5fc?nj$?Ipn<%Txlu^BjlbmY|6dXK#%*)G*nR+Lzfw1QGZW_x|D^b!Kq9#0q zE}VQ-$J}gI{}i2U0Jx#S$619ge{N@4^#!?6RcG6O60~u~HCIbHT1Gs9GASi5FYk43 zLtGDs*9EZ{M2`9R2^==&Mx6G#X9_y@b4K(+L8GbeabmsSJ}Tcs3WOQusxK&*N|Y(~ zyo+)MSpN^mo#**brE2!XA>j?FuTE8k6lGAYokRWmk2?1O%IY;>7 zieKVi6heK|K^7@Bl`&fPTUoa5jsgX!4o=qaPPOxSS%1CjZdztImFSf7%}nNKui7}~ zweW_#U`$^>_*Ft6$ZCfo8SXDtTd5XS^!<+KMUOyMh+76Uqxc>hR4@w0(4&G$#x&{Q z#y0!d?IFjmHbWq{zGf#yCfA!bbs}7*NrCmC7N!6GztwQ zQ1z^yA=5^iD&<1+i8{QP&-sJfzg&)m)xa-nnUPT7P1^!Q*^Zw+ZRTdAY=6aN`q3bg zUZ8?BZQhu{d$XOo#0_`T&I9@pSTD7LiZ-jLcVaa+VF38F3S_c>xs9#{((=@GA;!&PC&S&F4k7 zA`+ID9ruVkLJcF9AZP;@Hvtc784`QT1|RP~9^_9_5Ca2B%8M{Fh@n{#H+G}+=Phn5 zO#W$ium3{jDYe{N0SDlN5rV3@ccA*C`gU&YP*<@aT$r3tl!ITLwXjUVJC*FrBsjx4 qrw_>-{lAGm9NYCzRtA~R=;@{DcuN!0i@w@Vfc2H@mh~3i$^QmH(j7nm diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_secondary-test.png b/Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_secondary-test.png deleted file mode 100644 index c28d61e86822afe1f7805272ff9df228d2e8f0c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2926 zcmcImdpHwp8=s{ZhUp;s#w3TnB8OfU??{%@S`Im%R%AlR`P8=10S!qx6edCkr+6*G zCgD}XEQ~gXR6=7##5T6q_x~Uyd+zJHpX+*lzx(>#ce=xAYp|5E6aWAK z+u9(Vw&HsLKnx(cV+%b|NgUm}gauhzIt2Oq0|44NF*!68&~aA}A=vNEIR^`5vh>Y8 zI~?V8Ucro+C%_G?xpk?_GKO|G>{7J!gOkIRqh+E}vIRQ@rk#?OSCbTaqB6=wuZ(+X zc4M8pDH});OVX~I=_f1oD%x4W_kPpu&TFq#ERtbZ8)r3RzkJVW(H7OxO)ox~%zErA zni53CXr8IuL5`h1h&HzCGyp$XyxO7AR4rP6>B;Ps&Xy7^w=^(|ta0h4F78Ad=q*H=Z2?TI?SOWpRhELkll1L(QCdR;kchkU7z0_N}CzPAUVVV{-pW;3n?n;2Qfn1BLia|7DJsUZ@S80p1 zaE|v~oS29hHAKmdU|TU^%EoPvB_NfyS7$! z3{20VwCigfhU$yeoSsB;KFGocPYy|d7JL>`U*JM3#bZERb@n)$>EyRNmoI1#{BCB( z4gFF1k+88I(O1hh>rVHa+hZ6k^R=d@&ya(5jIhR-O}Kc08t$t;=E__#sy9rXOafwy z2orbNxoZR8qT<`T4vPAlzXy1z84>D`J-H|H;@=^%(k9m4!VGmUt{}!Vo*L+C-I$o> zN^{q;(vyi=PyMl#yMdWkjw{Ok8Zv(pr3=0$eWm56fwU4WU`%VmcC3)?ZA&TK9O*jr4Cl7wqrl3#XFR{(+DK6HoZD;|$F{-XcK(8% z|68Wy(K0RHHg$O?sbR%3tL<}hqqpnY6E8=L4k}KRE=%^=v^AMoaUF2UxfO}h>H>P> zTPvsS%n$m=;Nj9q_PM}esCEHLgUSj?#-B&Uq#5BVh8`em+l zDFvJqJsz$Aea7+m(o9u6^k-8y+z32oAucN)kH_PWl@_w^7p#VD#LnLLz<-HV(>cEr z{vq$df%lC3($*p@V#8h8S*HUcRga>*^bik2Q>v<}nv3gjUq;Qv`hb_25#!46z?ee) zIw7-a0e>#t{VR`!>Qs{C$H(8gs_!^xz8X8TyHPfAQ~gr*s**|*pK9KC#Uu>B2rG8uf5a{TLseI2$=Wocan$qlF$yuZXC~-64Cl38VDx%0ey`38SP=8Bwj62so9o|_zqr6K2;U^hEIwOLKA z`C^&;EF6$q@V3_S#sDE2*U?mHwMI3f{8&~ufEdDc?s|rxu{`8RlJ|WP(>)QPdj{7$ zJ3E{2lPU*?M-l^S_)jQe;^7fP+>}i^k!T`!ezM4%m&Al{@%Zj+^GI0uHN5PNFsg zhPiiWFuWKNSS##lSvahek{GJ-W-mt<&iPCTI<>f&E$;2rbd``z8Rmqu%KvN(Oy^6e zG5oW+gzRGfouDGMO9Og0kZR|&|Ahe|4?hljMJtgj=utyoHhFlrGAAv6og9_M6$v1YNLsah{M(-kh=MauR~@ SOxarF0JbMjBWq8bP5BE#8>4;z diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_tertiary-test.png b/Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_tertiary-test.png deleted file mode 100644 index 8f11866aaf97397b6380956ff491266e8aefc7b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2591 zcmcJR`9IVP7stOdAsN$Rzm>w22iK%5Q5uqEm>wl-Oh(C`T@y8yOZUny62>xA8v7EumcbZ9W-K$0=k@&3AK>}nyv{kV*Lj^E-sg4B=fqpxKtjciiva)t zwJZg`D&p8N}I}DG43Bp#+a7!KA)%d0_5^dlU5OgM&VHom-cw zWg{2#PJJWwuF0M)S~$}88r~HO5G?iH`Fh7Y>rKY+4h+m_|6J8eI7BZHT7;P>YD7q)HJrqrkP%w<-B7XxwU?I_? z3Rm|h2&-)FAsPzu`7S8-8j$6&=?>nM${y@0+~{|Ij@ydQX+9gR1!1um_-^r$%Vef# zl0^H;AcL1HJ0)IovL2g$t9^Keh7kA){^V6Ja+re^@5urrTPK1xmSCprR=~>g=e?$8(1(jo9Mh&E^U zFMNn$f#Gbg(cOSF(>#`3Rr6+?nmSGF!b2}b<2%Q0Ys74{Bs!hB#qo7?r;k5izeMB} z7OHAZp{EnxdUQk?v?}*2Jy^jcPUSwqA`YzP0%Vrkho}=QJPRK3?mD3}HYw>bOZDV1 zEREM4p^bCFZxgjF8)&tos;?Ykuj78AcvWNCtamh?t%NI1;f| z%c|LS*-Ibmy7fzCsf_~N04e?xg6J%4O6`Je+)TULBBwa=jzD}NZPEeV8)vMTg&srQ z%r9QD3{b*3iCrDJSW6YTiZqcv~WcN+8pP; ztP9b{#3+&)LE5XsDfM9yWC3R0j#>FtLzX89M{JO_rmH3(|3GJK*KYc?K6Tv;w}un{ zT0k(gs@C27<*rH#Hhxf0cVH+do|%@C%l(O~Q=cLJiIYl=MmAz;`@6gftH-13nxIQM ze^}mlv(Pp4`2rswxvnIK;M;v#WIK1U`ZtL=+aX$Vv350L7$7 zdsSagw8n97z?)wmdJ}HQlwLyC|B@(BAhkBp`k{fLket5XI!7$gG`bwA zHV?O(lP^Fo*DVqlkdR~46?1uia%{cAYVB6m_A>slY-6u3ZN%d0uD;Rn*nLLy)17RF z2(7Fe^amHgnqC>6%6HxP=d}D}FZY#Cud>XZ?-i$ zb1JNc+TpErp-rd@_Qk`DOm!F~=~Ak{8E4MD=inGx2sxSXPHx*O(4tT`GQr@%5%8afa{f!EjMWeH9`3fc@GSAuBQ|?(%1<{ zx^XTMHOgm|DQZU>fVx_QBd4dzt;eNCqjdueGUU5hxv4UwD!D!kQ`>zM$e-k4e-!us f-%wpB@<95JN{i8j={I|S2Vh}(!-R6}Zp?oG!bJsI diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/meta.json deleted file mode 100644 index d41c18af842..00000000000 --- a/Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/meta.json +++ /dev/null @@ -1,173 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "null", - "size": { - "x": 32, - "y": 32 - }, - "states": [ -{ - "name": "m_waggingtail_tiger_primary-test", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "m_waggingtail_tiger_secondary-test", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "m_waggingtail_tiger_tertiary-test", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - } - ] -}