From 78a08c36f3821d2fa30de90971ea08d930d49f99 Mon Sep 17 00:00:00 2001
From: Easypoller <117361103+Easypoller@users.noreply.github.com>
Date: Tue, 10 Jan 2023 11:27:58 +0100
Subject: [PATCH] Baseball bat now wieldable (#13130)

---
 .../Objects/Weapons/Melee/baseball_bat.yml        |   5 +++++
 .../Weapons/Melee/baseball_bat.rsi/meta.json      |  10 +++++++++-
 .../baseball_bat.rsi/wielded-inhand-left.png      | Bin 0 -> 582 bytes
 .../baseball_bat.rsi/wielded-inhand-right.png     | Bin 0 -> 564 bytes
 4 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-right.png

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
index ce9843e7de..edd69bcd0f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -11,6 +11,11 @@
     damage:
       types:
         Blunt: 14
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 5
   - type: Item
     size: 15
   - type: Clothing
diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json
index e9f97dc260..6eb88a0dff 100644
--- a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-NC-SA-3.0",
-  "copyright": "Taken from goonstation and modified by Swept at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a",
+  "copyright": "Taken from goonstation and modified by Swept at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a, wielded version by Easypoll",
   "size": {
       "x": 32,
       "y": 32
@@ -18,6 +18,14 @@
       "name": "inhand-right",
       "directions": 4
     },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+	  {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    },
     {
       "name": "equipped-BACKPACK",
       "directions": 4
diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..30839286d432a52231109d2135df8dc820fc7782
GIT binary patch
literal 582
zcmV-M0=fN(P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%07*naRCr$Pnm<beK@i3Fz?5PtgMv0fih!V%5wR6T(8AI$kjBQw+R{c_zksEM
zf(TZE1Y@O@MZiWuiItZAfs+wVcJJ0?Zf^xM`>ws&-Fd%xb63npD)1)?T)zSUI3REW
zXo0{DfR7+r04)$W0klBi2EbncEr1pXoIs`pR_bH1jmdHAq3_xyt;MFn5Jd|%m&#U8
z?4G{#^vd(wplV&;8hh5KYw^_Rr`kVhvjH}itMSd_KxVI=38Vtfw<nEal7=({HUQ4y
zd(E;sI=e9TTwR!tM@pUC0G>W7nY}nU=rK+J<|gcgYTj8p!^r8sIbdgf+(?=<baeo!
z3Hlq5*J2Xl*&ikeVr?1#Kx$>Vy5ImVDXDRAfYi!zb-@8#Qc~mK0I8Mb>VgBfq@>2d
z0a7c=)ddG|NlA@^1Ef}#s|ya`l9Cz+2S}|fR~H<>C8bY|`f*bHn@+X^^vSVp%9;nH
zOKdW-^9?^2fMjqwQyo(JxZHPAX+UZC^xoH*Yyf%-l%jXFu{ivbX9B}lQZ@iOe0uNe
z%v=EU#PlgLU8=Zhzbf1K*~RX*HOYAdpB^dzow;>z@2r9LDYQ6A^soA}8@#pI%J=O5
z@Um0rLWUOrzN%bwAD8Pmq5!x61OOLmlGeZhlB(&V1rBhbCTR^EAgP)zT7q}L7iz?=
UK{V1zkN^Mx07*qoM6N<$g3}oWApigX

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5c0b483c0dcb01d5075ed970cd682acbe414e90
GIT binary patch
literal 564
zcmV-40?Yl0P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$>`6pHRCr$PnlVcQK@f%az-XzJK|vcKg_TxDf?y?xpoOJ>z*ZYeYa1II|A3{1
zf+)5k#!5l32-qkXVimD7!pa?9k>xgf+1WF9voFmRyYFV^n>UwYHxQox0?+Fg000Mg
zP5>j|xdHGI#0X#nJSTt=@Z13S7r+Q$1Ux5@$q1}hr(_b>^ZJ`Ho~liwq4Y2@q3yMb
ze0(1g^@r!K_3Her93S~I#@k&TOWbpK*%rMD3X4~@%ll78XuT2&bDo?05yuye#P?_c
zG&^N+c74;ezOk|-cWP}T0NsW`00?uQD7E?rKyg5ACb?<1FVg4$Rl9fc`u`5FZt<V6
z@ZSI`fFkKh_9{}Lx?BN(Ll-GEzyTC`9JFu%hb~fTfCDJ>IB4Mj4qc?w00&U$anQm6
z9J)xU0S=(h<Di8DICPOx0~|o1$3Y7RaOfhX1~`C1FAv)I6w3A#*|`I#38jS^$B9pq
zO$V=;AB?z4$OJ%*bKm%kB&LJc%mBDfNSCM@=jiGq+S-xB(Q{xUaIiHk7b>H|RYE!d
zYMj%%mXq;K{gUw3NYbT=ursCLTewO{2Virt99_F{9Vaz_Fu3mOjA?H3yxtdpJQre{
z8vxjn<D!EDxOCFC4miM;92XrNz@?M6b$IW9Uz<LyLBoc;OaK4?07*qoM6N<$f&c)b
CQ}gct

literal 0
HcmV?d00001