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 b09dfee84015e1d589581154292e80ceef13e10f..3aa5b041f83dcf2f3eb97dce73e5ded1d68a4955 100644 (file)
--- 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 6eb88a0dff476307826691c5f734000e841b4cc2..d22ea9b6294dc822395575cdfe8af3f6b9f22943 100644 (file)
--- 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 (file)
index 0000000..eac5bb8
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 5b196487403020b128787d6324cd7b196dd38b2b..d435ae235f915135700c1345e4d8fca214649a8a 100644 (file)
--- 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 (file)
index 0000000..6148f39
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/storage.png differ