From efbfd7d68aa7a6f1e2071d071ecfe9502c53f68f Mon Sep 17 00:00:00 2001
From: Tarlan2 <76408146+Tarlan2@users.noreply.github.com>
Date: Mon, 8 Mar 2021 20:16:09 +0200
Subject: [PATCH] New melee weapons (#3473)

---
 .../Objects/Weapons/Melee/fireaxe.yml         |  15 ++++++++++++
 .../Entities/Objects/Weapons/Melee/knife.yml  |  17 ++++++++++++++
 .../Weapons/Melee/combat_knife.rsi/icon.png   | Bin 0 -> 498 bytes
 .../Melee/combat_knife.rsi/inhand-left.png    | Bin 0 -> 291 bytes
 .../Melee/combat_knife.rsi/inhand-right.png   | Bin 0 -> 275 bytes
 .../Weapons/Melee/combat_knife.rsi/meta.json  |  22 ++++++++++++++++++
 .../Weapons/Melee/fireaxe.rsi/icon.png        | Bin 0 -> 325 bytes
 .../Weapons/Melee/fireaxe.rsi/inhand-left.png | Bin 0 -> 516 bytes
 .../Melee/fireaxe.rsi/inhand-right.png        | Bin 0 -> 516 bytes
 .../Weapons/Melee/fireaxe.rsi/meta.json       |  22 ++++++++++++++++++
 10 files changed, 76 insertions(+)
 create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
new file mode 100644
index 0000000000..d77663a6ad
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -0,0 +1,15 @@
+- type: entity
+  name: fireaxe
+  parent: BaseItem
+  id: FireAxe
+  description: A large, robust axe. Can pry open doors and skulls alike.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/fireaxe.rsi
+    state: icon
+  - type: MeleeWeapon
+    damage: 30
+  - type: Item
+    size: 24
+    sprite: Objects/Weapons/Melee/fireaxe.rsi
+    prefix: inhand
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index a90199dd7a..bee6ecc1c7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -48,3 +48,20 @@
     size: 10
     sprite: Objects/Weapons/Melee/cleaver.rsi
     prefix: inhand
+
+- type: entity
+  name: combat knife
+  parent: BaseKnife
+  id: CombatKnife
+  description: A deadly knife intended for melee confrontations.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/combat_knife.rsi
+    size: 2
+    state: icon
+  - type: MeleeWeapon
+    damage: 20
+  - type: Item
+    size: 10
+    sprite: Objects/Weapons/Melee/combat_knife.rsi
+    prefix: inhand
diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3818a145f3b83c74f43090da62b386614a843029
GIT binary patch
literal 498
zcmV<O0S*3%P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005ENkl<ZSVzT{
zy-LGS6vt1eK+V`C$>3nAVCkHtt5ICUC2L+FTepB6>X3KIA}+p!2nyn&9V{gQU20#T
zaw7L~^VOW2uXfGJ`Tx%Ue55@%@UM3WecQHoK@h~+odck_X__#b&AJ6ZVXRo~_hCGl
zbO#^`BfxMp0?+ff^R2c(6h~qF8HNFl<FpSz5pQJ(nK0{jQRQs=8gBu$^2PyVD{l<|
z*R0HT@%YtlLDk9|b0FPwMNwcd7$jD0-?=9_pzC^k#lkS;@pUVgasUA|O@k<kIE3u9
z7r8)k0ACg%rqgMhPj=w)Ajkk|h)c_on)XH<xVgT9`-ewh?QmT;bK7PAUyvLao*eHk
ztaDheS8@KQ=Qj@F`#yQ%E43gkzS(T!JRi#yhY+`;Q3r~|f4Bb--#?q$5QQyZ;wXgH
zv&vEY<@KGvm$#xaF60926UXEt0NalAp`t=$0H~Ey1<K+Q0J4>rC8s>+09{v}_!gk}
z?R)`ui#d$XP7?!{*K<l`)R=?=48qVgNKZR8p=?}c1{j2@9%ZIoHaR6ecMCq3U!)UF
o5h#o4OsMwPu&k1*&;I~f(fJ{hdt#vg0000<MNUMnLSTXb08ez`o&W#<

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7ea753940826be08aaafd478d1f94b930ed18e6
GIT binary patch
literal 291
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf<lpjiaSW-L
z^Y+$h-ew0L*NftsUmG+PrZ|c&VdN?>3}(x0=u^{P^2Q<2hwbS+(?jx{W_3b9Z43+@
zMm)}XKVvk%zhHXpaK13aEAw-u@#G~so|;ReGm0lUao6zufARb7);qTPr<FA8I1}~%
zm;Jap)0^X>S!~_e&kNt*yjy&`WcfegE~{IARNMQreoZ<JHW)<wuwI(?Pw-~rg_;Am
zHq3l`iY=$}1YgVi<7a&?n~1Is{*@!QsbR&#@T=+Ux0aoLCs%cLt(~>N-I%F||F2r9
gHJy=xq2bhC#x3WPrmp%|Zv-;X)78&qol`;+0L}h%`~Uy|

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..368c73da32797153fc605523aebb86ef07599351
GIT binary patch
literal 275
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf<e&0%aSW-L
z^Y+$3-ev;<my4ZKst%Yq8;Wc=x<ksU$j>9tphzg^gV%pqM<?Uz2b;7RfqEDkD(79k
zD;Z_+>g%5x0jCK|R6Grjx!;a>n|sumqs#E!y>#wbkx|z}C%sqPGd+Hq>g~rH=6qMI
z3Ep?&%q0sSz5kq#4OES-r{B%~>3j80T-!rcb&#PT&``hi9rwCj!8h)*|5?4I{r}a_
za;{Ljm{ifZg-5&oeQ}STdcUN8c|a<E{Dr@Bon9BjPTQ{?GW{?}r?Y+|Q=)cfgo6;s
NAWv66mvv4FO#rTTYkB|x

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json
new file mode 100644
index 0000000000..685357b828
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified from tgstation at commit https://github.com/tgstation/tgstation/pull/30680/commits/a494d500b42bc8c7275c57219e08e65b825e94f6",
+    "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/fireaxe.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..53c6de1803150e897b79b6d116ce051a8b627600
GIT binary patch
literal 325
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK^8a|cIEF;D
zzMZ_E>yUv!`}*T&{kpmzJbI#L@q;6hWjUX2$=g?tUr4RkoS(>gaP0#BgusLL*|{=X
zmO3|QDwdrzH;wsmcX~Ecf`J6r50^*xZ8x5LwzI)sCFV$c^;b?4PP59YhDn@2nfc!v
zySj6P9A_QMxf3+WVsF*f+3mkiC`A_9z13!4+t<8{&q-^8?Y*hNk3KIAx}LXuZoN0F
zS^Mmu8_&gKv^hmomoUA)dpM}OOUrzIPn(im{L}ISt}F^dr&R){tZ>`W|0$;CR@qB6
zaY32m7yrq08nSVF8geit^l+a4yv2u!fx+Ur6WjBc-z;l<7Oh$F^$A<^!Gs^5*uGqi
VJ$~p!2q<_MJYD@<);T3K0RZ@Chj9P^

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..803a0e1bdba697594680f2b6af6a453a98afd769
GIT binary patch
literal 516
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU_9yR;uum9_jcAozatI;ZRLXL
z8#PokO!__ut$ld!F-wzzz@FoYx27vtm~g3ZRexjgZcCZ$G;8+KKgH8$|MibGy8ZIc
z{Xdtx{CKARPkQ=`nehVSRN)64A$bgTES5|%ji)#ZShUO;?lZ|S_BlLdv0$1iec+ky
zhl=WH^X`Wwe*C~!c;oNYLMwYqp6TZL6KW1GJ1p$=DaL?_$>{ow+rA776e7B(Tb*U-
zajcki_R`U+y&vcOJY#lbHnW72#g6K~WeJ=NmftIDr393h*go-<y-*r!HS2u+l>jb<
z_%9n{+P3AMeP!aU!xZGT^8N1#iW!eKXGk*t)PFR48K<G!W~;M8>4uVr;&*Gj+bFhw
zYI=iN^X|Uc)(O{{w*D4wa63^whwsC^L|=K?1%jXCmNV}ukGSm4p3$=B_)CWOve&*`
zWRy~TUubopy4|$41YP<4YW6?n<qUibdu2ABZ0yiKQNYl#$m<wisk{Y)rd;Tqd;ziD
z%xVnB6sG97XUshx-#c+Pa~eaNfY)?oFUBXu9d{Xx8G@%Nn=lBuzvr95IAfPgAQR(G
z>jXB37N6KYjm8G6WG;r#C8=^u8<y<m-?_T{fOvJ$J;#Z&S>FNUmci52&t;ucLK6c6
E0Cug@&Hw-a

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f4c0b4c51105196830e01a850fcb36bdf5cade0
GIT binary patch
literal 516
zcmV+f0{i`mP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005YNkl<ZcwX(A
zuTBIp5XM`?Su6?(3XLPY#IE7q1A!n21n+T}-IpLZH0qEjEcOH?L(=4c-R-|=(@DQG
zYo@dF{pOoJG1aQ^pKe^g0suImaRL~D#tndvAVvTq&^Q5%K;s6$zW_!6BhWYjj6mZC
z@cS2dxH>lHCx`0t_Em&qp6<@f%iE{AetdV<>kP2seG}H;sF0c$0fZ!~LHK?RzP0}Y
z@Vr`?i``E9Ca6vL5(KMlKV}jD1$^C{DoM7VYlLm&!Tt6pgqrIGzy^J6HmdJ?=eMFp
zCk(@2j@Ij6r8xmmG+Bk7B);o9rL`6bz!+o3aa0z<U-6`IRv6KfEZ(-=LYQ;0$j)+(
z8vt<9l$Z++kk~cOn&ALWni6xt0TR2$Su-5KNmF7jI6z|8IBSLjIB81E1qVp%8fVRL
z04Gg}x!?eaUE{174&bCIF&7*V+qIA#eC#_)oQrlq>Fsf@OB&Gts5_+~<a|#OfGG%5
zJNOhU=M=xV91SVjwSy1IMX@C>X(T(qX9phxfX<Y-q>&83X9ph(z@E!_Nh28m73tc+
zhXSx;K+oKlG*|${2=qBq;*v(y0DK^&#sEMnLFwn4cfdDoQ{F*c`Ab;<0000<MNUMn
GLSTYrKj23I

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json
new file mode 100644
index 0000000000..68964bceb9
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/fireaxe.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/2816/commits/b99c5dff45a6527bbf698bc00f7d24b8ca75a806",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4,
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4,
+        },
+        {
+            "name": "icon"
+        }
+    ]
+}