From 7e676a03b6c0803142affda8386f6599599d1ed3 Mon Sep 17 00:00:00 2001
From: Kittygyat <202250949+Kittygyat@users.noreply.github.com>
Date: Thu, 7 Aug 2025 04:03:11 +0100
Subject: [PATCH] Resized baseball bats to be more realistic (#38392)

* Resized baseball bats to be more realistic

* Added new vertical icon for the baseball bat & incomplete variant, sprites by TiniestShark

* Added requested changes

* Added suggested changes for the incomplete sprite
---
 .../Objects/Weapons/Melee/baseball_bat.yml        |  10 ++++++++++
 .../Weapons/Melee/baseball_bat.rsi/meta.json      |   5 ++++-
 .../Weapons/Melee/baseball_bat.rsi/storage.png    | Bin 0 -> 281 bytes
 .../Weapons/Melee/incomplete_bat.rsi/meta.json    |   5 ++++-
 .../Weapons/Melee/incomplete_bat.rsi/storage.png  | Bin 0 -> 554 bytes
 5 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/storage.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/storage.png

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
index b09dfee840..3aa5b041f8 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -23,6 +23,11 @@
         Structural: 10
   - type: Item
     size: Normal
+    shape:
+    - 0,0,0,3
+    storedSprite:
+      state: storage
+      sprite: Objects/Weapons/Melee/baseball_bat.rsi
   - type: Tool
     qualities:
     - Rolling
@@ -54,6 +59,11 @@
     state: icon
   - type: Item
     size: Normal
+    shape:
+    - 0,0,0,3
+    storedSprite:
+      state: storage
+      sprite: Objects/Weapons/Melee/incomplete_bat.rsi
     sprite: Objects/Weapons/Melee/incomplete_bat.rsi
   - type: Construction
     graph: WoodenBat
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 6eb88a0dff..d22ea9b629 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, wielded version by Easypoll",
+  "copyright": "Taken from goonstation and modified by Swept at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a, wielded version by Easypoll, vertical icon sprite by TiniestShark",
   "size": {
       "x": 32,
       "y": 32
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+     {
+      "name": "storage"
+     },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/storage.png b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..eac5bb8b4d87d7e1cca8acae8cc6a5c06e8f8b5d
GIT binary patch
literal 281
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}mpxq^Ln2y}
zQx-6=%=qxPeWUrDpGQ3UBz2}l%zL8KtMg^PjJrYL$s#uIQpPC)3s*8<IQUgP{^T|9
zjm+C(6z&(TvS<i0c-0Wd&Qr_&L!y9x4YLMoie<v#nf^VWzuCD8TGxGMjugFgfu}K$
zy~m0{GT@R}0uU&ymStyVRIB-~dzJOXxh5VSk+uWf`;B;x$DKCb^F!Nto1}>Q!Q<zd
z?<hTbF8g3tf(eV8bHgP8h28ll4jee3aPUt{<3n?1X6DZf77W+yU9`GRzM2yhBXao0
c6S1QV|8BTfT{6@O0eX+Y)78&qol`;+0G)<w?f?J)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json
index 5b19648740..d435ae235f 100644
--- a/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/incomplete_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, modified into incomplete version by Vermidia, in-hands by SeamLesss (GitHub)",
+    "copyright": "Taken from goonstation and modified by Swept at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a, modified into incomplete version by Vermidia, in-hands by SeamLesss (GitHub), vertical icon sprite by TiniestShark",
     "size": {
         "x": 32,
         "y": 32
@@ -10,6 +10,9 @@
         {
             "name": "icon"
         },
+        {
+            "name": "storage"
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/storage.png b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..6148f3943ea699d09c546cad5acfd018a36f023a
GIT binary patch
literal 554
zcmV+_0@eMAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004RX+uL$X=7sm
z04R}lk-JO7P!z_$zNn8%2OXq1WT@iMf+&ciRIp2RXe(HCNp6!?NYZeVBE?m3aVR*5
zF1`l;16>7I1wl{*5l3fVi<Ee7Q)rR)UT)5hFZVl~d;$C!of&p;9xzOYXVWQZwXi0I
z-w{NJc0Xb=v#q7vVjex$&m(-IJ|so2-uJq$!J=w2z}H7S%Pj5?(=^CzIhNo(;t^Js
zi^M0y2~GnN-wIvv_)T!h<1fKHpIrd_qNh~qV5NgunH$8D#BoEfverD}OCqYdlA{`<
zGX@)3q>+LI1yyW9hl3<llQQe>n`-)&Q6Uebr-d3gIZ7y#H$iHZx~fz)(pB0zY9jal
zdD_~{wAVe70z$8@`#BDT_kl*;b$?G?w{ZppUVv+}?XOTybKj)b+gkh>i0%NFH*HNh
z0Iqg{(PvBMa#IS>@oO6JaRCe!fZ=;!VBO2A^&aO>Kz^Hk(H(Gj1WeHV=*AzrZ)fVh
zB10zt004GLL_t(og=1u(00fxu{fDtPocY8^ju}jpSf1o8&A`CGz+kB^fZ`ZZ01LSe
zKn9vJ+%V>UQbU655TF(qb-<_tMjbHffKdmGI$+cRqYfB#z^DU89Wd&EQ3p`P0oR{=
sWjKEG1KB-fvH`3|Om5GZfq{Vm0I;4HA+a@L?*IS*07*qoM6N<$f|TIy?f?J)

literal 0
HcmV?d00001

-- 
2.51.2