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!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V7Tn*
z;usRqnw+wLfn~;rzwH~%=lne4(I=@hC1TzaonD<U^JUx(0#6pPd6zOy5m>mA`NF}k
z>hUM9d2eLi7Nc;#Xq81nkin~lKz5#5_8$@j{A-vsSW_$$4$t)O`TWh!RnWTbGjpWq
zr3*Zbf$Tk243Ytt#1aw`5)@X;vNJQP)%@4J%6j5l6AzC_+kx)=Mm)#kP8;v}q3yg)
zQpEk>@$<}glpZ~oeXuLRgvHId;gW#D?)(!64jfQ8_@|}up*b@%^JfMNhHLgNT3sh!
k%?XMTIeg=Z*inXmH{7c(8R~>EFfcH9y85}Sb4q9e0G)<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
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANNf`I*kn0h!6k3=A3*ODFF3
zJ{%x&Z2!I${a);{ODs}WJi5@N(XlvWgLi3$c0{RX-sCWkO9hjaj)oQ#YFKpW?PL4T
z9LpNc>KMQx=$;<mJ*6TqIAh|sxV&@y`robR)G+>$oGV#YAZOsyo_<*~bL$4R*874k
z9cA`OMw{0zy^|zod;Pp}%_2J$*Y)?l?^<_oQI_$6>+UwEb>0bFHaU@FIqiY%Bf+p~
z-AB}qaQZO|-RFw^_`|p0<YWDVHuGZ{{w!J^@+x6zbL33vBa@F5I<Mb!&E}D}(yE=4
z7E3KQW|NLwGO>w;H8jVmy;&u6veD~zv$K9p3smG^yu4M)!qQ7)vbkf{)LpAWOfQAr
zvdU8W{=f3ptutG$+fHI~TEFhMC11<;Mz_1A_5QKj3)xuW8nQRPT_50Ae1FOH+fjcc
zI^Ho%H_!F8WLQ_$cro4kSy3?8g^$@%9|{?HL>nGfCnVfGz3QvnbAN}r*>x9X3o2NA
zF8qCQOn!HM`m23P&gu*d3}v1!jv*1P$tepMSY~|q+rH6!&d(zreUd&?BIZ5OIeXy1
zfddIE^%@>Y1Tk>$<a1z~Wpu~jS$&Xm(;I;WViKhXRxrEC8oX)<Wbd&`xWc%Y4_PSS
zDC70{HK`VLpP6skrfgzd<L;Apenw+sBO}9xdE$y2O_Sa;FfcH9y85}Sb4q9e0F>bF
A?f?J)

literal 0
HcmV?d00001