From 0aa46f6a2a22ae2e37b66b8fd82432b47e5c1c27 Mon Sep 17 00:00:00 2001 From: Alzore <140123969+Blackern5000@users.noreply.github.com> Date: Wed, 30 Oct 2024 02:38:19 -0500 Subject: [PATCH] Give proto-kinetic crushers, glaives, and daggers better inhands. Update the crusher and glaive icons. (#32212) * inhands * better inhands * indent --- .../Entities/Objects/Weapons/Melee/mining.yml | 4 +++ .../Melee/crusher-inhands.rsi/inhand-left.png | Bin 0 -> 596 bytes .../crusher-inhands.rsi/inhand-right.png | Bin 0 -> 598 bytes .../Melee/crusher-inhands.rsi/meta.json | 27 ++++++++++++++++++ .../wielded-inhand-left.png | Bin 0 -> 599 bytes .../wielded-inhand-right.png | Bin 0 -> 601 bytes .../Weapons/Melee/crusher.rsi/icon.png | Bin 716 -> 431 bytes .../Weapons/Melee/crusher.rsi/inhand-left.png | Bin 655 -> 0 bytes .../Melee/crusher.rsi/inhand-right.png | Bin 637 -> 0 bytes .../Weapons/Melee/crusher.rsi/meta.json | 20 ++----------- .../Melee/crusher.rsi/wielded-inhand-left.png | Bin 823 -> 0 bytes .../crusher.rsi/wielded-inhand-right.png | Bin 851 -> 0 bytes .../Melee/crusher_dagger.rsi/inhand-left.png | Bin 503 -> 362 bytes .../Melee/crusher_dagger.rsi/inhand-right.png | Bin 495 -> 361 bytes .../Melee/crusher_dagger.rsi/meta.json | 4 +-- .../inhand-left.png | Bin 0 -> 611 bytes .../inhand-right.png | Bin 0 -> 620 bytes .../crusher_glaive-inhands.rsi/meta.json | 27 ++++++++++++++++++ .../wielded-inhand-left.png | Bin 0 -> 536 bytes .../wielded-inhand-right.png | Bin 0 -> 535 bytes .../Weapons/Melee/crusher_glaive.rsi/icon.png | Bin 618 -> 405 bytes .../Melee/crusher_glaive.rsi/inhand-left.png | Bin 576 -> 0 bytes .../Melee/crusher_glaive.rsi/inhand-right.png | Bin 568 -> 0 bytes .../Melee/crusher_glaive.rsi/meta.json | 20 ++----------- .../wielded-inhand-left.png | Bin 567 -> 0 bytes .../wielded-inhand-right.png | Bin 520 -> 0 bytes 26 files changed, 64 insertions(+), 38 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-right.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-left.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-right.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-left.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-right.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-left.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-right.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-left.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-right.png diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index 337c7f07f7..5b565127a2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -149,6 +149,7 @@ - type: GunRequiresWield - type: Item size: Ginormous + sprite: Objects/Weapons/Melee/crusher-inhands.rsi - type: DisarmMalus - type: Prying @@ -191,3 +192,6 @@ - type: Tag tags: - Pickaxe + - type: Item + size: Ginormous + sprite: Objects/Weapons/Melee/crusher_glaive-inhands.rsi diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1c1093a702e40a1a8086be972805dcb8ac611d63 GIT binary patch literal 596 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl|-3h)VWRaI5Bx3@1XWe5!oHINawdGltj=zqrl_jTDAW*Qr>U%!4wziol9 zDp0xZ6VVJH#a9yK7yKU?Ft{GLa{?&CS>O>_3{-Fggc+x5^GO38Fw@h;F{C2y?X81F zhYWaF0yGUDO!)P`emmFIgYCznmQLV1{BG&Dgg4?sJ4%-RE#^>YU|@m~4cnPIwwe8` z(Eqk;nV#0hh>~lXQTmhDdc{ut&#DyFrMv&fm+d#QgHEkxSR0e?TEY>axjp-%wX0Rt8R2L?tc@!@5| bwSA0zXH3)Ixu}-|V~)Yo)z4*}Q$iB}1E=jS literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..75934554bfae3c552bf228829cc2f6e6018c4ef8 GIT binary patch literal 598 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl|-3h)VWEiGlRx3^bSRSgXdy?OJdfs6p-|NFV3|JScyKhxM)myMyoS9M3f zEl_!McA5u};wuUA3;vG`7+eqBIRTX6Ebxdd1}ZoL!i-b3`J{mknC@@dvo=`7-K!|`<3H+ zAXe{S@=5ReI{Z6X%B44OR#>_!gjUx76H;JWw8dQi@1!iRx1au4JM8gz^yt6yf~S$Y z&hTw$JsG<|bPe+*=fjZ;rUo-id|p#fX3~(o?^;bjCu79Z{fAYzNcEdBAK2V~VBg#| z-UsZyFN}Sr`n^FE;bctKgLsBjwe`xIw(oy^J#fdp@8(7(%@tz4{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/meta.json new file mode 100644 index 0000000000..c634ba82a3 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "by alzore_ (discord) based on the proto-kinetic crusher", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e8e9a267ff2eb9b55ab0083fedda98514671c026 GIT binary patch literal 599 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl`{3-AeXwYRrdQ&S5K4OLZDHINY~D`O}vWnlb&KUeg>E*ry4W8tQ$9O ztY5$W=FOWs`fUq*Re@U7EZ4sUQbHv`e!>6I0mGyH`-OnAoCO|{#S9F5M?jcysy3fA z&_O+(E{-7;ac^&(oYt%$;u@%QM9nPp-~aPsGtwtB=xIcrd~!!n(dI^zap33aAdjE` z4u&hfQcH`uZP(skuC;V&q}i==I%l1o7?PJnnjKrh@UAp>*0mD7s@^~4nsaAwTlfA` zad-NqTU&Z7Z>y^DGWKreW)MDNyaQ)msJG=smIc6;3ej<$=- zzWnk_c)VV|id{`QbDB@eErti18ByGf#(BU}aCTahto-s-bNaWw_grVk7_-Z5LX0fy zmD0=W$~l&3D_3tVaS^`Hc-QQ-EK_;?1NE;i+jFkIJ04m3XaB#Qou~Q!r0wV5wyXNu ztvR9d-yHZ@UH|Ua%d3G0mQ20$|6j-4I9c|d@I1jK;m7+Ec9nE1?6l&WvHq@-$67na g8Z{)h)JPhfuNRXtcKKl&6ao_WboFyt=akR{0DdU&umAu6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..4ef9c388d62a58017b13116d133dc50fddcd07b8 GIT binary patch literal 601 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl`{3-AeXRZ~;5x3^bSRSgXdHINa|Wn;({{m=OSerYK~SsBAjW8teZD) zu3x|Y#*G_0`fUq*Re@SBJviJAq=ZU>{DS|Z1BOTY_X`1KISV`@iy0XBj({-ZRBb+K zpo986T^vIy;@;jmTXe{Phb3W+MyDd@mG}QQ-8eR7%h6A}cn+t2cS>6Far*q|5)OGj zMiv1F1{C4~v&D|0gyW^LA?_P@FbW>g(rovzVpyf%uvJEBBSX>o8H+BjxhH?Reyhx0 z|JG#7+~<}KpO)^LlPGa4xaZttuiwwQmK+MUtX}dhW**a{%jfL3?^rX@wbW5AZ|R0_ zX(8_p?AtNt1k>Ai?KO98KB&f+7q0T#RvfwFX^no&X(w$31eRO`$)!e&{ z?9%gOZ?L{;i#rrLXL29^CHv&^Bp{Tp{V9{BBq f9F+2GEd{Ln(nh=Ut=>%nMi+yptDnm{r-UW|*iG%| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/icon.png index d9b6ca8157b74b5484b09fb1baecec7238373cd2..1df2bf438850dfc03a279ea0ce8dc98c3f672207 100644 GIT binary patch delta 396 zcmX@Zx}JH0WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hHfKQ04 zs;a8Jy?uJRNoZ(jX(>ZiR@Tj%Hw|P2az+2|=(kKKNMNS1 zae=QYQ1@vY88#p#ToU9L{2v)`fjJDDYVUANR1~jgc;M;c7-Hc+chXzFCIcSVX!R)z z!*2ezU$b4dTVC7v^RB>r}xHnqnbOpT%4Y2-v$iL~h=KUjbXc zbGJ8rt^c5Zu>7~7@0|QS!h7VkeP3_+%-^_2{`2RMe|iZgj`2pOJg!Y3}>% z$FaBMmTr9TKk!I-ho%L0Rf=xw`Tc!U|J&yLpwo5&Z8A*DZ64??VQg;@l&f99 i%Jcubf^&qIrhm_UE4e`K>l1;&!QkoY=d#Wzp$Pz#hOkQj delta 703 zcmV;w0zmz*1Iz`G8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00MqVL_t(| zoW+;FOB-Pr$Dcr|OpdWg37%T$jy;A;B;$8+FA2>AHr8NGWu;R@Ka zw{=9NlXETn&40}M-UTenir_Gy3urswFJBOCt?baZjamAU|AV(VEFr^@Kso>kd@uh?T$t2?<24oZ)DHCX)$f1^_RWN&=2;EICNDs+{4= zALhCfkgHeW2rs$2;1KOtzz}c zg$zb?aDU$de&HNQ;76?)qFy z0d?9Tp$?r+f;x;=fNv)G9?uWF+h_%*;^bb}hiSdo*bWP>7065*4&Z~vGqSP;aV`%F z-XtKyuWzM7h2IiT;kcT0GgMs(;D^ND0Sw$}UpV2O0B5~8OxFHE-{4IGSZ?BMc4GF6 leF zuUPAy97`kTtg-ka8sz`M%R{yP%-)Fw=lETGOzym&E}ehK(mkP%gQ3`kVTLl(0U1Gt zXB`X%?ko+KN(^TN8Ljw&bj0S)HZu6blym!>qO*#SfdtPSx5W?H>|*Pfp9)o(8M!`^ zypXkZ&dr>*XUApMr)P7XxWaOwm@{G;>*~9%OFwhpQ3_TO3s`^s?)Q%sJw{C`i#WxM zsMW^%wfA^#xyQ*iccHIF_=Oiw??~>|zgWGw*uUKM`L9aVRiB zbl$eydv~opx9a)^)r;K_{UmTu^pgP#N@!pP)bS36%YT`y`tw~Fc>8{_wrT8~Um9BK z^F>)g(4jfI?p$GErPEg@cBzYZ`x9IomKOK7m(7!6_mPRqwr>(-yrP~E`7`%qjC$f< zjzUAFhI11-Kg2ct5)4}{y6Bszgx~}I^{Y2zE|OQA#t^!nKdS1FYSG=$*tvf>Tv8bC z{i?mvcu2tNm!QZ(rbXA@|84eeuKgwW=RUV+!HZwDLS)z4*}Q$iB}St=AX diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-right.png deleted file mode 100644 index dcf606531ba187e61220fa6fa327c4490e1d29fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 637 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S%3 zr;B4q#hkaZ_GcXm5IJUlP`zNnq}YjG2UkXCYjU)1b3SI*7@}G7<{Ep!ipdw27icso zOxaadB0YY8H!<`6Cg{cKsEk9*)uRpzT62FwmOrJ2bZ|(QLn;-aD^DZuHYt(`kRmLq7%}?w< zbJ2QVRek*7)!LIM9lTpUx5b|E-o)#z;f80w=vGf@w>$j8ul>*8(v$lv><`4|%SqYk z9&G;h*?jtMFA2N3Hx6HC-K8I<=O6xsrS`lZym}Cp|ZET;-V~XTo_vpMh2K z3^)TKM_1wHyv8N3^K}(g&STulch!Aq&$`wdH=`UT*)p#UJ3Y^DdB(o8A8OusIQ-dv z52)(pJjP${yKcR+_*}yr{_%Rh%7gvYY!eH1GyQjZ<5a+ zP%CEr%Fxn#k;|j_e8W0+g`NY!3uZr>*QoJZ59*&k3=L8i5*n{>UI(Tp22WQ%mvv4F FO#mFS8wLOX diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json index 2d91fb460b..8a70dbd998 100644 --- a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi", + "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi and modified by alzore_ (discord)", "size": { "x": 32, "y": 32 @@ -21,22 +21,6 @@ 0.3 ] ] - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-left.png deleted file mode 100644 index 6b55e43f72e5bc32ecda58186c6fc39ada252bcc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 823 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|V1b zPZ!6KiaBp*9qbkglsUfNDWK$Ln1_p%M7Ln)8qwX`gT#7TGY&RS`OUs%EvuyW1>J9A z5>Grc^jYUxRjydesyK?8%WK+zHjlq zpNG>;_3K_Rc+1(J=V zY|b#}-s<#Ms0Bx$B8T{aUjAMer8jQ^6aGGapEpUoL+Wtc znU#3%&)enie!E<+6v^S1_;#j2&YJgP-~;PlX{9gr6n?VW$N8hRU`dl)?~&%696Nuq zyJRlea3Rj7BH)B#KwuN2XI_)XVpXNc7CEn|Ac2ohT#waCr&-U=n|-$|ywh0z#+yGk z=9<5^HlCe&zeUl~i@~E$h+)!VmWC%9j0)&nGe)6wzfC)D2B+=%PZ@hjGW}&*8@n ziZ-sfnRCl!wQg+UQFZCxQ|x)9HqPGJy<^XZPdAu9 zq}E9B=LM`{&Jxy^*G%qA;BuI`aph+n(?ElKso7fJ-`~r+CH1;&_qNT!cNMmlTPqau zO0To_4c=O~p3OeuzvSEb{%06fyAf5e#%^RAvrpIa%dzNK})dqMc&bZtBPw+&g{*GCU&2t6kUvMlE*&R21 z?rT*8ofbI}$J<~3sQp;)^uqCG==wtwWKNS%G}%0G|-o z^mLP(H*cz{s)mM!W@TmV=(jEKRkgRb2g)n2bz2FfI7@>3g8xGSL$H5^&_qS?dWOTE zE{-7)?r*1^=4(~panaoO>wmn?RV9vKp`^Sbaa-xE6EX!yS^jl!$0+Q0u)XO($yyVe zqxZNA0}l$dAD3A2XH`>a%7!wpe`YUkBy+C%lX_w0ae}0f zJ&=CzC-;J3Gi#c>Lf2X2epcp3>zbKZ|2~fMs9wL{p(${mHrM6-7alQ*8yL@DrBFMs UYqR46pf?#jUHx3vIVCg!0Ey3o(*OVf delta 488 zcmaFG^qqNvWIY=L1H-D!!h1l9v%n*=n1O-s2naJy)#j6CU|?M7>EaktG3V_qdoSid zf#V;kwT0MT#u!3m)?SwPSM%V37Ow|KfdK@9V2py?VP@fy>FDVcWx`gqSD zbqZjAVPqrD>?pe6{D&A}MVBlFe*ewCo@aO2oVVsbZ^*RQH)}cDhPd2@m&?9?i1}Rh z`KYh$?D)rTQ+4bA=_~R%l$U+|XT4DVWO4Zdu1;nT{&l5l&*j?^Y}gw<$}k)&W{^0~ zh|b~oc|2+Tq1#-$q@PUvG2wRBLDsvxe7>KpS=6^mzbTq#a_Hn+w%eCtX02lMu=_Mc ztck1P%ZE8^O%@Eft^4htv_D@Wc!V*db7!KCU1;0$SsW~OY1wNw$<)^EmHxWzx~kib z`aQCxeW$V;j>+v`tNZ1}*^iO+VmI2Ky;u8U`FIWEH|b9~J2V;;;o%4h)W3{x_r1F( U@P}zHFftiDUHx3vIVCg!0EK1OLI3~& diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-right.png index cce061bab2933eef43d0399aa85e5c6a4a3fe57d..ae6e01f4a50fd3ab86113959a90076dd0f11a240 100644 GIT binary patch delta 325 zcmaFQ{E}&cWFj*I1H;_yjcNS%G}%0G|-o zn>TN!r<;U^hN`NnW@TmV=(jEKRkgRb2g+~UdUPF-;w%aB3;quU48i^tLK79m>lqGt zx;TbJxWAotTB=2X!_9E_hkyPyD}Gq6m~u-e?chz9Q}t^^nf4uFQRA5Lz?{k9xPI}D ziYkGex}y*NOk@4s)%eMp`x?)j{-z9$^O6?xSvVf_NAxgjo@Dy9XmYpWKEKmV-7+zD z&dUSqmAErfodQ0&Zs_9l5in@vWK#PP>=-%gx6og{i{C!onf{`@W10E++Ri%W71h6g zN;}_O^JHy`=KLT!h*-T9r|oTjDj*k_w7_kQ(NF9~jao_Q=!7jN#Kyi9AO z)|2+or`D&QZ`b=0QIYsXBgab6#cluI5S2eNYWG>M3B=8?_S?&Y=}sg^H?#`w5_{-- zpuV|9?|QZ1h4uSye-U(QDrRi|`h91M-dRi058;YMT8gR`!Vk3eC{AHfXNqYzZ<&yw zdmy~RIligiYwJ`7$qWCE##b~?EGR90wVM%xNb!1@J z*w6hZkrl|-4e$wZy?OIyX(>ZiR+hcJy{f9JfsDZV_3Lv*|1UP)GBJwBn_&*9@xN>L4LZB39fk$L90|Va?5N4dJ%_j|X#1c;z$B>G+ zx3|vb9aa!vNsykV@=x>q{~brQ+TSXk?g?GqWmL==#!z3jBX!xY^MVcxj4T2WqM@9{ zCcfxd<_*(gUq*$k?@vx>uzV^oL0J0%L-8iY0}+hO8_NDq%42*m%}Y39e~S~tnkhg2 z#a>wU)mz2lz^T86JO1}SC`@PJS@70o$A3kOInx=YZJm;7Q#;Ema(W#j3!BdCCcEid zch*|)ac$TWA`vkCPW$5qhSN7W8vdFd*p|~aUnfoP2b)=qyU_>5C7bKNI?Aw2_-?l# zsO*ITLqpA{zuTKHy9Y8b6fUY`kE*yU$)Mc8z{H_|oyccD@Jx7jP{RhB2hJj#5)LtP z9~8S-SP}xjv_V1ynATv>;Q#T!m8rmeh0OzIan1yWAh{2Y-7F90B~%_@*AYsXE%cO8 zeu)PITUo4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6949718a597117c697fe0311b2475cd2fa75e5f9 GIT binary patch literal 620 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl|-4e$wZy?OIyR#sMNDTBSey{f9}`t|D#WCR%h-_I5OKhxM)myIDbG_=51 zbw|G~P)A$j^7lZBza+>n_&*9@xN>L4LZB39fk$L90|Va?5N4dJ%_j|X#9B`m$B>G+ zx3^9g9ai9B4M-N5bi?%j|D6+q&G;rYu-z%Cdha!}@W{txb>ENEL9T~``K%W1#Wqhl z3JU$6t~hgXCd2z=CMJP#>HNLUHFX8z%pY_)5_=Nz=gj@jRKc}w zyCM_U_UyWU+6}C~OOqLD(r^BhRPYPt_^$f*#muL2ho;C*XSUeFBT(S~ac5V3TN55b3?N`pb^-D|H7Ya={|99(_cM4ZZ zMW6kPiYgb#+SOHDue;WoLp1j3&i%8F$+i?lr@mXiJePeTo5H!jy(VuJrbufS*K6xq za~wT)>(2fOuVh<<8n*1LSG;P?!Fr&0;)8UCf7z?f-e8E@YxZ3~^}eIW(wT>ZE3$hR z9@mzT=YG(;w>i&{;qG;hBN7dMubEqGzL*zyAv^WKe&(ba24AI;*2fFyDu84>UHx3v IIVCg!00hGL3IG5A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/meta.json new file mode 100644 index 0000000000..c6fb3d12d8 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "by alzore_ (discord) based on the proto-kinetic crusher glaive", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..330b936fb254e39bad9b220d6dd9c291e9aecaca GIT binary patch literal 536 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl|-3h)VWRaI3jEoCr}5n%j(KUeg>E*rzmn>W|5UvF=3KhxMaG&FQaziol9 zDp2{&g6ai8imxQdFZe$)U~oNf=LArOv%n*=7^vU~2s2LA=930GAlB2xF{C2y?X9zA z%?bi-4+VLZ)_$+wotkhdOUfeXt*6-g?VdkoKJ3(MUZc+kGz0}aux0!tzsBqG-!~JK z&&BFrShjSpZ-ktmP_MLlx%WxtUfp?Jv)#V0xmot+xuu2gt=&4Ob&p9Dl^A|8P?`Q_ z(S9%CXE$$$oLjfnpT+mqbT=U|LWJSHn(-I z-ER9Ha%uM zE?-DeeYbOhvF*=w+X_v$^449;W;s1+y}%mz{qLDgHm|&v=p7jQxvE#8_L=$zN$dGe zEBDzqUc1`-Yts4a965V0KCI*mH@Eiwe{ib&=s#s3bzDt3<%K(=|0#D;b8_p?l2 Tq-;pM2a@n~^>bP0l+XkK8o$z0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..2d1a481266dd20b91a96205758635bf8bde856e9 GIT binary patch literal 535 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl|-3h)VWRaI3rkP#>?Wzc0~$QAw1`2W7Wy?tnC=uBhd_3PK)ym@m+ziol9 zDp2`B(*+qoimxQdFZe$)U~oNf=LArOv%n*=7^vU~2s2LA=930GAjZ?hF{C2y?X8PN zO$Gw34}Du%GAjRH&n@d*>gTy>h3xT}|6^8k?mn#^Clnbk12hE%9FS&w67Thwfz#1W zC-t#LbmO#Xy>(Gji_WU5^CWL@{rSlvOz@cElv4ZSpH*IEZ&@-$@3P6u5Z^h^k7oT# zoB2G$^k&qyZ%4ZR6htR&+OB)ir1D)(WY+cbO+FW%+}gBRJ(OkY-TSvw6;F#rUkS?M zTXyZ=?o;1#x7-ZZeRJX-R0`bOnj@#7F6XdnDk>MyTGoyya&p<9P1CSN@w?ri@!Ae zZsVVgH}CFc{=lvituRc8-OqSsx|s=! Rxzl-&jHj!g%Q~loCIDCo)Z_pF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/icon.png index 980af14aa86c025fc1be958d55d6902884cca2ab..e22b636f3da9e25706672b73b822daca1573690b 100644 GIT binary patch delta 370 zcmaFGGL?CPWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hHfKQ0) z&6_vV(@pH{?bokgUs}qbs;Zimm1Q6!5E>eqEBb#&zb(VOt&IQgAKwz8%f>KKNMNS1 zae=QYQ1_BG9ic!0&^HP)!yNls3=~~aLm)iF~q{Zc7nH9vjPu;=xntG z%clO8-}W%rF?mL>{<($|BJ3)eY{fl!g4wK}x$iAjsFYy2xmZ>tzm{picPj>`H+#5_ z{BAh=n&I!Rw`c8H5~FK>Hui8al=q*08G7K&lL^7qwcIo8c>>zcm?r!)ivMHk@!Ikh zwoa#KLi+Rb)^D);+bu?uAJa- z5orN}MY@#I<14%_AhMAkfPP-|4gN@gUN`!4 qflJLV{)0f{wDVO!(=^{&-kATOhZR63qbJA!0000O*Na%yE`C^QR2~SwcEO%BNIOqM^1B{ct9&bqU~?)#)yjc zjSqLPYnIr+RiJk0?~@7-rhR!!kIr&gJclPy!p7}Ke#Gs1yR-_GTQ?s_WZ4T{%m1GC z_b0D~kszSo5;iszrfRoV4GY_9^-p+H6j z8BqpIYK{ieieDTSzXWfvCS09SRXZg#BaHFN!@FODJQIW)rXMVfylxtKcEVzj^GXc$ zcZznZ@a8XE=d_vQ0at#Z>Khi8wcV}^=@s2mH_Ya4x^`GeA#6Uw(eE!B1vs8RVtF8^ zalZIN?wT2@2d=#j&S?0Qd*XxGgKO{4OGdYSf9qwb@!-nW-^o8#izmL?%g#DyS6#hM x@LrDKid-g5*7A=(?}~31pV1ABoDT61%&+gsBy#kg{Rd1E44$rjF6*2UngEgz_AdYc diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-right.png deleted file mode 100644 index e2d24c9ee8af39cd2379d386af1a2122da0879fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 568 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|VnL zPZ!6KiaBp*`DZmdh#cGRAa2_z@_mwCaifw*i_=S2Ce^*3kJI!n`G&FPKQP;|?u(e2 zztO>EStjQ^((nCle8NAo^M1aJddfZC8OlrtWCR(WbubvXvou&LF`N-(47R@U{`=LU zoiPUj)i@*8Ul)~mp2cX_qP|XO!Qp%}=^Zscg%`8B1U~VtNSeaHHD9IE{9)%orWzi9 z9wtN0ib?D#2|8RDISk%#5%bax^ z^2+@C%PT^cmOnH-?(=o(hU)qiW%KVZkgm~vP_cady!Za+_qM29NO=9>%e_plA2NGR zR{H&PW&wICp^t;1*o6VjzsFc-tP-EG`rUyQ440#yU6~(rY86W|Q_fZH8`Bb88hUk$ zU$rlDoVBd<|F(ZC=jj}Hwr=CJf|^X%Ln(~gwx5|Tlu>@mWHRfSK>Y=(H*UOBl%(# zl-kb&mX&SsV(jUMX3?q`=_m>gTe~DWM4f Dl|1t* diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json index 2d91fb460b..8a70dbd998 100644 --- a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi", + "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi and modified by alzore_ (discord)", "size": { "x": 32, "y": 32 @@ -21,22 +21,6 @@ 0.3 ] ] - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-left.png deleted file mode 100644 index ce6c530f30cbc37d39d8a17ab069a3a9c60f73a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 567 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vnr zPZ!6KiaBp*?e{wrAacxJnB6=!MImolqJr92MxH*sJ{xu^aruKsHMp7AA9!&n#l)_` zmxnpgHR;tO=@?5D@!M6=JEz$nF0bQ$yZ1uz`SsJwEYhW)tYDb1n8~4!i@{Qh0gclT z%AR2&b<8ww{q>7kTLV^K-L}DT4%4A#+v4KVmd&T9UwM>cG}SA$Oz!x{nsa?$tM*>W zSGlOvc6edt_S+IXY%4#WOli895fbJ1|J{+8`}-87>Mhql6)C9N)Bo@B@%4p~Q~s_A zTmAX-lL!HpV|p=tPxYQFmdCT4C=8ntqhG!DKgUEHmH8_fp6>}h@VD7IposBu@^zax zNpHU|_Y~7J&{XtXetD+)yxzCYaeC9H+A!CMM}LutICg&lM=f`Qj3`4<2*Zg$Mg@0P zJe)aOrybvY_g&QKhuufwW;LX3&Ri0cxBAGm{ihzEcHvsNZ=*N2!0AiU0C?=X7Mh$H&4g%w5-3G@sqDCQ*Qq9UqAnbZBMYZcUkl{ zcgGLCZ`BW6G?}OyuYXDS!Ra--lmE=Iet)@t!cp%7@n_j)FY@7U+{fmK2!Ch&2hyK+ W9#3a}tRDhQ2@IaDelF{r5}E*3Z1E!i diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-right.png deleted file mode 100644 index 84abf8014872d68e3dda5c27c3762dd628caffae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 520 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|VnO zPZ!6KiaBp*?e#hwAklW;N$zN=eHG@SM@tXy0keB`Kif#BOq(wXgkP9NErE-hp+ z*9;PO-=4hRDQnjJ$xB`+y#MXsd2agW&re?}p8m-+L77p(oynn(r9p<1!BU8!NQL2v z2g8Yp3?K>h2)*ffCQ^wTBc8~ed;U3Wm#qX(%su&i@W5{ zuP&5-_;TXz-Ij;1el31$m>O};^<&-s{)YuWHZ$u?NZlH>)1q&?XUXo^?V0Ky7wv21 zJTvcJVP#zoQAt7!d*SuhsBPR`a(%}iPxDRsesam|>~-;hIu8ql z%>Rk=OHMwOs{j0D$*WVpZtZ42*_-e5$M}-v?|Wx2xCTX5U-3~h|LUzWmisSDv|bCo$=Lhu)>7*QZ(?ktjT1N{mCAfKl>PbD z==^cb-rrL%Zds?Gejr>wAtjrwW-Fub%FSh0WqiwHAM&lR3jTk3R^zIz_0qL0j)+iw c!CJ#?%5Yd}k#M&xFlre*UHx3vIVCg!0Kwwl6#xJL -- 2.52.0