From: Kittygyat <202250949+Kittygyat@users.noreply.github.com>
Date: Thu, 7 Aug 2025 03:03:11 +0000 (+0100)
Subject: Resized baseball bats to be more realistic (#38392)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=7e676a03b6c0803142affda8386f6599599d1ed3;p=space-station-14.git

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
---

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 0000000000..eac5bb8b4d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/storage.png differ
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 0000000000..6148f3943e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/storage.png differ