From ebec1b7dcf50446fd4bc34ff8de53a4431e9139f Mon Sep 17 00:00:00 2001 From: TaralGit <76408146+TaralGit@users.noreply.github.com> Date: Thu, 29 Apr 2021 00:14:27 +0300 Subject: [PATCH] Inhands for pistols, beakers, reworked melee weapons and laser gun (#3887) * new pull * beakers * melee * ffs * hope this works * ffffff * Update meta.json Co-authored-by: and_a Co-authored-by: Swept --- .../Entities/Objects/Specific/chemistry.yml | 2 + .../Objects/Weapons/Melee/baseball_bat.yml | 15 ++ .../Objects/Weapons/Melee/captain_sabre.yml | 15 -- .../Objects/Weapons/Melee/fireaxe.yml | 2 +- .../Entities/Objects/Weapons/Melee/katana.yml | 15 -- .../Entities/Objects/Weapons/Melee/knife.yml | 4 +- .../Entities/Objects/Weapons/Melee/sword.yml | 47 +++++ .../Chemistry/beaker.rsi/inhand-left.png | Bin 223 -> 258 bytes .../Chemistry/beaker.rsi/inhand-right.png | Bin 229 -> 259 bytes .../beaker_large.rsi/inhand-left.png | Bin 0 -> 297 bytes .../beaker_large.rsi/inhand-right.png | Bin 0 -> 277 bytes .../Chemistry/beaker_large.rsi/meta.json | 8 + .../Chemistry/bottle.rsi/inhand-left.png | Bin 0 -> 315 bytes .../Chemistry/bottle.rsi/inhand-right.png | Bin 0 -> 344 bytes .../Specific/Chemistry/bottle.rsi/meta.json | 170 +++++++++++++++++- .../Guns/Battery/laser_gun.rsi/base.png | Bin 589 -> 643 bytes .../Guns/Battery/laser_gun.rsi/icon.png | Bin 646 -> 660 bytes .../Battery/laser_gun.rsi/mag-unshaded-1.png | Bin 110 -> 125 bytes .../Battery/laser_gun.rsi/mag-unshaded-2.png | Bin 117 -> 144 bytes .../Battery/laser_gun.rsi/mag-unshaded-3.png | Bin 117 -> 150 bytes .../Battery/laser_gun.rsi/mag-unshaded-4.png | Bin 129 -> 146 bytes .../Guns/Pistols/clarissa.rsi/inhand-left.png | Bin 387 -> 392 bytes .../Pistols/clarissa.rsi/inhand-right.png | Bin 396 -> 332 bytes .../Guns/Pistols/giskard.rsi/inhand-left.png | Bin 387 -> 332 bytes .../Guns/Pistols/giskard.rsi/inhand-right.png | Bin 396 -> 372 bytes .../Pistols/hm_pistol.rsi/inhand-left.png | Bin 387 -> 412 bytes .../Pistols/hm_pistol.rsi/inhand-right.png | Bin 396 -> 416 bytes .../Guns/Pistols/mk58.rsi/inhand-left.png | Bin 387 -> 418 bytes .../Guns/Pistols/mk58.rsi/inhand-right.png | Bin 396 -> 429 bytes .../Pistols/mk58_wood.rsi/inhand-left.png | Bin 387 -> 643 bytes .../Pistols/mk58_wood.rsi/inhand-right.png | Bin 396 -> 647 bytes .../Weapons/Melee/baseball_bat.rsi/icon.png | Bin 0 -> 342 bytes .../Melee/baseball_bat.rsi/inhand-left.png | Bin 0 -> 427 bytes .../Melee/baseball_bat.rsi/inhand-right.png | Bin 0 -> 417 bytes .../Weapons/Melee/baseball_bat.rsi/meta.json | 22 +++ .../Weapons/Melee/machete.rsi/icon.png | Bin 0 -> 317 bytes .../Weapons/Melee/machete.rsi/inhand-left.png | Bin 0 -> 331 bytes .../Melee/machete.rsi/inhand-right.png | Bin 0 -> 384 bytes .../Weapons/Melee/machete.rsi/meta.json | 22 +++ 39 files changed, 288 insertions(+), 34 deletions(-) create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Melee/captain_sabre.yml delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Melee/katana.yml create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml create mode 100644 Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index d9afefcf83..3e6b96aa1d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -44,6 +44,8 @@ - state: beakerlarge1 map: ["enum.SolutionContainerLayers.Fill"] visible: false + - type: Item + sprite: Objects/Specific/Chemistry/beaker_large.rsi - type: SolutionContainer maxVol: 100 - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml new file mode 100644 index 0000000000..10e1e05e5e --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml @@ -0,0 +1,15 @@ +- type: entity + name: baseball bat + parent: BaseItem + id: BaseBallBat + description: A robust baseball bat. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/baseball_bat.rsi + state: icon + - type: MeleeWeapon + damage: 20 + - type: Item + size: 24 + sprite: Objects/Weapons/Melee/baseball_bat.rsi + prefix: inhand diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/captain_sabre.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/captain_sabre.yml deleted file mode 100644 index 590dfafd2d..0000000000 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/captain_sabre.yml +++ /dev/null @@ -1,15 +0,0 @@ -- type: entity - name: captain's sabre - parent: BaseItem - id: CaptainSabre - description: A ceremonial weapon given to the captain of the station. - components: - - type: Sprite - sprite: Objects/Weapons/Melee/captain_sabre.rsi - state: icon - - type: MeleeWeapon - damage: 20 - - type: Item - size: 15 - sprite: Objects/Weapons/Melee/captain_sabre.rsi - prefix: inhand diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml index d77663a6ad..04f610d3b1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -8,7 +8,7 @@ sprite: Objects/Weapons/Melee/fireaxe.rsi state: icon - type: MeleeWeapon - damage: 30 + damage: 25 - type: Item size: 24 sprite: Objects/Weapons/Melee/fireaxe.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/katana.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/katana.yml deleted file mode 100644 index 441281db21..0000000000 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/katana.yml +++ /dev/null @@ -1,15 +0,0 @@ -- type: entity - name: katana - parent: BaseItem - id: Katana - description: Ancient craftwork made with not so ancient plasteel. - components: - - type: Sprite - sprite: Objects/Weapons/Melee/katana.rsi - state: icon - - type: MeleeWeapon - damage: 30 - - type: Item - size: 15 - sprite: Objects/Weapons/Melee/katana.rsi - prefix: inhand diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index bee6ecc1c7..f26e4bd96d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -43,7 +43,7 @@ state: butch - type: MeleeWeapon - damage: 20 + damage: 15 - type: Item size: 10 sprite: Objects/Weapons/Melee/cleaver.rsi @@ -60,7 +60,7 @@ size: 2 state: icon - type: MeleeWeapon - damage: 20 + damage: 15 - type: Item size: 10 sprite: Objects/Weapons/Melee/combat_knife.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml new file mode 100644 index 0000000000..ed628e9801 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -0,0 +1,47 @@ +- type: entity + name: captain's sabre + parent: BaseItem + id: CaptainSabre + description: A ceremonial weapon belonging to the captain of the station. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/captain_sabre.rsi + state: icon + - type: MeleeWeapon + damage: 15 + - type: Item + size: 15 + sprite: Objects/Weapons/Melee/captain_sabre.rsi + prefix: inhand + +- type: entity + name: katana + parent: BaseItem + id: Katana + description: Ancient craftwork made with not so ancient plasteel. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/katana.rsi + state: icon + - type: MeleeWeapon + damage: 25 + - type: Item + size: 15 + sprite: Objects/Weapons/Melee/katana.rsi + prefix: inhand + +- type: entity + name: machete + parent: BaseItem + id: Machete + description: A large, vicious looking blade. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/machete.rsi + state: icon + - type: MeleeWeapon + damage: 20 + - type: Item + size: 15 + sprite: Objects/Weapons/Melee/machete.rsi + prefix: inhand diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left.png index b79f6f97d390c169f0058351cf9056528aa5a26d..7f577f668a9e5150ca85d87d54c947e70146e850 100644 GIT binary patch delta 230 zcmcc5*u*qJrJkkO$uool2x>S|Iv5xjc6z!vhE&XXd&`ll*+9VU;r(|-a^7EkYySJJ#IrG43?TokY&NsjRV{cK($Nhbg zkyqjA*qS}NH>?p0-gMr7+u>4Xm6t}o_mqDNP20Mf7pN&7td-$F;1BUT-(BuGDwg#x zE%)uxTW!|w zy>jdR{+~O8vd@3c%8&MMP>EfBaxTx?TdseWp3noE!(aoX3WV;}9=OMIoALMC5A&S9 takxLap)B)@#e@A8uS=piP(j1{JB;z}M$fOOY5xal^K|udS?83{1OOnXSCRk# diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right.png index 8acf56da76ddd8d254839fa4028c30fb1c008e68..da6f5180f8d806349a709f7a6e905cbffbcce7a0 100644 GIT binary patch delta 231 zcmaFL*vvFRrJkkO$uool2x>S|Iv5xjc6quuhE&XXd-EXgVFjMn#LLp3RkDnN*^`=h zn0whz7)-q5&3~3NMAT*0|H&2#l8Gnx*$M)+F)%cA7vAJDwZ7v%y}np!d(P1pF*hc^ zPj1RPFgN{cfRA_@sBly7F7$< z+Jk4_4=EAgtX}mubf>`Lm64NA+|gg%DzW;{=eukjCz9vgHQqYgWBSLM)w}{PP3FDd eqzN=+!3pl`7o9A`O|uVx%=C2ib6Mw<&;$U{!()d4 delta 201 zcmZo>ddfIKrGAa4i(^Q|oVT|e`C1fsS|1u&pIa=Me~QzF$BpknqEEqM?(k5f6DI%e z_pzMtz7?y@!~g;xjQsXaEV7$hy?lS>Qia#);ZCaIJvCC;sj zUm=kE?eUziv)}$GJg0apTJkI3joS8yb&J?mJ^l0jmHe6~EKXqKK!jYFnbWo{#tU}X y$l4ihF%Fp8I+xKmlKst^H#{N9dw&5{RBYyz+h+7!_{W_-kOogzKbLh*2~7Y{BUMlU diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6ec4b0fc67c109189048e2fbb1355ea0ee631bb0 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf zpjL*4tv7dscBL&&KYDEazc;R%GtyFHqqn^KcR%{q$~9T>XQ!9$UH5G1JBDdD{#@G} zA>7ord~*89)RU{OZCVw3MH*xR7;KRG_wlQN+WbnFce8lCg3c`cBq&n+{?y^tGj7*e zs^8asWy}hjfvoa$^>bP0l+XkKuN!}x literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9c73c968099e81561838c632a8160d38f131cbeb GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vfy2*GFH9xPfDI5P&2=`lTq^6Q*$MtE(V4N z8MBUxdVYN!dtK-KYS*BvOI9_1pB3^o-8t*~u0Idt^1@Xv+n%4N|ujLR|Lgte_AM+U%qmdKI;Vst E0CX0DzW@LL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..5577d69e01a8a3ffdbb614710d8443ef2123b0e4 GIT binary patch literal 344 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#X#z`)4w>Eakt zG3V_qL%+ig0<90trCov)11}bJELpgG!DADX4!szz?-$-^P7o+!P`s%6K$gp4k;9Rq zH+L2O`4>I^x=-?SUYaVte0kB`@0kI==KpoR#1G zL$|D#rTq*2{`v6P1C^Vi?=yIA7SJ(0dm*wb<0^wE*W!y4EdMoRee|zy0-FXRb{JqZ@T<9 z{B%*;gJKTG=DltL_t(oh3%D1ZxT@yhM&P{DGg(CV?xtf7i=6s+DIT1Ty(+8 z;Fk0k_(%Ld4eKsg%*v!0#-i1funvk8=gysb&wK7U z_X8p#BK~)jWhQ4bnLxH%t=2-m7Mdi5^Z7gg&1N(7f1Y5}MSsMl@SlwJ1+xaB02qcb zN~P<%2qEx14^7iXHjzl+`#zrM{ne?aX|reppc;k|6pKab^*V#WfVH(Xip3(PX@)F- zX_}~KT>w7x{i%*OcH#h3_g-O|CgpN@VvKFu+*@5;eckO2omMIpI-L&plSz7)m&pF) z`Z`vl0l?nZbAQf)6?)%)ObsBpq4J>gjh~+dkG8k58V%CvG>+roc^F84z)mv3lNT@fa(>Rk&CQVgToYU+uh~e$q8FqTljuB#ecKZUXn_s0O<94qi@*;&~+UE z$8o|LkodljWm%zJykD&bEAjZKEUxR4%Vs&K)f5<>4!LQ^0~v42EVNoJC8nw>hlhs@ z1_O>P3n9dWIDmb8Jh9S)T20xnR)g_=x!Sv|6o*@m;ceo&t_Ouef$OU)ynY|obtf(x znE@Dg5Y93VF9z`IyR92U5Wg%F`fXc_UD0%*6}3J??u1>BpPkf>x)ahT&Z o)O9_G#cr?IqT&$|5fK2t0Oh|O6ZUF)3;+NC07*qoM6N<$f^35z%>V!Z delta 548 zcmV+<0^9wA12Q|OHa-J@+LF$=J)2!n+asf zl<9w0?mo_yN+l9)$8l1vmC8wg>-9PSP^?_E@u<13t-ze(wEuF`Niuu ze7(Bj>EU6_ehS{N=5$}a!?tZq)7*j&heLAZaygQue*1+v)|S#TUD zmzQOkUavWkPW0+2-JIB+)69*uI m$me$_EFCR8Q>ILr0Db{2yA^F^>SFl-0000^a@o z*x=~sh`V!hw13)dSljG?Vjf2BO%H=Y?@6%{B`eoYHEtEo`5Pz#`Z!bPuUFFOEJ_`#AL{XH0 zk5hZ8`T2POTCG;UFWUgRt^?rveli16Q54}gPGT2tRx0syF4r$h5Cp6k23yst0=?5A zH|<~`gKe1w&-0Xws;X>nZ`18|*>N0%5JPYPcXxMarCZgivRSFbgX40w*I5aN5yx;8 zT-Wv3G-OTA&&~)hE(n5P=(3R+fL^(7bPxPV{}K+68TZHQbQ?HKa1{$75|7Yr;9~{Q zXfzZcHcgYD(@8+3CWXTdUPE2i<4k6B#U_QPN|h=Vz)y8EFtR2PGNAwf002ovPDHLk FV1g92C`pzu)h@K%zv6{&%Hr;=Hu9avZn-k7{hp zj~YY@pi-#>skChyP1A53hio<*SRu!8uH95olqhTfSi=(&;pYVcsb>wa*aDK44&6i$}`CKk!Ke_LMH9H$msMqUMtJMj(X`0-UBo_E!eFk8g8lbDOWd9{pFj zkbU!Xn1PG^S&aJ%ACHfzR;$>y&B@70P^JUDNGhMt`+u@L?8ViU72Y2mp=nwO9Hs7~ z5Hx(*EcEtG*#?d|P_y7ujYcB{!`q=K3a;x;1Ty|D zvS3+ON>UVs-Q8V0&tt#YMANhhIDmO@FmcjGqme3?%l`PdIPLGOfWwq)I1R4ry1%}@ z&c*pT?pEa`gTY|xV^b^^eE`>WBR@vhF8Y^n04eIiKPfIeb^ro+Q#eHY8HqBSo}Nyf rj|-0+fCxg8rY9^eJW--Vi2!~AeM>9fwvYk900000NkvXXu0mjf({L+& diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png index 1277964047adb789cb1ccdc7d62dda8a9d48c668..43de02d5afe00166c9700f80cce7aafc6002e47b 100644 GIT binary patch delta 78 zcmd0+onYc=;_2cT64Cnh>_*-L3IZ$#tF4MG^Cq*+Kd^{VNARr6>|7>>_IZJS!+!nR i@!9ve$9p!02mP!bGdOH+U+-JP00f?{elF{r5}E)8Tp(!x delta 63 zcmb=;n_yz4>gnPb64Cnh93wA-0mp$2KgA1ID?C=r6y3t`VAaY>)BW-c4BvJ4$}`U~ TTHW-E0SG)@{an^LB{Ts51ezDB diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-2.png index 6a82939cb78ab59a5edb456b4315c205d862b870..3e6690995beb7016e9be7b48d4950b3580ca97ce 100644 GIT binary patch delta 98 zcmV-o0Gm7Puk>{MWd$ zEdc=jF0#d=g-f;W87kE}dwwfrT=L`an_JHT002H^0h2fpv=xBKwg3PC07*qoM6N<$ Ef}~p};{X5v delta 71 zcmbQhSUSPPQODE8F(jh(?KwkU1_c3@gO~fbmn?j?;(~+S%*<_fSs0eR^8D@<8nKw0oTWMfsvu1Qe3;rD(pG~5O})!xvX(00000NkvXX Hu0mjfaXu=N delta 84 zcmV-a0IUC!0f7OKG)*{3L_t(oh3(8S5da_%#K620^e}@xgn%KOfB~v+D9ARc?m&{H q$09qdgIyY|3Agshe@l`i{pA41zzG7uDXkU&0000r^O( z;-)y-DPWc^NtS#pikt5y=tFdnW)WS)B~aosgybc=200000pqb}Hs>?ddb~~+W>&#?u%XU>5_^q2@*{*tgxPLd5R>ir=;A7cJmKPER zzKDqW{CXQTt?`^lg@G?wUYJa6&*%=A&o5+?Ci^Bd?Syjin>4BXc55$<90~0WC@1>y z9*?GznXKcuu?f55lI4Z0<5;GXS#8Wgs7v_R??ByqgKGc)0000000000{)4Xb0Dtvg z+Al}D%mZ}cIcJf&SuA=FQfP0$u~*@J?25m>x|FeOd&SZ|An|*zzic%W(MGxW)$2;W z)1+5??K|Lb9zf@;Pr3M~=atQjH= zVhaKp&;&erKS&(c{rtz;gZsg|+tsmazt>qEntEPNRri1aPg+`7wr#E3+N*bLO`W0| zuG>Vr%-B8umumI<*}J1%rts{ayM^I=rdEI9mJW@zrpBB1yWEJ%786X}@4o5XUHx3vIVCg!0I@lkOaK4? diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-right.png index e7c52b5bb4b06f14f13763b6113671406caa2850..f06ab93260bcb6f91198a84e561be4614e392db9 100644 GIT binary patch delta 306 zcmeBSKEpIYxt@Wg*vT`50|;t3QaTtI7@0j?978JRyuD@1*W@73_K@FH?mz{vaOR3N zTQ1+I4BdYDR98#FBi^2vLq`%8vx%~%#MXbZGd+BcM|zedCj$sPSn{0zlK=Ar=RnzB zcgM{ypXkpD2ss|heC}v|dFQNK`^~M{x9xtCDZEZOYquw5YQ7RU6> zxmOtWuFfG+?>oo2^qXO;8GYZL_K(dz;kPa~`zmML@rCM|Q<>)O^V`)K9_JXLy4{+4 zTj)N+$N{ za}?fgdFHTi?zCwldBv*&s1bCH8n>@lNHAjwkQ*_cysSzB1qu6I^-vre5v*vZ6b!KkvONS|>QM zEz!U@x@W?d;4h~!EG0sq;Tm(_EyWwJEqxj9?7g=<^Qz3gR@-vXSxjekGiN{hpnK-I z`;ljpUoB&}Ubv-WgK6=P@}Ij`Z(#Rj1iE6^oZPcA|9t$s>_i&npN~*fqYzSlXRo%GPyys2x z0A2rB%mdi&Ju5ap&k&4ZjJ3}CiAf&71{neX008{%3D&NqL5<6YZ~y=R07*qoM6N<$ Ef_jvS2mk;8 literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVD$2IaSW-L^LCcvv}OkZ*6MF% z#Y{QTMGF#c_o*i7Ea#dOx<~vZ(_Yn2r_+Phf07Wai=1|J-%RtQjH= zVhaKp&;&erKS&(c{rtz;gZsg|+tsmazt>qEntEPNRri1aPg+`7wr#E3+N*bLO`W0| zuG>Vr%-B8umumI<*}J1%rts{ayM^I=rdEI9mJW@zrpBB1yWEJ%786X}@4o5XUHx3vIVCg!0I@lkOaK4? diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-right.png index e7c52b5bb4b06f14f13763b6113671406caa2850..ebdaddb1e1a36fe0f91dab8e4ffe8823611f5d58 100644 GIT binary patch delta 346 zcmV-g0j2(o1M~urBYyw{b3#c}2nYxWdTTy^wK~ZEgJLDru={BWM^k~ZZk>& z000000DRKM%5UGH4!81n`st^)==EO|p>!VONhHo?GM+>d27i9%3-C3cQXhwbFY!zF z3Q&BsF!1HBB4}g9xlE?BrFh;zifz-CZU_VaTjy$H#q$O-oh`+=>>{rVtKq1#$>)mq z)yB$dIO*{{Mz1rL($Ya&5QURXTyIOCyYQBgYErK>y z=8IUZH`}H{JX0>8zo)yy?a}iCw6T)z4vj5rl5YvS80-{)Bad{C*&`G+8+$N{ za}?fgdFHTi?zCwldBv*&s1bCH8n>@lNHAjwkQ*_cysSzB1qu6I^-vre5v*vZ6b!KkvONS|>QM zEz!U@x@W?d;4h~!EG0sq;Tm(_EyWwJEqxj9?7g=<^Qz3gR@-vXSxjekGiN{hpnK-I z`;ljpUoB&}Ubv-WgK6=P@}Ij`Z(#Rj1iE6^oZPcA|9tR-V8xUqMMc}*R*C=L*5-co z^xWwj5dZ)H0002PEZfs6=Vf(T=Hiy^X*cYMAB34cCYg8i27j)jeh}(<{h~h&Le}wr zT0ClLmLR0Z4P58l*!^cyj9-EDLEBf4CyQN8>f4QsCy_K8?w5DlvOR4!Tp3Rysc$#3 z*wsE=^C;{eILQRd_VhZs)BPZ%-w#|z<58=UzyB)^WkA(u0RR910000006-B{R(MS8 zWxP0=ryn2>KYIwZ8+Hl@!FT}T9tK%jg4nO(ho43&JXqjtQjH= zVhaKp&;&erKS&(c{rtz;gZsg|+tsmazt>qEntEPNRri1aPg+`7wr#E3+N*bLO`W0| zuG>Vr%-B8umumI<*}J1%rts{ayM^I=rdEI9mJW@zrpBB1yWEJ%786X}@4o5XUHx3vIVCg!0I@lkOaK4? diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/inhand-right.png index e7c52b5bb4b06f14f13763b6113671406caa2850..e6444383e95d2d69c52d2e97e47de7dee592991f 100644 GIT binary patch delta 390 zcmV;10eSw61E2$tBYyw{b3#c}2nYxWdk5DgA}hYXn<0uBzw)h8$pqS)fncX3FuSg^Qs^f@{Sr%NM2V@+bxs{Ow)B=_EP z?!8&g5di=I0002^W|)rt^%{zBERNfxhpy*q+izV(654)CTz}6`ABXGtx?Fy!>-iek z*2O0v9#5v11KZNDU%$8n>~30MTl!NHwpYL~9c?yhG8m4ex?ag_Q<3Jw>&>Bo&slt} zvrR>+>y-?KBWX5j$=BL29esRyR>O1>cm9%s7ujEL*sp6~TN;mZ@1tw@;id6k;sgKy z00000001c7Z+})=%9ty$KOil`bTo7QJ*TK=p=c*1;QsDY!udkFy-uk~a6MnUy^e(Q zMOjni7uDZi-rmzSA!HOEyNoJz<`b}6K9B0}lkxO${XM6sXJIm)ZhIEaLazFIM#p*< k&Q{SUps29`006M#3vz$C@$H+x761SM07*qoM6N<$f?nmdH2?qr literal 396 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU<~$jaSW-L^LCbDU$cRL>+$N{ za}?fgdFHTi?zCwldBv*&s1bCH8n>@lNHAjwkQ*_cysSzB1qu6I^-vre5v*vZ6b!KkvONS|>QM zEz!U@x@W?d;4h~!EG0sq;Tm(_EyWwJEqxj9?7g=<^Qz3gR@-vXSxjekGiN{hpnK-I z`;ljpUoB&}Ubv-WgK6=P@}Ij`Z(#Rj1iE6^oZPcA|9t1n49LMozAy<&h z(#0Xen<6z>aLEZ02pt>(E3a=+-0j1c?`DAw7b_>r_Z2jpq3hw0u9K z@_+o_pO@+X69NDL0002MFh_bSh+8@5?n(o9j zo;1`|i$dR3j`Y-gu{!w`1W~N!i`D;l0rz*eqTk(%<$5DV!+|(9gdmF5XgCnd^+xo& z`@(;r?=~_J;{(Vy`uOzPNiwT21V?&myqy&;Gv3aWBfY}qlguhT^D2}zoc|mSpLhQE zziON8w>6>fDu3JVm0rfSd!?5L0000000000z@^g31L!c7Auzri)yV_s_{|WswMIW# z-8_Jfe1_oMeWLLfP$v(d<1j<;_Wsd1=RD&BNHR-&e|=Ww0dyS85WGA;T-J8EDi5IJ nDl-ICc>o<`2mk;84Eh0ZLA+Yz5HP9$0000h`gD literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVD$2IaSW-L^LCcvv}OkZ*6MF% z#Y{QTMGF#c_o*i7Ea#dOx<~vZ(_Yn2r_+Phf07Wai=1|J-%RtQjH= zVhaKp&;&erKS&(c{rtz;gZsg|+tsmazt>qEntEPNRri1aPg+`7wr#E3+N*bLO`W0| zuG>Vr%-B8umumI<*}J1%rts{ayM^I=rdEI9mJW@zrpBB1yWEJ%786X}@4o5XUHx3vIVCg!0I@lkOaK4? diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png index e7c52b5bb4b06f14f13763b6113671406caa2850..7efc0f30fd0910ddf1845f374d54648020648fa2 100644 GIT binary patch delta 404 zcmeBSUduc|xt@Wg*vT`50|;t3QaTtI7*jl5978JRyuD?ZcgR72^#Wt3w!(D{-lJmC zlC7c>GisQkHw6W(ahdGwGI0mvg$50cOG}oV7A#^q!|Kqa9N?ohL9wjotd+#`{g)<% zTR$!|ozKAl0Sz57@tY@f<=65Hw}ia;WwmWu)|JEc3K4#MDATJftb z(IQt{v;+go4HFcvZv1gK&G&R}Z(Q7c?Lv0($RF!~oU++pH*z{@z0+e`zE$R!O5U6I zD=QYg_+8akfA*nO{hpM_-k?99_kWa`t-Ct#l@ue?#USd_&%$8i*a7^=O1q^@BXuG-f_lB uG3D0&+$N{ za}?fgdFHTi?zCwldBv*&s1bCH8n>@lNHAjwkQ*_cysSzB1qu6I^-vre5v*vZ6b!KkvONS|>QM zEz!U@x@W?d;4h~!EG0sq;Tm(_EyWwJEqxj9?7g=<^Qz3gR@-vXSxjekGiN{hpnK-I z`;ljpUoB&}Ubv-WgK6=P@}Ij`Z(#Rj1iE6^oZPcA|9tGaSW-L^LCbD_pJn(_WGBv z-c0x{@V2U;Ab#QM*#%9(#x2r$oU&d{F9KZFd4+`VO<(hug^l0SLFBe(U1PDp@!9wN zChiWtC3XMK`hx%IwUvh_w?A<`bH8H|NB+$697Z#t2HgX0OdD8lcra{ZkmfufmY~dd zgDFRaA-bWLC4qZ`rcFbt^{T6qE0e!%u~JUGc`mT}Q&0xO>9UZ$VXm{*_1&7jO#4dq z)uuJ`f-@REJ(ilB*_5b%V80#f+H)Sf)r@MFmw0TIZDsrML+-{o<(j|O4xHWk_c{kq z@@~xSj>!_=AAj7uRsU<0;`)|v4F0b6HLs*+PwM>rQKC@j@ux?B9?YDu_w#h|=RlS7 zUN6p>C%b1^-WK*Bciu|-x8_T)6KrE%e0x7L15fqAdow32)8?sWWH?Y<+w$(*6^uOq~9QWL7{2Yf5-a8wj70z|w;8vx|s|^2@KRI{c_x(f$tU{ zgUyRsiWlS*&f7T1ZIWyXR?grzn5mY*es=QFe=Wc;lQl7%sitAS&VSdmZw$99Tb||w zMzp+nHhnYew$Cq~tUq>(Imb)Q=KArXZ8vNeS)FTnGk5*&ZG_>37j0>NI$w>yw8?)y2W*8FZSFmW+>y85}Sb4q9e0E40*H~;_u literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVD$2IaSW-L^LCcvv}OkZ*6MF% z#Y{QTMGF#c_o*i7Ea#dOx<~vZ(_Yn2r_+Phf07Wai=1|J-%RtQjH= zVhaKp&;&erKS&(c{rtz;gZsg|+tsmazt>qEntEPNRri1aPg+`7wr#E3+N*bLO`W0| zuG>Vr%-B8umumI<*}J1%rts{ayM^I=rdEI9mJW@zrpBB1yWEJ%786X}@4o5XUHx3vIVCg!0I@lkOaK4? diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-right.png index e7c52b5bb4b06f14f13763b6113671406caa2850..56eaeab03e88f4a3fe60d103796c47ec6bc31341 100644 GIT binary patch literal 647 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVDj^HaSW-L^LEz8ETupRxBVNp zZZqJYn9JO_=g_t?C$=@$k~}7+ZQxMebW~|lsGFC^Oz*%28p6Zs=u6 z;NCEiA&1dSs6qEYT7E;-=Jj3E*7oU6W^p|o_BHMQgSc;O9g8fv(&XkVIvqTt-1Ut8 z|9#GY{BNP_-zHgbO{|Pk(JJR@TP(15Teq|S!7z{kdHFgu{{xR^J$n55XQ4`IQMkc& zvtJex3LMOL?nP89FKIYyU0+(+sKE2VLLy=2xksnB_Z4P5>_6ju-RB!m>hdN9o`TZK zjm2t98vehpS^t)aA!;srMcnlr>#d?^>u)tPv@=?7`+jxb!^+sjZ$cOt_HNrjSn?k4zE?Mnz<dyX~6|*8* zzCKHTtQjU8|NYZ@{(^9WtMBK}{`uQzuItT}31;)`;#XfRR9kcZXVc8%IW{1%ndgqh zmbI6&YizYTw%&gB{ntOMSAS+;$k<`3o9-lX_F_RcL&K)vn>#lz;9mRq+$N{ za}?fgdFHTi?zCwldBv*&s1bCH8n>@lNHAjwkQ*_cysSzB1qu6I^-vre5v*vZ6b!KkvONS|>QM zEz!U@x@W?d;4h~!EG0sq;Tm(_EyWwJEqxj9?7g=<^Qz3gR@-vXSxjekGiN{hpnK-I z`;ljpUoB&}Ubv-WgK6=P@}Ij`Z(#Rj1iE6^oZPcA|9tAo-NU3);CIzNu*vUo7|8Gl}GUrJWfC44^Z0RT?t1OS*y zqTw2D3b_D>ul5N5ae8e?dq9TIhAjaPqgdMmWCBItWCBIuBm&unvw;J|O=t@TO5OlJ zz1-uY{ejJn4$PBVFbzLC*`BmTtAJ|-s)8#8s)VNmEakt zG3V{AgIP?50&EZNKe80_dRdq+CRQcD^vYT1i22R%7t&t^tAZCk@VyY-uhb;={^inz zt=mE-&%Ao$|L*k3o@tvm7&8chKp;zcZ~3(!!RwX7tW!5^KF0rk{l)iX410bppT2$C zgA03<{!iW*J(!Yo>cy+850@SJCKMC$(sJ4I2T4W@9q(Ngl#~|ze<|zmV)OlY Tljv|@=ree_`njxgN@xNA@;|!p literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..0eed1badec989261cbd19711b0216055f11e8b70 GIT binary patch literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#X#z`z*c>Eakt zG3V{AgIP?50&EZNKe80-`tsuJAt!z(hguHBeVywsn7>l~64u&ezVMz+7l+op%g)jh zQoCoHp3Hmn|L$h%$!F5|jTr<%U?Qt(Ygo{WU5|H!?mnfY+B(m-Dq>AP!-D(!{dBh{ zwti07eL!VC*Xqf;ed;#aJ^K8+VTQl_iU39jtCP`zK`;8ZhtECrH2thfe7Vflou{9; zH|zXbvi|9Z_o^0BDZh697Wt|+<>bN-V&>f2ciTQY9eTz5@75SD?Sxr#Cws^-00pvl z-%g%2_cdQ@2Mh!~-jpl0iZwjbZb8TCnT)Efa{FzPZoFr>Q8Cwk#TD6epDm3IW`EhU z?P=aR26VwR}nVdO3V;wNe89ZJ6T-G@y GGywq3&$V3u literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json new file mode 100644 index 0000000000..8b4ee9318b --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from goonstation at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..25ad0a8bf7351dbf7211c405f93dd64ee47809d9 GIT binary patch literal 317 zcmV-D0mA-?P)83*|?*2oD{!np}{#JLfvm)p$_!DuE zK#is*=B0x4t_eBky(B!KOP3Z>6kBOp>xYJmOc>$81wEakt zG3V{AgPhFPSUH4GoX5hO(%kbPL-wF#(8A4ME=XPqeh{d0Yub08hyShJ0`IrK zP@G>3G>joZ;n)oO$m?Yr_C)p=whM^$w+fVTKFlaxZ1iVmu6Td-ibYsrijn99fJdk0&_quB}+PhxeRi zxxMYDw?(1cj$idZoc-YXzIOAsvktwx3Il#l&yE!bSq}oP(c2E_Za=yDCA-J8*v711 zjFX=76^8z0IH}bF;-rQzSXI}Ma#eK2CV7R-a@JLE**!{F|8*XEakt zG3V{AgPDg7M2>xYK8dmF4a?E+$&(L?y^t!pz#+F*xq{97LS)qoo>wm$b>^7)<%q8Q zf8W!B^TqFiIR_?l01a)ZKWq8?e-*#x5zF}{iEDNDu{@u%{o1*8vL%H%Qn9}ZWmdQR z_HsJRZt1F`;jrY6(7IM}POcX{EA=iv@zz%4yDw>c+GIELm!qdmUT#)+Ep+HZVL@rc zt`+6Y9VecDp8mh0`uw_-hAA{%{?!N?x_}y^miVcfaYah36mHJL&yq0lESN zL~_r*uzfn?->Z}i?{k*%*Vmixw|^ShdYAjchv%1nK07ZnTP>2a`|!oJcZB1XN?m>* z<{(pdc7hR5Nh}w~;rrHeeM`dM