From 2dcf7d21d82116f2d2fd80c341ceb77510f15848 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sun, 6 Aug 2023 02:50:00 -0400 Subject: [PATCH] pickaxe inhand resprite + wielded sprites (#18735) * pickaxe inhand resprite * wtf piece of shit --- .../Entities/Objects/Weapons/Melee/pickaxe.yml | 1 - .../Weapons/Melee/pickaxe.rsi/inhand-left.png | Bin 378 -> 525 bytes .../Weapons/Melee/pickaxe.rsi/inhand-right.png | Bin 375 -> 541 bytes .../Objects/Weapons/Melee/pickaxe.rsi/meta.json | 10 +++++++++- .../Melee/pickaxe.rsi/wielded-inhand-left.png | Bin 0 -> 659 bytes .../Melee/pickaxe.rsi/wielded-inhand-right.png | Bin 0 -> 676 bytes 6 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/wielded-inhand-right.png diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml index 7d00b451d1..8826fbbdad 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml @@ -18,7 +18,6 @@ Blunt: 5 Structural: 15 - type: Wieldable - wieldedInhandPrefix: null - type: IncreaseDamageOnWield damage: types: diff --git a/Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/inhand-left.png index 0822c1e1a581919293af96faf42f1ada9b99cc1d..619199e5d8e24c18363df51092b0f64b1c39d12e 100644 GIT binary patch delta 500 zcmVPx$$4Nv%RCt{2+ObcugYX-;sB9B zk%d8+UD)^soLt=vqmvWSjRh7G!p?|caB_2VakdUDL`^KI8cZA3bHE}Pti5_ygMPoQ z3GdzA14_et01*)p5fKp)sn+cFM3lH{y%8x+){5>0oV$T^5r5)3d~9S76lVdne*yr& zbKTH~s@5CAb6wqAno6inxL4Q|r9vKC>uUgji^O)MJO_sr(P_5~|GKtc7JknA(HK`& zALrJC@nwRLlo#NAQ=(MJ0{}e3k&5?R7mhuI_xusJn=!?e)t`IafX|n_5xJv z4Ux{~q+-(9+~4^rjQSuHHI9ggh=_=Yh=_=Y=$GjDYg=_rt&Nc=vjIVx-JWpn2CCA< zLuH3YN4H3OYfNS~Ac(HH0p;CczmI=E8sjFlqdGkf4s9!<_;d?@jpMV+xu$DvzbpWR zo*z(NfZ0C&YB8lO@9f;b=UIV8>xZ2m&@~`2VRfZu1A;7?8~Aqp5VYR|WM%_`=$aeQ qT7W3C0YR2-ZeST6goucU{;@aoZP4&=JIN^k0000b;z6vpw7s&~kQh_VAS0~;r>as)2m93&oC zIYPxH7?@l3h^kXh;SNz+RElI88wKhA8!hYQvy)8kNdN!<00000`r54I=b8NP_0pJ& zwU9mYOn$SvtQW&milW=2w4S!XyS0$R|Fw6X$*-qv%@jsy%76X@Z)R2>r*}!x%WfC+ zyzT@cu9IrRanyZ zn|HOl`2enVBU{OLH6BiBjKAf-PhID(VuyanO8@`>00000002M_DP{+vcZd57M}&wy zI}p9?d>*Q6Ygu=pZ)uTV6MJ?bN#DKCa6|}OSzj!cY7YBv!3K8;g9`)zxb6$B&Y7abv=-6;0000Px$*GWV{RCt{2+O1E+Ko|z_r+^|fL2Lm5 z1cPAH7#t3T!p<*~DAWQDvl)_QezJrm`~$cdG)2q|MnabYfwY+-IRq(LX?yJBTDtN4 z3=)@AxU-&HvlTS!F z*?s~ipj@d6*Ky*FC}FPSL?&S&YEq$C68j(b0D$gWA1$+uEAvr{DaNrK zjz+x}dV)hAgV~MEnRybFD^-!**c^T0th@-#%07sQh=_=Yh=_=YD0Sla1ReKh?a;!= zxa^0H(txM3PeElxDT(To(h~s4Yw@EpqSjVns07Gr@V>?g(}1iNKZ?OV zg^B-6Lis&FR*N4+Qhf?a6EJoyKEl-XDNN&w5D^j4KlTai`Pn=8B)47w0000lJlkj delta 349 zcmV-j0iyn$1or}vBYy!tNkl<{90002^-xft-uWR{8b~D#a zJye^yY(Bc}*EidTZ-dK)`ABv-k*Zy{O}UVoAzU(qd&ld;m@Qq@lS zIr-Oy%3WNO86EcrNz%5iZ)Wg*0o%Hc;$*CJI#ZLG!3{5+FRaOo(&e|a;rGB%yg)O>%v7DHd@>ygIOzkqYxA37gi v8ptD!K4NIIGGRvDeP;0F{o)V+;4S_DXhoT#L;ux100000NkvXXu0mjfgOjE3 diff --git a/Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/meta.json index 8179728a35..0cf7510e67 100644 --- a/Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/29929/commits/8c0509a4725602d0be2e9a7b29b556a39fb5cca2", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/29929/commits/8c0509a4725602d0be2e9a7b29b556a39fb5cca2, inhands created by EmoGarbage404 (github)", "size": { "x": 32, "y": 32 @@ -17,6 +17,14 @@ }, { "name": "pickaxe" + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8fbc990385e199b8575a8d243eb2b9f40efaa594 GIT binary patch literal 659 zcmV;E0&M+>P)Px%O-V#SRCt{2nmupYP!xt=r%Vx6qo^nu2%$q2(L~BnDFZ_m1|qe4hK}?H^anL# z2mgRd$&l4UB?d2vP!$y#DLAc@3{}=+R_0K1VIo4 zK@bE%5QJBU6?fw2x6fJvf@+PnuP$P9bdQVT>yKZt=QeZ%EW>X#5malWGA5|j$Zs_b zRWyrn0SC9&mg-{sRuc!e*IK^)B#a9HfI%3dQL3zT6*Ni}8ib+gk|x9oa9nSpV8`{S z-5*lBKO_JPuhH=tE;IW|m;bus=80OzG?};)o!~L@n0s@#H1NE9JoA3=$6xySc?Mw! zzuS8r_f~0WBvI>_#`s+T0P6V@^1D5pJ>4h%t}iqDl-u3Gr-$F#_5jwq003ldd!@w# zz}eHim9=ftB~36cpi!z&u257OlPeTg-Za<6xPV-t2-OFg?W+q*Ra#n%3rPDkr|T&& ziGQ*O{LhF0?gF?G0o(;}BLcV!;6?;+7r>1O;4Xk05x`vlHzI($0B%G8cLCgp0PX^~ z5dpdGKck+z zwt#kjNPAnGa9j_-b9-F1C7uErWn*t^(*gkZ<_>QT-ziU|B*1Y!Ixip3w5-Pe7nnZ& z{_qI8uL8&QsQmE*re%+EC;9dK5vk@X3Frim3lipq)bl5lwQa5a{c(1b>~(XM1bqK; tnmBpZwvGJ3DJk1jt{@14APB;Xb9K-b#nj!002ovPDHLkV1kCkB$)sJ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a24bd79fa79ecd37b6ed0bb8bb8b5f259cdf2c7c GIT binary patch literal 676 zcmV;V0$crwP)Px%UP(kjRCt{2nmNpLJGkmg-r?rXDOtx)DPeX((;OY z06~kiTL>0u48bOUgiBZqkzKY5%r)7t?#yg<*4eyj-XEly$>e$Vnc3MT?*I@4K@bE% z5ClOG#Kys*4Sz5H006-B>ROHXUZb6x0F>e5vpT>$_9cUwP&0i&7E z0YLbSWr{`F)f77=_ZAnNw zE{gZ+#P$mTIO7Qvc6XpL9|(IuvsTsK7p_i^S(>N7)#X?u;kWe&H5q z%m-}SvP@`y8n!JvZM}(6a*0R(09aG5-EW*`%m<$3^U*&S%v9e~BTgpdBVP##~!{_g`g%=ycE zF&sv-R^_9a5BAe@s#5wYU3hs|{%&x9qFJlH`(DfLa2;)}02=cF>si0}