From bd93d2fca3fabbfebb33c9baf087d7c01abf6cff Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Mon, 15 Apr 2024 04:07:30 +0300 Subject: [PATCH 1/6] =?UTF-8?q?=D0=A0=D0=B5=D1=82=D0=B5=D0=BA=D1=81=D1=82?= =?UTF-8?q?=D1=83=D1=80=20=D0=BA=D0=BE=D1=81=D1=82=D1=8F=D0=BD=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=20=D0=BA=D0=BE=D0=BF=D1=8C=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Спрайты взяты с SS220 Paradise --- .../bone_spear.rsi/equipped-BACKPACK.png | Bin 593 -> 773 bytes .../Melee/bone_spear.rsi/inhand-left.png | Bin 275 -> 982 bytes .../Melee/bone_spear.rsi/inhand-right.png | Bin 268 -> 981 bytes .../Weapons/Melee/bone_spear.rsi/meta.json | 71 +++++++++--------- .../Weapons/Melee/bone_spear.rsi/spear.png | Bin 187 -> 552 bytes .../bone_spear.rsi/wielded-inhand-left.png | Bin 571 -> 871 bytes .../bone_spear.rsi/wielded-inhand-right.png | Bin 682 -> 895 bytes 7 files changed, 34 insertions(+), 37 deletions(-) diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-BACKPACK.png index 585f2279403ddbff8ab4709ffe3938def8d38e81..95266b75c8334a9e2b2e1aef169fb0318827b43c 100644 GIT binary patch delta 750 zcmVPx%zez+vRCt{2noDRCQ51&%nHU5&QZ>ij6&<9;ijBgpE6k`Rm`j`xe1lvZhy93!jMpwoGEBcrW&<9-r!2JhnvkaO(U?aspoTS{*bh8aa;1 zfVsyjl9|DI(toIErd|;9zd$-aNgkXhX7%m)b-+HS1=z*W#dr85`^a(36`(|~N{P!E zshmr>axwJn_C*}`(WQ~6KzN{&lkgy{1n}j;6giG;K+W&Y&ql5O-Bg@sD!?qBsQ>^t zq0qH?ssgk+U7M#Wzzm+LfUpw4vG*g|4Gt;iQpWzmOMh1$i~YD(#OI%MX(R(;PgY&| z;{o8nN(SOlWTF0Iwkoa9V&}gq48P5(EN)Kp@y{FsJb9m+a&@3 zx9+Y2_jH_wq`Nd{=G?2GInNBYy%INklIr1H|t?9S}Cz2A9e-rwhcX5a2SfRpi{ z#dybtfvi3|Xd&wccLEl(2}a$9u`ZC+$CZHbpv9(>F>EI$u76Aee)MrAU@@Bj03Hu6 zgahcnkG@TwL3d}j0Dz&rAsj#l+xc_LOD9;*5kJznW(?=n*WlAb;Q+dj`SAc}0xBB7nHY$dtme2qnPuE|F2U!Ir%Oyl^ML^nWf90I;1HrjxPIHW2C&0?h3a z0lu|~x_}!moshbJ(?vC(WL`R<<`AsAF6%iqOm37I&MovD8+F%J^Cy+EDb{J1jdeh$ zU6%SX%uTaaWTkA1nYI;{)-PpKtXV6n({*!Q__es`epA7!hEF*b0KW^Yy90b-;!}Vi2!bF8f*=TjApYhP+c48H_-LJ)00000NkvXX Hu0mjfnQRI} diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left.png index 48b74e934a59eaee29473f77a888922888c22b79..7990958a5b8a0253ef1e5eb02dbe65c82e397524 100644 GIT binary patch delta 971 zcmV;+12p`T0@eqR8Gi-<0063Kaozv`00DDSM?wIu&K&6g00WRoL_t(|ob8%DOCv!T zfZsjNCWR5n5AZMqxk9;ai`?N_N6`}={O|3tHKzv!BZ^My2zre6`efO@Tp^My3@+GCJpMbI@BlWgEY zYyxym#r0Yh=e9TC^yKbE>gNk-;3Xk80h_}s$lP3lX**CVS0&*({^C^kOI-| z!%;(@JL>1QH{jo&b3l6su(STiI;;sy1-RogJhBj!$`#?b)e@`$dh=OHR)nIM0@O7C z?H$B6CNLA=j?XX|>B--Q52=Npu?7f^TP;C!`(WA*tAEg5z)ZmGNDlyT+-fac^bkST z0KFI}S;9;}m<|v@vzg+K&zQXq)CJUQ)yTolW=gL;W+s8#ULYvCrsAz^2EKgzwJ_$T z*b9U~k`-ZOA-KJ6P|bu$0^(k^5eYQgjU*thscITYRs_>_sAWPV0dY-L^V%I*h|0jY zG-JRlWPcMCH4}UbpfSDCMv@hwePKl!6S$=CG&H7Ha?W7d4m8gH2I|w&z5>&f$`xVu zoWU>LGXNmoMb_*>>9f}dSO*t$>}fOi1ANd)i?fH#SN zxEl<59nSjtJXQf=3nN%wpL=eGXh05A3O}>ZYk#9aWih0PVk?^gT~l$`ZSPw!&j4Lh zvFP>zbq#1=SfOfy$Z4=?J0QA!s;5)T1#Awl;C|;vzd_##MQ1nL@a)X*2!2Kb>Url3@=2s`VK@Bdi* z_J6uDDU2wJPdB|@wEAn6?v20#yOD>wbek?goO+4lA`8BC|sf2`eQ4;Ca>PcZys&0RYca zq#p@^1<)>0VTE4_fdr5R&a&XAhQRlBm_)@^G!7(L5$d%n&RI|K!_0-SX9kcG_GRom tVbS%uXNNkS4%BN^%&POeZ-+lT{{hTU<|uVLRcHVJ002ovPDHLkV1i8EzkC1y delta 258 zcmcb{KACBPWIZzj1H;_yjcZ7*)ld3A5?P9^cl>XJn&Qir#f z&z+J~Qkbw;PCN~$h`S`nFPPy!9MqQ8UIhwI^K@|xiD-R0?JZY>0*|Zv>GR*~A2_Kx zPr5TrWQ+5WUxoS_2l*Nn{b?|@ZL(onu%MbzTt{E-+!76`!Q$q>L42yIpLKyRX|WcZF?I z=8x{LUWUD8d&S$Nt$u#|d*gbuLK#zGV(|5gKqoSIy85}Sb4q9e E01sGsVE_OC diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right.png index b739e105cfa2ff2625ca7b57896a8897e3bcaf3e..9130e0e65d0203951b4f02050f98492b0b99d042 100644 GIT binary patch delta 970 zcmV;*12z1N0@VkQ8Gi-<0063Kaozv`00DDSM?wIu&K&6g00WOnL_t(|ob8%DYa&4y z$NwWqV-e->0|X2rS0wEg-k~XMk}mieEDn1i$Q5#6zeTVKM;eO-JK7N z(ez8u6lpBxiZJ5K=G>Rr9oO4mrS3S+^Y@u&UY-XC2nYxW2!99&2nhHuA>Y4UQ2@x~ z3WQgu>2%suyH=~k>nClIPNxw9fK)aDRgtOC(Rhfe$duU|%H#^9)0`odji6d7@4X1B zBGXhhvUnc?-rfK9<{6226xB+Z?xQ!TicG7OGEHS8=rm`GDIa1D^2HJvj;4q`KH$^S zZ*e1afgcwa^nayZMU^cu!+G{v}A^SubFB2)eB9D2KpODVju+J)A?pbd0fHyR{gERl((V?Mj{ zwFtw}6wqdiU1AXK9h5%2m;l*pVLYQ6GcaeOtw0|&s**3<80N0Jiii_~vAbG{Q z*D}M`Z37GhFrw9J`DTwWpWV?;bGGuCk>QL3vmNJ)rJeVLaj!-v+RT#In(_cY@NT?r zdCEExU|04Esv_Gm9&jkYa5Q!DbuNs1H98zkZ3k=9F~A7XabZ5YqZ4iBXdI3N5Q&|D zX9V{k=zqm>sVXvU-fLX;CKr;!zAoQ*P7GSIZzfvh$2RMC85PE}Suh z2SL$)fUl;28w3J~9)M^90Ync#G=Tu32Oye20MP>wO(1|<9WSS#-DuAXR|Hs3L7PQH zodVax5Ie6QpTy8$~HGL`0i3`bMgy`jzI3Z!|j zL2q{<&HJ8s12+L;j}Pb`o$he>UDGvPhIx{#{#@xP3y=POC)*phJ3L^E~U*ZtQE9@j;oqVm^Zmur{GwC<$4>I zg?}~5!&`y%b18+v>J;1(!Lb0#!H#8Njq>nTVEr&5Gr0npXwF3a2wMVdo0tDeM_XaN zSc6BO>sS^*Rb=W_PS8k5-a*ll04xzHGAGE}6HE)h^6#P(qP#J+6=qpjKh_IvW2*@;a*soW62jTE$(u<^6< s_-*Zl8|hYdxLPUGZGYk}r00e67baKT`C(C{H~;_u07*qoM6N<$g06wZQ2+n{ delta 251 zcmcc0-orFOvYwfNfno0U#y3DpF~BFp6-a-1ed6Ycwih?&yt=n`r;_+&b;%+Xsl(gL z=T1o~DNNWaC!PjW#9b2P7tHV<4r0yU5j`z~j1f<=Mag+1(YK zSx@Fp5wP}`oHN_@u5{DmKP?$k4^9wx$X8?;NmL5snBZ%T|x-hbjU84F@JzvIz|cIN|sU(2}m=R8_AiojEN zv)wh_y>fvPHYt*up{K z5yUca7B|<3>VJI#i3GJ`#nE$01Z4S7x4*Mg7)jQVrue7&QQ{?xm zTDjhLUtkcv@o85Bi0Y4Exw|3(0%KI5kV}d8A3r$ma=VNqAkX}~)#2-PPivi8&wqI30%i@TB8~*C;7%Lux!5+L zTRV5ugxREF`l_jn<;N(SG=%XkZ22dnDy9|i3JxX}knmo)M1IU6GfMtdAe%JA)`Cw& zLNoNrrLia6sPRd7=cG;~li;>gV&mt7CvX_3Kr9odR;F~z#bT)ACthN|DT?e^6|>zgfJGR>XJH1SRPqH>^7 N44$rjF6*2UngFmoMsolF diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-left.png index 5f2a9d893b3b3f57199718a8c3ac122ed9f1ed4a..a87f69dfd5f297c6bbfadca21552f579ff12ad95 100644 GIT binary patch delta 849 zcmV-X1FrnL1m^~jBYyw^b5ch_0Itp)=>Px&AxT6*RCt{2nlWe^Q5eVnC&`kbO1QlS z4+$M2*(BJK%bd^5J&EVqj zI>@`2Gv<=u-Ie6~O`h-h{@?q1-#dNZ0|zckqkmt6&8>)IiaDA&^Jt&u|32mmsn4y(a=V7gLS$? z@V>oP*)n4?I%T@5+&RfovA~ik$r5y$d?Fb{G9}@uCfL86zG1>VZ(^|d4ueVsTFpS; zFwxLPkTW@91-QwJ!J*8Wu|34Eej}Dw=TcxcEp%03eSd?COw9oR+4h-eBm}KyAQ}lF zEQ#ENxv_OsVPQ!`Lo?Co4#98J$I>@UY;50L4=NR$RCS?U$goaq5BAi)wFrJYIAAB$ zs_^4bW*^GBYiod)i=fk-0<#w<)v5phSJ!K<2IVEsaZUt55ClOGOJQz5;H438?()1L z1N;uaZ-2-DzXR|aGQjTu{DuthI{?2S1N;uaZ^(c}4T~y0Ug4Ggod)m{6)$J;GL=_` zc&Wee?=TljB!l?-XBB1u)SNe|o0lKQNPIm~gU5E5W#Lwo~s6@b5h-6B#4o2{Rmn!rC zeM)|pL?fYv`mXH?mx=`zjfAYnm{v39PG`6Y|LySk%jPq0``2i00000NkvXXu0mjf*ISrC delta 547 zcmV+;0^I%Q2D=21BYy${Nklw6y-Yi zJNNi*Cjb!<5fKp)5z+rD9&}~c??}~k6lK`&NIdA~&ZotLu79MH1Q$t+^PNusfY8wK z=;KQ~d3K;>A3i$V6#&?5tmoENE$}^AMMmIz@@xMX0C4}?8`Mk-x?utUEZf!YShlMT z`yDYY2j`d`9so{GN4d?;qV)397=iCe7>xl;8=_n-dYOY99q!6zV;x~MUYLK~Jzl;3 zI?Fpb9U;}%@PA-U@Yr&YP7+wQJ6q2c_V(dDdH?#{u}jUuAT)G@hK|7ZN^8P~v#05XIh$Aqz9&WGU+ZdpcJ9iL=i2~)7fAfVsBAS` zEIS_n@TFFpb-vwdN_L7H_@1c$4HTW7t)ZwJu{70?Dhj$fqOY_e*_%;SA=#HvMgCk7 ll@)MHY8)UUA|j&O?l&RL?bI`1;YI)e002ovPDHLkV1l5L1(5&% diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-right.png index a10d676762a02cc7527b2edf89511b0decf8f7c3..89c84fa87987f76c118ae5cfbf82c7b13d880c74 100644 GIT binary patch delta 873 zcmV-v1D5=%1^)(+BYyw^b5ch_0Itp)=>Px&IY~r8RCt{2nm=e7Q5?s=SDMA4k#J)M z6AuX;60%82i+0dLGFco_I&{mFT?kIL;C@4KDZ$0zs8fV^1urBL+{8>GC))i8UWP0V zuS0mp`LFTfomZOQXE{Be_x=68_uljH_X7xmAP9mW2!bF8f`52!2>ivx#f7Irg?x@3 zWwL_(Tr3uw(A5-~0YE%`JTlfzVzHR@`lVMQb_)3%iw`t$oRMvWjOWa9)g`&=i>!@;T<@BE4pb4b39siP#yMMJBdtXsm2QY}F8wMC>J2 zt)w+YW_yWMgnuLviKK+JR0;>t02(XXBX^23?c8G&^0}$80b>U6U=m3Q(@fA5nQ4m5 zhGvoRq+1&Us)f6Mfx)TGeq|F5`CV z9gM5S$aQ+nlB1hqPd<^9MohP3EdfoDSx6F5R}FN!1Ap+TYR5`YeK_>>hohCulmO!C zW1*ExGd=_28Es-(+rMAPgGud6oKz~pFWcSj>jpM<=githBpifV)e#8?5t2l1f)&G3 zHo>2VarUvK3E%ej*-52hX-?Y&?c-;Cz9{x(G_ePGLHjNM0I(-N&v>tYnFxX)2!bG< zH6u@E&wu5~Yw3@||1xBN-vRgy8Q^ySenSTM9f04E0e%PIH)Md{0r(9W;I#m+CV8#% zRDIVC;9|TUx0hI*S(fqwr~0l|hc!iJ*Qe(Iz!FIb>zhN=RTF@>IB&smqCfW@!21U}-N8s7z&M`dxVymxE(L`pVDYW5ClOG#Q(=1bY0UZP_*xM00000NkvXXu0mjfwWOnM delta 659 zcmV;E0&M;N2C4;+BYy&MNklR8kyaS7Jn6=Uw$BO;o?!D78y?h zO$(+@#DM9zO_n_e035#PYvI`Wt9K|YJOIFx_b-u3XQ3PEKn`!=;=6l|tNl{|z{6e@ zrSi#N8!;WX$)6`|z=Ks^RQJ?x)o>x7fo0Dzv%SbXL({||E4PD^%)5lb|zr{YMwtfAg5*d#(_%1r#fp&a!Kr`Ekj0XfY8&!Ii*D=e05@U)w*YR$0B!-?hymOJxQQK&C4m}tsySfXP?WR&#&&?2&yjom z1pp#vft$q4=g40_vs=;P>LqRFU5%|?~Nv0f^5>t0f;|K^Y;qt>td z%| Date: Tue, 16 Apr 2024 01:40:49 +0300 Subject: [PATCH 2/6] Update ChangelogADT.yml --- Resources/Changelog/ChangelogADT.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 23ab49e82af..b792d82b245 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1683,3 +1683,9 @@ Entries: - { message: "Инженеры Nanotrasen слегка модифицировали конструкцию глефы-крашера, увеличив её длину и слегка снизив её массу, делая её более лёгкой в использовании.", type: Tweak} id: 55732 #костыль отображения в Обновлениях time: '2024-04-15T02:17:00.0000000+00:00' + +- author: Username228 + changes: + - { message: "Изменен спрайт Костяного копья, теперь оно выглядит круче", type: Tweak}/ + id: 55733 #костыль отображения в Обновлениях + time: '2024-04-16T01:40:00.0000000+00:00' From 3db3badd914f9f2a665790a7fee650f04529d934 Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Tue, 16 Apr 2024 01:41:14 +0300 Subject: [PATCH 3/6] Update ChangelogADT.yml --- Resources/Changelog/ChangelogADT.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index b792d82b245..b14bec37265 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1687,5 +1687,5 @@ Entries: - author: Username228 changes: - { message: "Изменен спрайт Костяного копья, теперь оно выглядит круче", type: Tweak}/ - id: 55733 #костыль отображения в Обновлениях + id: 55734 #костыль отображения в Обновлениях time: '2024-04-16T01:40:00.0000000+00:00' From 8e2e78fd3c7961a8f8a8d089cbb73424bcd82915 Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Tue, 16 Apr 2024 01:47:11 +0300 Subject: [PATCH 4/6] Delete Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/spear1.png --- .../Weapons/Melee/bone_spear.rsi/spear1.png | Bin 582 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/spear1.png diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/spear1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/spear1.png deleted file mode 100644 index ed04f5977745a4c20d67b00e6c729e2f01b6b9db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 582 zcmV-M0=fN(P)8s2OHK zcvN_NsbDy~Dcq!`6D~hFoO1cYVN;ES!P6kDq<(SY7i(!VD=aT3 zkj*S=KlgE7;!EbHq7qxho3V&6LI{O1h6od+hXI*`bka+gtSFJ+{hdEaUUD^=4VE!k zAVr!29ilEu^`t~y^rVao%TE9Q_SMq+dfn>25L7(a_DdU7ZoucdZNKl^_U8eV-@{q1 zn4jN+{#Vi0i&|h8>Q~|9yr?C%;B*cAcShWde@o@!9$km$BdCi(<0aJ0x;^{Z=kONP z75S*8D2*oB#j-fJsC_R9J=W&anvsVGu;&nZrabHaD>rLnC{* z*fPv6u?RyW?Z5`?!U6<^XW%bb!HPH^EG%sBR{AG^@3$-8iqC*Oa0dFy@D$hrOJD&U zfXVyb75uQ4bg_MsWJyQckAm(CumRj=C=0jv2)ONYU{(D<_p$Fv;}H=N5fSk-o)FPX U{TU$$fB*mh07*qoM6N<$f(CvKf&c&j From 3f01b3858a3a59a0cb005e5058afce5a97392ae8 Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Mon, 20 May 2024 16:19:58 +0300 Subject: [PATCH 5/6] Add files via upload --- .../Weapons/Melee/bone_spear.rsi/spear1.png | Bin 0 -> 206 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/spear1.png diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/spear1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/spear1.png new file mode 100644 index 0000000000000000000000000000000000000000..e897e73e9b19110ef7f640298957e33f34fa3e1f GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}9iA?ZArY-_ zFY0nNIf}GhtacSJlsxk<=U7G&f7p^_nLpp`{MlCf{d;HZ<^pkh zrQN@oW?y4wyK8x9W#*sk6GE%!^J*-e66B@%^!;9jzpF!P`rW;Jfo@{(boFyt=akR{ E02L8Y Date: Mon, 20 May 2024 16:22:17 +0300 Subject: [PATCH 6/6] Update meta.json --- .../Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json index c846f17aa05..5adaa998bbe 100644 --- a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "spear" }, + { + "name": "spear1" + }, { "name": "inhand-left", "directions": 4