From: onesch <118821520+onesch@users.noreply.github.com>
Date: Wed, 12 Mar 2025 22:46:58 +0000 (+0400)
Subject: Tools/Devices: In-hand Sprites (#33689)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=b3482fd73711a2be29b06ceb2281b0f1d8352cf5;p=space-station-14.git

Tools/Devices: In-hand Sprites (#33689)

* Adds in-hand sprites to the barber scissors.

* adds in-hand sprites to the floodlight.

* adds in-hand sprites to the gas analyzer.

* adds in-hand sprites to the gps.

* Update copyright wording, linting

* resprite gps inhand sprites.

* adds in-hand sprites to the mass scanner.

* adds in-hand sprites to the spray_painter.

* resprite in-hand sprites to the mass_scanner.

* fix in-hand sprites to the mass_scanner.

* Resprite mass_scanner in-hand sprites.
---

diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
index 34263ccdc0..9b27ad0bc6 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -191,9 +191,11 @@
   - type: Item
     size: Normal
   - type: Sprite
+    sprite: Objects/Misc/Lights/lights.rsi
     layers:
       - state: floodlight
-      - state: floodlight_on
+        map: [ "base" ]
+      - state: floodlight-on
         shader: unshaded
         visible: false
         map: [ "light" ]
@@ -244,9 +246,13 @@
   parent: BaseItem
   description: A pole with powerful mounted lights on it. It's broken.
   components:
+  - type: Item
+    size: Normal
+    sprite: Objects/Misc/Lights/lights.rsi
+    heldPrefix: floodlight-broken
   - type: Sprite
     sprite: Objects/Misc/Lights/lights.rsi
-    state: floodlight_broken
+    state: floodlight-broken
   - type: Anchorable
   - type: Damageable
     damageContainer: StructuralInorganic
diff --git a/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml b/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
index e10c5b84af..31e5f99752 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
@@ -5,6 +5,8 @@
   description: A hand-held mass scanner.
   components:
   - type: Item
+    size: Normal
+    sprite: Objects/Tools/handheld_mass_scanner.rsi
   - type: Sprite
     sprite: Objects/Tools/handheld_mass_scanner.rsi
     state: icon
@@ -47,6 +49,9 @@
     slots:
       cell_slot:
         name: power-cell-slot-component-slot-name-default
+  - type: Item
+    size: Normal
+    sprite: Objects/Tools/handheld_mass_scanner.rsi
   - type: Sprite
     sprite: Objects/Tools/handheld_mass_scanner.rsi
     state: icon
diff --git a/Resources/Textures/Objects/Devices/gps.rsi/inhand-left.png b/Resources/Textures/Objects/Devices/gps.rsi/inhand-left.png
new file mode 100644
index 0000000000..c1d8c3974f
Binary files /dev/null and b/Resources/Textures/Objects/Devices/gps.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Devices/gps.rsi/inhand-right.png b/Resources/Textures/Objects/Devices/gps.rsi/inhand-right.png
new file mode 100644
index 0000000000..80f4553ecc
Binary files /dev/null and b/Resources/Textures/Objects/Devices/gps.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Devices/gps.rsi/meta.json b/Resources/Textures/Objects/Devices/gps.rsi/meta.json
index a59c0b0012..72a8e19a4e 100644
--- a/Resources/Textures/Objects/Devices/gps.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/gps.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "tgstation at 3ddd840268e33bbcf316f242e6a972b84e6b773c",
+    "copyright": "tgstation at 3ddd840268e33bbcf316f242e6a972b84e6b773c, Inhand sprites by onesch",
     "size": {
         "x": 32,
         "y": 32
@@ -10,6 +10,14 @@
         {
             "name": "icon"
         },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
         {
             "name": "active",
             "delays": [
diff --git a/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight-broken-inhand-left.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight-broken-inhand-left.png
new file mode 100644
index 0000000000..b31b949eee
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight-broken-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight-broken-inhand-right.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight-broken-inhand-right.png
new file mode 100644
index 0000000000..c03d65a422
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight-broken-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_broken.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight-broken.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_broken.png
rename to Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight-broken.png
diff --git a/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_on.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight-on.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_on.png
rename to Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight-on.png
diff --git a/Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json b/Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json
index 38b29d5d40..04005a4a79 100644
--- a/Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/Lights/lights.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/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, Floodlight inhand sprites by onesch",
   "size": {
     "x": 32,
     "y": 32
@@ -19,13 +19,37 @@
       "name": "floodlight"
     },
     {
-      "name": "floodlight_on"
+      "name": "off-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "floodlight-on"
+    },
+    {
+      "name": "on-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-right",
+      "directions": 4
     },
     {
       "name": "floodlight_burned"
     },
     {
-      "name": "floodlight_broken"
+      "name": "floodlight-broken"
+    },
+    {
+      "name": "floodlight-broken-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "floodlight-broken-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Misc/Lights/lights.rsi/off-inhand-left.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/off-inhand-left.png
new file mode 100644
index 0000000000..b23c998256
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Lights/lights.rsi/off-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lights.rsi/off-inhand-right.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/off-inhand-right.png
new file mode 100644
index 0000000000..2f0b15c048
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Lights/lights.rsi/off-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lights.rsi/on-inhand-left.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/on-inhand-left.png
new file mode 100644
index 0000000000..8e43cbde0a
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Lights/lights.rsi/on-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lights.rsi/on-inhand-right.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/on-inhand-right.png
new file mode 100644
index 0000000000..7f0f817970
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Lights/lights.rsi/on-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Atmos/gasanalyzer.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Atmos/gasanalyzer.rsi/inhand-left.png
new file mode 100644
index 0000000000..5a9d7b31b6
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Atmos/gasanalyzer.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Atmos/gasanalyzer.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Atmos/gasanalyzer.rsi/inhand-right.png
new file mode 100644
index 0000000000..917c22422c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Atmos/gasanalyzer.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Atmos/gasanalyzer.rsi/meta.json b/Resources/Textures/Objects/Specific/Atmos/gasanalyzer.rsi/meta.json
index 083f15f073..d563b8fed2 100644
--- a/Resources/Textures/Objects/Specific/Atmos/gasanalyzer.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Atmos/gasanalyzer.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/ded74aff42136a7953c551a2a94cebc81f62f9fb",
+  "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/ded74aff42136a7953c551a2a94cebc81f62f9fb, Inhand sprites by onesch",
   "size": {
     "x": 32,
     "y": 32
@@ -10,6 +10,14 @@
     {
       "name": "icon"
     },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
     {
       "name": "working",
       "delays": [
diff --git a/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/inhand-left.png
new file mode 100644
index 0000000000..0eec62723d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/inhand-right.png
new file mode 100644
index 0000000000..e727b4e7a1
Binary files /dev/null and b/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/meta.json b/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/meta.json
index edae9c38c4..24fdcb71cc 100644
--- a/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from Frontier Station, created by Tem Armoff https://github.com/new-frontiers-14/frontier-station-14/pull/484/files",
+    "copyright": "Taken from Frontier Station, created by Tem Armoff https://github.com/new-frontiers-14/frontier-station-14/pull/484/files, Inhand sprites by onesch",
     "states": [
         {
             "name": "scanner",
@@ -20,6 +20,14 @@
         {
             "name": "icon",
             "directions": 1
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Tools/scissors.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/scissors.rsi/inhand-left.png
new file mode 100644
index 0000000000..3d078c811d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/scissors.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/scissors.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/scissors.rsi/inhand-right.png
new file mode 100644
index 0000000000..d9c5f33fc0
Binary files /dev/null and b/Resources/Textures/Objects/Tools/scissors.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/scissors.rsi/meta.json b/Resources/Textures/Objects/Tools/scissors.rsi/meta.json
index b544b3bc15..c431ad7f01 100644
--- a/Resources/Textures/Objects/Tools/scissors.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/scissors.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC0-1.0",
-  "copyright": "Created by TheShuEd(github) for Space Station 14",
+  "copyright": "Created by TheShuEd(github) for Space Station 14, Inhand sprites by onesch",
   "size": {
     "x": 32,
     "y": 32
@@ -9,6 +9,14 @@
   "states": [
     {
       "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Tools/spray_painter.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/spray_painter.rsi/inhand-left.png
new file mode 100644
index 0000000000..34787a11f5
Binary files /dev/null and b/Resources/Textures/Objects/Tools/spray_painter.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/spray_painter.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/spray_painter.rsi/inhand-right.png
new file mode 100644
index 0000000000..ce4df84606
Binary files /dev/null and b/Resources/Textures/Objects/Tools/spray_painter.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json b/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
index 056ba0a856..8a19107208 100644
--- a/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
@@ -1,5 +1,5 @@
 {
-   "copyright" : "Taken from https://github.com/tgstation/tgstation at commit a21274e56ae84b2c96e8b6beeca805df3d5402e8.",
+   "copyright" : "Taken from https://github.com/tgstation/tgstation at commit a21274e56ae84b2c96e8b6beeca805df3d5402e8, Inhand sprites by onesch",
    "license" : "CC-BY-SA-3.0",
    "size" : {
       "x" : 32,
@@ -8,6 +8,14 @@
    "states" : [
       {
          "name" : "spray_painter"
+      },
+      {
+          "name": "inhand-left",
+          "directions": 4
+      },
+      {
+          "name": "inhand-right",
+          "directions": 4
       }
    ],
    "version" : 1