From: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com>
Date: Sat, 2 Nov 2024 19:55:15 +0000 (-0400)
Subject: Combat and survival knife storage/inhand sprites (#33111)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=0ba3350c7eb5c9c16f84dfa2d5fa6c6ba0026041;p=space-station-14.git

Combat and survival knife storage/inhand sprites (#33111)

* Adds storage sprites for combat knife and survival knife. Replaces inhand sprites.

* Fixes meta.json copyright
---

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index ae5b22f8e0..711b8c49fe 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -103,6 +103,9 @@
         Slash: 10
   - type: Item
     sprite: Objects/Weapons/Melee/combat_knife.rsi
+    storedSprite:
+      state: storage
+      sprite: Objects/Weapons/Melee/combat_knife.rsi
   - type: DisarmMalus
     malus: 0.225
 
@@ -117,6 +120,9 @@
     state: icon
   - type: Item
     sprite: Objects/Weapons/Melee/survival_knife.rsi
+    storedSprite:
+      state: storage
+      sprite: Objects/Weapons/Melee/survival_knife.rsi
 
 - type: entity
   name: kukri knife
diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png
index a7ea753940..e014cf5110 100644
Binary files a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png
index 368c73da32..20efe6dd87 100644
Binary files a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json
index 08894a12a7..56602b6ea1 100644
--- a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/pull/378/commits/9e081bd2a0d7614be5a9dabbca34886ce204105d",
+    "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/pull/378/commits/9e081bd2a0d7614be5a9dabbca34886ce204105d, storage & inhand sprites by RiceMar1244",
     "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/combat_knife.rsi/storage.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/storage.png
new file mode 100644
index 0000000000..6b88c9a3aa
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/storage.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png
index b2f253c30b..c352ccfab6 100644
Binary files a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png
index ac3aec2247..5a284c0230 100644
Binary files a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json
index 455734e044..56602b6ea1 100644
--- a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json
@@ -1,26 +1,29 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/6cdc0503d32e249125151e369edf951e93bccd1a",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/pull/378/commits/9e081bd2a0d7614be5a9dabbca34886ce204105d, storage & inhand sprites by RiceMar1244",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "storage"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/storage.png b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/storage.png
new file mode 100644
index 0000000000..173f66035b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/storage.png differ