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 ae5b22f8e026741bea68d5ae3305dc99103ebd24..711b8c49feb166bb5d788804fbfb6bd18273a8ab 100644 (file)
--- 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 a7ea753940826be08aaafd478d1f94b930ed18e6..e014cf5110fd9502d664134f7008fff5ed1ed201 100644 (file)
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 368c73da32797153fc605523aebb86ef07599351..20efe6dd87654762cd77570c3805cb3f8d0748d3 100644 (file)
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 08894a12a7b276332d422f0908f9729b91dcdec0..56602b6ea13aaaad79084d9f84c777d56edb6cbd 100644 (file)
--- 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 (file)
index 0000000..6b88c9a
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 b2f253c30b7a7bb447137fd5ce3b2a96983cd340..c352ccfab67d1bc0c97ebe9e383a1557cbb96dee 100644 (file)
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 ac3aec224798ca7e6e259498456b238cab53aa38..5a284c02301540ba1a288876ca6454125411d6f6 100644 (file)
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 455734e0447d60fbfb8773d6ffd90a4660dd1f33..56602b6ea13aaaad79084d9f84c777d56edb6cbd 100644 (file)
--- 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 (file)
index 0000000..173f660
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/storage.png differ