From 1188d3bafbfd4dbc66741a2ac1c4857084860139 Mon Sep 17 00:00:00 2001
From: TaralGit <76408146+TaralGit@users.noreply.github.com>
Date: Tue, 8 Jun 2021 22:21:08 -0700
Subject: [PATCH] Added claymore as a weapon (#4124)

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
---
 .../Entities/Objects/Weapons/Melee/sword.yml  |  16 +++++++++++++
 .../Guns/Battery/laser_gun.rsi/base.png       | Bin 643 -> 353 bytes
 .../Guns/Battery/laser_gun.rsi/icon.png       | Bin 660 -> 375 bytes
 .../Weapons/Melee/claymore.rsi/icon.png       | Bin 0 -> 418 bytes
 .../Melee/claymore.rsi/inhand-left.png        | Bin 0 -> 417 bytes
 .../Melee/claymore.rsi/inhand-right.png       | Bin 0 -> 439 bytes
 .../Weapons/Melee/claymore.rsi/meta.json      |  22 ++++++++++++++++++
 .../Weapons/Melee/combat_knife.rsi/icon.png   | Bin 415 -> 450 bytes
 .../Weapons/Melee/machete.rsi/icon.png        | Bin 317 -> 315 bytes
 9 files changed, 38 insertions(+)
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/claymore.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/claymore.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/claymore.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/claymore.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index ed628e9801..5cb81d3571 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -45,3 +45,19 @@
     size: 15
     sprite: Objects/Weapons/Melee/machete.rsi
     prefix: inhand
+
+- type: entity
+  name: claymore
+  parent: BaseItem
+  id: Claymore
+  description: An ancient war blade.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/claymore.rsi
+    state: icon
+  - type: MeleeWeapon
+    damage: 25
+  - type: Item
+    size: 15
+    sprite: Objects/Weapons/Melee/claymore.rsi
+    prefix: inhand
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/base.png
index fc8b984624c82c7a5040f306d0fd6164e4262adb..43d82423383ddfffb5071928b5051acf23c7776e 100644
GIT binary patch
delta 337
zcmZo>eaJLHvYwfNfx%@-*D)Z)SRCZ;#CY?hPCbyrS>O>_%)r1c48n{Iv*t(u1#JR+
zLR^8gmX=m!Wu>jHt+%&#NlA&3k&!J6P?$l|mO)onH#0LcA|j$kgu&I-H9S1LBs)7G
zAi%=HA~`P3it%(AP@PCgkY6yve;}v_5lCRy!{n7f1@k;z978JRyq$PZ=#T=B%j6)g
zEgMCD{r~?;Z9%B}mnUoc`Oa)QJt1JxWcvd)Jo>k${N}p+LOp-Ocf})aUfUWwpQT2L
zh&`-eS>%xX-Dx$O8H1$Ljx<?K)fqqB+&`Ng)Ln2d^Fc|p>{=-euc+Lc#c7UjnI7{^
zo@ctBZI8kOljP?4v-EbST&_CU?*8kkJ(KNyrk!RNehPYQ*;PHIsHEi6Io|iN9DjT7
ROsoQV+SAp~Wt~$(69BgwiXH#}

delta 629
zcmV-*0*d|N0)qvR8Gi-<0047(dh`GQ00eVFNmK|32nc)#WQYI&0y;@VK~z|U?UhY$
z5>XU}pTTJ<4P$a+Lep9oY#c$_NFWnjbivBtmh>0+NBlnx>n>Q#%A^^_qSchJ5J?)R
zDQz=N1~X_h;{q>nphZ67%6T^D&YgSDd+s^+10o_K{&$pRCVyu#nLxH%t=2-m7Mdi5
z^Z7gg&1N(7f1Y5}MZ~4>pN#bdvj(967=|%QrR%x~A@Dp8P18m;kx1bCKAz|O)v2aw
zvuFdL8io-Ri$&`7I)lN0wY4>h#UiF@hAe<-ny6=806z5nsg5^x;s8|lUSXOh<#Ksq
zjBVT8TU}j!-GA*4omMIpI-L&plSz7)m&pF)`Z`vl0l?nZbIyVldf$Ic4IsIp@}TsM
zpPvPfwzshw4btf}j^p5Y9=2`sy!#$i2tlb-qF%3ad2umvkjrK#oaVAw-u%wMPBOuh
z7ccp8e$K<q&5-@%y#?U<D9+Qz8Xr$jDVNJQjzhcM27iWSI@S%8bUGcV>ToYU+uh~e
z$q8FqTljuB#k162l1ilj==FM|Z`lUWbsYf5al#pp_`Z*2S)pCLU#$i!@%X4LuIrM^
zW;v+U6d0ZkxoO7(8E?xhv|24Crm8B3hldOX1CA^UA;g3@fPH*CvC@NDP1&zjgYka3
z+Pkb2hi+Sr;ceo&t_Ouef$OU)ynY|obtf(xnE@D<Yp#1>8vjxpAU5m3yI4jX7PyLq
z5TQqC8S$9{Xt&!65EKdp+?$(_sAN%bnBz6nbv=m1Zm-y);t>%M5dgmc<-Z*h_G)?z
P00000NkvXXu0mjfJ8LE=

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/icon.png
index e47463f52b0b93808268f55bd404977ae16f476d..ff7a8709f8cd868d5267cdfbbce7f3c7a559d4b8 100644
GIT binary patch
literal 375
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wkP|zd5C&U#<YiVg!R#w{D+Io9?mz0zk85!9E&2eOusAQ0|Wzf~t&CJY<
zh=}MBVo1Ho(DR?cx`V;h)ipdkyd*n2ARxfP!Xh~?j@j@{FwiWCk|4iehX2^X%R4S+
zKs8G|T^vIy=DeMFTd2u^$3@s{rC1Z!wm<*p@A4GXPyTw++;4`_?Yn-$3b%eTpYi>?
z$am*@gRT2MvsKF<dKjVQcKd+S-wV84-5(_Uo(FwYx^P1_^U?tx1!s=yOGJ}fI+vGT
zIWK#M=hR#_zxDa<li4<v&7M9b;==9&I}R^NKdaBE&tY*k;^XBDl@n8<^nZMqSobq}
t!Lw+Esf=3oOr2ZbOIg~h-Ku=f_VOlI{TdC1GN5}IJYD@<);T3K0RYsHlqCQF

delta 646
zcmV;10(t%S0+a=i8Gi-<0047(dh`GQ00eVFNmK|32nc)#WQYI&0!v9mK~z|U?Ulc4
z+dve@KXMd1PNUMJG|)61OrRoa2n{mA9Wr<->1wic?SIiO{U=K2&cSmA51I-=R+Bb_
z2rsE2pb$Gj2BpXi1a)xFRJPMP4xOs+^6pN$_j&i;{eV=dQh)vLQf@POd3iaOZO`*2
z@-@*U30_-U17L4&FY)~*!KjnKCHQv@jK$*yp#WHx)lX#*1PCDr!w^l=`Zk}>6GahW
z82;6%rfK7_0Z=W=ii^b}wOWmCx691T48>v*+qM%Hz_xAF<0b$HOPAa;uIL<24cnzF
zvIjW;D(kPYZGW3`xjY1SU6-kBHv6vG>^a@o*x=~sh`V!hwAyXt_}uI)PQ4Dm`u7u#
z<7v$Im#n{m2an>B*88Axzx0EvZ-U2*i#YW<g+c+}_X)!g*L8W`{E8}spj0YRtJP?q
zp7x_#F^r*zR}6zszcO(AD$ku4FX^0|(Ej)^VXJRH1AlP7ljG?Vjf2BO%H=Y?@6%{B
z`eoYHEtEo`5UXl$FFspc<;(s)3kwTGQIvp>Q+uiT`FQ|ZtyaG;+W@+*1K|69G6Pak
z6yZ2dVi#{#D)DqK*Dp&D1gsbaTh*!pz0)B#?O-5-ZJ7nn^OTILs%&p>)9rTIaU6sY
zLvR3hcYk+irCZgivRSFbgX40w*I5aN5yx;8T-Wv3G)>OW&Im6q2!defvXL2pUb${`
z5By305)P0V_s8pW8#qjG6$>E}kI-%4V+GJ?G!!5<O_QM0NkFA0g~JVALtWS7OlEY&
gCWWU;l`0j$PjxdevL+BRp#T5?07*qoM6N<$f*u<#0{{R3

diff --git a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e6d444716fca184c850bf0a059cc64806693366
GIT binary patch
literal 418
zcmV;T0bTxyP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZqOi4sRR9J=Wma$HQP!xuL)E6jYS7QfA6RwXy3^Fxt
z%IfZDoOl6O`womIZW_{r7my~Vi-SUpix?dpkAvQ(m6lSt=eqQt2q*A;_nvbDz(2>(
z1&ZUC0H7!e1VJ$6Zs~$&S%xG@N;P%?3D5I<VV$)Ff8my8&22xcKpi-nKwUVCz&dc{
z0_(z+3N(Q$6KD!oBG3ljTA(ewm4FI(V*yq0Mgl6~K*h)C?)r!ZZihJGl>)=71fFj~
zN^rmdU}st3X7p(QAkQ}efCXMF1Ghu69bp(!6h*Z9DTNV^O|ufJ-(UGhBpjQ1`+dB8
zbW1a#DobZTI5r&|x`=N_NXHW+{kc7ziQgIFiEwN>K0P7f*rnCVcCf<FFU}UiIWo76
zvgeQY4@k!oEyrwIUJNgH>HYN$&re_4;K0l&=<W64`KDI*CYu1jH!1xCe#XlLTmS$7
M07*qoM6N<$f~^p$xBvhE

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..c559a407414f4bfce1a37bd824d0de478028842e
GIT binary patch
literal 417
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Sc;uILpXq-
zh9ji|DCh0z;uumf=j|<9zC#8)tPiI220w`~Sgf;`DM(Fa-GN7^Q=juCYB`C9eoo$<
z`D>qK(_apOhZ4*{ld?NBgaYsE>JzctI<H8KPjSXIXN5%)P9AlC0ygc~dd=ebrg^Iu
zF4^}+Es9?;JdoM8H6W%&Uok}Vo-@Z)*Y~z8)0)1^I9;<$=q%3LaP6P1x{dqgFFPAW
z1zq3&{VsCs?w;@SY<<4HwW^gl_r87S{vX%xw>szkwluLX-Wj`^X=QDluvhufh2_FP
zmw>>R^vt&Pwfv2#dK0p9+tyd|JO0goJw<cUvn8IU4ReldaSGsGutc#}AcSc}ri&HJ
zM+OV22|SJ_4Cf9lbrRrqSd`Fd>Uxeb=>4=Kwk#Vz?s#JU{g3Iq#hptRSA3IQ@bUKF
z-NIS3#1~p#$SJE>6&SJktiK9(&c2^(OA2Q$5-Vc|I$+5!hPC{<EA|*IJPLA;r>mdK
II;Vst05FcJdjJ3c

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..183178c6715ff6b0f03396406e8c1e2af9d21b3c
GIT binary patch
literal 439
zcmV;o0Z9IdP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZqVM#<mRCt{2+Cgr^AP@!6Pj3*Zd(=}k>xzx95Q(j?
zkj>n!;sjlGNms7gw228Y1nmC~Fy;@jurdHdL_}1Jh(r;Iz1Lhk)hs3=F@#XF<hKw4
zG@4*)6<WeuYvG)$R#&@zl|tI#H5D&*<nTaY14a)I6f|H9;epHsY$ZI9(SR+52UflV
z<_W*f-K~XBvNS<NqW50yi>wy!{ax!z+QoT7{CxKN+WAYDufs0wt_iPi$3KBbYQlf(
zPc~A}Tegyeh=_=Yh=_;=bZy43Ir~ph^?txLYxf4;!-vZ3KZSY&)`lt0IrCx<Y8N2Z
zsQ$-)&m`$lQzx|t<pg>}6I32j5~Ot#y1dKNvI$j-*Ian3CUkvEtVI*Dj=@&<2Ap%o
zTB~|QW-oT05Km{A7Q3YRjO-7g(-~%-(BwV+`Ag_d%i&|UgU%KU>o)vCbAerjFS>Lv
hx~_JDh=_=&&=-8gDyduT2$ui=002ovPDHLkV1klxz>NR^

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/meta.json
new file mode 100644
index 0000000000..53bc38346c
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation and modified by Taral at https://github.com/tgstation/tgstation/pull/18086/commits/aea72a79fd34990dc7affd5cdf8dc13bd5b6431a",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/icon.png
index efecdbb4049b9a7533ec7f5d55459f2af4c9c7c1..956f7f765951a90d30894f0476306e53d7b77b1b 100644
GIT binary patch
delta 409
zcmV;K0cQT61HuE4Bnkm@Qb$4nuFf3kks%X*Y)M2xR9J=Wl+8-RKomxgq81545Yl2o
zF&MIR8?q6>t<U2Vh)Xv<MV_HAVChnqr4lJksrXY67iKeV9MCpt)5)Y2>{*5h-#y=4
z2G;y1+U>TO{I<D@K~^$A6h%|^OCyRRkySsyR@K4t&TLc>IvR~=G#a?BOB~0zu1gqy
zhM8H~cVIHyvaFfswKb4sZdn$FVdUC_#s*ZvK|=$o=91D4lnI9t4U{#PEY!g1Nho~J
z5m4S-vd}}6Bz<hV2_STYgTfW~o+E6#Ns{!ryt*zGu0#;jh3`2+UPs;=UzCNW4uZNc
z4|W(2Q{G;-kxg`a17-WdI}ikQadf<Y$F3oNNq_Bx>JWtnkmj$?pX>wUVM?d-Bm;$Q
zH|h2UD*5xT;HUZE@q_U&#WZWQT74}`H?x5`=32;oh@`o5XaMkV|Bh+abY=rN4J^Z4
zGSz@IKR>$wsxz15?!fKcO{M0!1AGSxpi=WSe}*qHFU7Ska$Icy0000<MNUKnu0mjf
Dm%zKE

delta 388
zcmV-~0ek+!1D^wsB!2{RLP=Bz2nYy#2xN!=00CA>L_t(oh3%A2OT#b##ot62*h@uX
zA*CfS27ZF!Mf`B$(N7^lF8cyIc`o<~MzK&9=nk@r_!r|TJ9KH*HpwQqcWevq{a#)Q
z9Q2<ggpl=TNBan}mjIme4f>r0;G9dwnD*VVZ({%;gdj~*P=87X-UD#XWmQ#(q6myJ
z6h(m`2pYe4egt)M6FuOt0UbFZ#7GY~Y@o^9L=OOsFWSmPzRetP(149OV9|grxl*SF
zuCFfTcoa*(o?NNZEfAsvr3nB?7v?~ZBN&fjNofKhO5EJuS($eZFqxdoFdX7J|A7i|
z|1j-s-YI}Gk9{vr@b>zRr^okoh<U!~J?2&;ted}-pEy1HT5m!PvyZlpP-nhceIU!0
zids^dV4g2}1u$0EWFCe?%x0zaU(^_&1-TPxH((-ntqq!8kt;Rc0^j6HS}N6oPjV$~
i16j5l_$EK-&*&HPbKcgvAhn$U0000<MNUMnLSTXv%Ba@>

diff --git a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png
index 25ad0a8bf7351dbf7211c405f93dd64ee47809d9..64612928df21536cb6819bec9c81a464c29e5b1b 100644
GIT binary patch
delta 272
zcmV+r0q_330=oi`Bnkm@Qb$4nuFf3kks%X*<w-<AR9J=WmOl%EKpa3{A%RHHBt%0;
z+}fu1Mf|pYg3vi|kCv7;SDOyP($4Nr5WZRNz26VzgqfKD6h+bfR9@HhV8GJ1Jj=4t
zXS@Yyxey|JfXU>Vg-^K<0x2bVo)3DQZeYsf8fP2m%T1<t7SLZiU?g`E(0|*dlmJG1
za_fL+`BbrWKwmypY!%>2{#AfW`Q!kl(w9r6s%~KdluEn9aZQ{=0Gv;EYdJt<D&K5Z
z#7V@pX#xAmH6IVr^4&h++O(AA#p(SqdYEtdXg~=0U_dB2c>X1`LaDTS_ubFT{2dQ5
W4r3YHR{_}o0000<MNUMnLSTXhO@N62

delta 290
zcmV+-0p0$)0=)u|B!2{RLP=Bz2nYy#2xN!=008t!L_t(oh3%EG3c@fHMX%y))gc<`
zrb8+2{zHcTP;rv}R(G+pBIqpm6LFA0jix5%rGoUX2|4GzBs`!?mljeKTWMPBhlYzx
z7~#PML?+}aNgDSA6A+n@@ofHaUl0LXH~{oQ!bhVaqG*gf-+vf6q#banT!pLyI^3pu
zG6B8q0Ic970t#LS1F(X73)JDRU~d5(?h5u2pn`uTKnZsi;3<0<EZ4)W9f9R~A*V6J
zgg+izRaV|`Yk@kvDk}i~m8%R~;K%)m46M?4m<~VhF66_@cwifFz;FdTWlwib-S&En
o<5<1+pM|GPz8m}ZUAp{T?pqFCWikoSga7~l07*qoM6N<$f?vXa0RR91