Add In-hand Sprites for miscellaneous items (#35433)

* guh???

* Merge branch 'master' of https://github.com/SeamLesss/space-station-14

* incomplete baseball bat

* bling

* attribution

* camera bug

* damp rag

* cap cap

* centcom cap

* Update Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 1e818226d5890b0370ca77571c7b8345bd66d7de..c24e1b1b2ced8544ab535745f9a12f5d5f0164b6 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -894,6 +894,8 @@
     sprite: Clothing/Head/Hats/capcap.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/capcap.rsi
+  - type: Item
+    sprite: Clothing/Head/Hats/capcap.rsi
   - type: Tag
     tags:
     - ClothMade
@@ -914,6 +916,8 @@
     sprite: Clothing/Head/Hats/comcap.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/comcap.rsi
+  - type: Item
+    sprite: Clothing/Head/Hats/comcap.rsi
   - type: Tag
     tags:
     - ClothMade

diff --git a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
index af2af7a4208f47cfaddca7f5627928d395ad7967..f712ec1b1df92d6b5e44bfb5b975d26bd996e530 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
@@ -53,6 +53,8 @@
     sprite: Clothing/Neck/Misc/bling.rsi
   - type: Clothing
     sprite: Clothing/Neck/Misc/bling.rsi
+  - type: Item
+    sprite: Clothing/Neck/Misc/bling.rsi
 
 - type: entity
   parent: ClothingNeckBase

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/camera_bug.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/camera_bug.yml
index 6e10d5274ab4d60980a5b366df2bb6e2e26af1d2..4d6cc784af3982c2fe56fb4ce2ef68216cbdfe6f 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/camera_bug.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/camera_bug.yml
@@ -9,6 +9,7 @@
     layers:
     - state: camera_bug
   - type: Item
+    sprite: Objects/Devices/camera_bug.rsi
   - type: ActivatableUI
     requireActiveHand: false
     inHandsOnly: true

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
index 7aee3e5876b4e9b171f4832c10be2a1b469d996f..b09dfee84015e1d589581154292e80ceef13e10f 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -54,6 +54,7 @@
     state: icon
   - type: Item
     size: Normal
+    sprite: Objects/Weapons/Melee/incomplete_bat.rsi
   - type: Construction
     graph: WoodenBat
     node: incompleteBat

diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..6808a6b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..35a676d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
index b21b92751c89e4f6514e6c1287b26e1f40147915..2a334f52b7e0ee6f999fde271f514e7a20024c2a 100644 (file)
--- a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0671297bb1c1b31d5885f2768aecbe9dc51d39e7 , edited by Skarletto (github), edited by Emisse for ss14",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0671297bb1c1b31d5885f2768aecbe9dc51d39e7 , edited by Skarletto (github), edited by Emisse for ss14, inhand sprites by SeamLesss (GitHub)",
   "size": {
     "x": 32,
     "y": 32
@@ -10,6 +10,14 @@
     {
       "name": "icon"
     },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
     {
       "name": "equipped-HELMET-hamster",
       "directions": 4

diff --git a/Resources/Textures/Clothing/Head/Hats/comcap.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/comcap.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..d001d66
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/comcap.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/comcap.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/comcap.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..5dab7d0
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/comcap.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/comcap.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/comcap.rsi/meta.json
index cf06e9bdd121e6d3e1e66e1c7eb0bffb3c276522..777097dc0d9a5c5f59a4f19f7a33fff5512da229 100644 (file)
--- a/Resources/Textures/Clothing/Head/Hats/comcap.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/comcap.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0671297bb1c1b31d5885f2768aecbe9dc51d39e7 , edited by Skarletto (github), Greenified by MACMAN2003",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0671297bb1c1b31d5885f2768aecbe9dc51d39e7 , edited by Skarletto (github), Greenified by MACMAN2003, inhand sprites by SeamLesss (GitHub)",
   "size": {
     "x": 32,
     "y": 32
@@ -10,6 +10,14 @@
     {
       "name": "icon"
     },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
     {
       "name": "equipped-HELMET-hamster",
       "directions": 4

diff --git a/Resources/Textures/Clothing/Neck/Misc/bling.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Misc/bling.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..245249b
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/bling.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Neck/Misc/bling.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Misc/bling.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..2616bdf
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/bling.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Neck/Misc/bling.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/bling.rsi/meta.json
index 857059412895213f8c2409f0d63ca657ac9dfe83..793c51e32abfe2f7d4a5996921605294f995cf33 100644 (file)
--- a/Resources/Textures/Clothing/Neck/Misc/bling.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Misc/bling.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, in-hands by SeamLesss (GitHub)",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,14 @@
     },
     {
       "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Devices/camera_bug.rsi/inhand-left.png b/Resources/Textures/Objects/Devices/camera_bug.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..e942661
Binary files /dev/null and b/Resources/Textures/Objects/Devices/camera_bug.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Devices/camera_bug.rsi/inhand-right.png b/Resources/Textures/Objects/Devices/camera_bug.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..818934e
Binary files /dev/null and b/Resources/Textures/Objects/Devices/camera_bug.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Devices/camera_bug.rsi/meta.json b/Resources/Textures/Objects/Devices/camera_bug.rsi/meta.json
index c4298b6ec8c3d9819447f8cfb414ddd59e018ecc..38e23e43fbcee3ace464a8cffd804e4714a9a14f 100644 (file)
--- a/Resources/Textures/Objects/Devices/camera_bug.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/camera_bug.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "created by pofitlo",
+  "copyright": "created by pofitlo, in-hands by SeamLesss (GitHub)",
   "size": {
     "x": 32,
     "y": 32
@@ -9,6 +9,14 @@
   "states": [
     {
       "name": "camera_bug"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..2616245
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..d0af116
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/meta.json
index 7051793e030f43d29f2b2d1e2504aba8594646ea..7750b9e009151cac95261e65cce3cc607fd9972d 100644 (file)
--- a/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b8c53516ce8b14828b7147b0fa344b7b57724e9. Fill levels by Tayrtahn on GitHub",
+        "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b8c53516ce8b14828b7147b0fa344b7b57724e9. Fill levels by Tayrtahn on GitHub, in-hand sprites by SeamLesss (GitHub)",
     "size": {
         "x": 32,
         "y": 32
@@ -18,6 +18,14 @@
         },
         {
             "name": "fill-3"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }

diff --git a/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..bc122f3
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..fea250f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/inhand-right.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 c7c06adfc87add25a2cd34685c95679be8d1dc85..5b196487403020b128787d6324cd7b196dd38b2b 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",
+    "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)",
     "size": {
         "x": 32,
         "y": 32
@@ -9,6 +9,14 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }