Add inhands for Holoprojectors, labelers, cone, brb sign, fartbag (#36036)

* Add inhands for Holoprojectors, labelers, cone, brb sign, whoopie cushion

* Update Resources/Textures/Objects/Devices/Holoprojectors/atmos.rsi/meta.json

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

diff --git a/Resources/Prototypes/Entities/Objects/Misc/brb_sign.yml b/Resources/Prototypes/Entities/Objects/Misc/brb_sign.yml
index 2650ff9fe50687a9b98af939d42d8ca541db8e7e..845130d3324b76ab91a7330ad74f24a87209cdcc 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/brb_sign.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/brb_sign.yml
@@ -6,4 +6,9 @@
   components:
   - type: Sprite
     sprite: Objects/Misc/brbsign.rsi
-    state: icon
\ No newline at end of file
+    state: icon
+  - type: Clothing
+    sprite: Objects/Misc/brbsign.rsi
+    quickEquip: false
+    slots:
+    - Neck

diff --git a/Resources/Textures/Clothing/Head/Misc/cone.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/cone.rsi/equipped-HELMET.png
index d2354771deac31b33ea5075c59579a9fca15fd53..42c625046e5f14f2f0c1a0c8c99320f94eeab869 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Misc/cone.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Misc/cone.rsi/equipped-HELMET.png differ

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

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

diff --git a/Resources/Textures/Clothing/Head/Misc/cone.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/cone.rsi/meta.json
index 539cbe2b584106086636540517425a6cd1c20052..8a2af03b386ddfa465dc5441eeaf5e53f9cf06a2 100644 (file)
--- a/Resources/Textures/Clothing/Head/Misc/cone.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Misc/cone.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/a0ea68909c06529bac03c27283134196f4fd4a97",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a0ea68909c06529bac03c27283134196f4fd4a97, Head and Inhand sprites by TiniestShark (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -13,6 +13,14 @@
     {
       "name": "equipped-HELMET",
       "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
     }
   ]
 }

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

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

diff --git a/Resources/Textures/Objects/Devices/Holoprojectors/atmos.rsi/meta.json b/Resources/Textures/Objects/Devices/Holoprojectors/atmos.rsi/meta.json
index 3cabdd9f1127a55b4e95b0cfbe14f8574bc08d36..8023d637e3ec0328f44121d8e98d107875dea832 100644 (file)
--- a/Resources/Textures/Objects/Devices/Holoprojectors/atmos.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/Holoprojectors/atmos.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhands by TiniestShark (GitHub)",
     "states": [
         {
             "name": "icon",
@@ -17,6 +17,66 @@
                     0.3
                 ]
             ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
         }
     ]
-}
\ No newline at end of file
+}

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

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

diff --git a/Resources/Textures/Objects/Devices/Holoprojectors/custodial.rsi/meta.json b/Resources/Textures/Objects/Devices/Holoprojectors/custodial.rsi/meta.json
index 3cabdd9f1127a55b4e95b0cfbe14f8574bc08d36..8f203c43c1e99c4d18c295871af88a411a1857f1 100644 (file)
--- a/Resources/Textures/Objects/Devices/Holoprojectors/custodial.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/Holoprojectors/custodial.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. Inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon",
@@ -17,6 +17,66 @@
                     0.3
                 ]
             ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
         }
     ]
-}
\ No newline at end of file
+}

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

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

diff --git a/Resources/Textures/Objects/Devices/Holoprojectors/field.rsi/meta.json b/Resources/Textures/Objects/Devices/Holoprojectors/field.rsi/meta.json
index 86d3ad0a86bd61f708942fd95dd92b9613649cc3..981edc7a3508bec589a2eabb10119b1901573528 100644 (file)
--- a/Resources/Textures/Objects/Devices/Holoprojectors/field.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/Holoprojectors/field.rsi/meta.json
@@ -5,7 +5,7 @@
     "y": 32
   },
      "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f4017da82ae4de7bfaf8ebdbba33d0de81c15587, and resprited by TheShuEd (github)",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f4017da82ae4de7bfaf8ebdbba33d0de81c15587, and resprited by TheShuEd (github). Inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon",
@@ -17,6 +17,66 @@
                     0.3
                 ]
             ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
         }
     ]
-}
\ No newline at end of file
+}

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

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

diff --git a/Resources/Textures/Objects/Devices/Holoprojectors/security.rsi/meta.json b/Resources/Textures/Objects/Devices/Holoprojectors/security.rsi/meta.json
index c5d03f56bb5468240476082e83420e68ab25e02b..4e5ae1710813d4b18ea9564140fd19160ccf1054 100644 (file)
--- a/Resources/Textures/Objects/Devices/Holoprojectors/security.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/Holoprojectors/security.rsi/meta.json
@@ -5,7 +5,7 @@
     "y": 32
   },
      "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f4017da82ae4de7bfaf8ebdbba33d0de81c15587",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f4017da82ae4de7bfaf8ebdbba33d0de81c15587. Inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon",
@@ -17,6 +17,66 @@
                     0.3
                 ]
             ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
         }
     ]
-}
\ No newline at end of file
+}

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

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

diff --git a/Resources/Textures/Objects/Fun/whoopie.rsi/meta.json b/Resources/Textures/Objects/Fun/whoopie.rsi/meta.json
index 8cb5a2fb1941e5d787e6bfc131447bab1ac72665..ff3bf61fea4fd9b50045de28c4e309b15e4a92eb 100644 (file)
--- a/Resources/Textures/Objects/Fun/whoopie.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/whoopie.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by brainfood1183 (github) for ss14",
+  "copyright": "Made by brainfood1183 (github) for ss14, inhands by TiniestShark (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -9,6 +9,14 @@
   "states": [
     {
       "name": "icon"
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Misc/brbsign.rsi/equipped-NECK-vox.png b/Resources/Textures/Objects/Misc/brbsign.rsi/equipped-NECK-vox.png
new file mode 100644 (file)
index 0000000..2a1f971
Binary files /dev/null and b/Resources/Textures/Objects/Misc/brbsign.rsi/equipped-NECK-vox.png differ

diff --git a/Resources/Textures/Objects/Misc/brbsign.rsi/equipped-NECK.png b/Resources/Textures/Objects/Misc/brbsign.rsi/equipped-NECK.png
new file mode 100644 (file)
index 0000000..3e516a2
Binary files /dev/null and b/Resources/Textures/Objects/Misc/brbsign.rsi/equipped-NECK.png differ

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

diff --git a/Resources/Textures/Objects/Misc/brbsign.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/brbsign.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..3a61189
Binary files /dev/null and b/Resources/Textures/Objects/Misc/brbsign.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Misc/brbsign.rsi/meta.json b/Resources/Textures/Objects/Misc/brbsign.rsi/meta.json
index 09778afa417f645ef9de5e3f53d4dc3f66ee407e..7610a3bb32706157ff85859a911485ed168cc39f 100644 (file)
--- a/Resources/Textures/Objects/Misc/brbsign.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/brbsign.rsi/meta.json
@@ -1 +1,30 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC0-1.0", "copyright": "Made by efzapa, use or modify it how you please lol.", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Made by efzapa, inhands and neck sprites by TiniestShark (github).",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-NECK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-NECK-vox",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

diff --git a/Resources/Textures/Objects/Tools/hand_labeler.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/hand_labeler.rsi/inhand-left.png
index eb697134d65ee5febb84ef56a3ea5361d12ac1e8..d4f3bdcfe42830b50a300313f97f4de9bd1787ba 100644 (file)
Binary files a/Resources/Textures/Objects/Tools/hand_labeler.rsi/inhand-left.png and b/Resources/Textures/Objects/Tools/hand_labeler.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Tools/hand_labeler.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/hand_labeler.rsi/inhand-right.png
index 303805398e9fec833b47a86c87edf195b9a425a2..4201358c8ca1f6a93a24ed491fa4e7ba91fd1b15 100644 (file)
Binary files a/Resources/Textures/Objects/Tools/hand_labeler.rsi/inhand-right.png and b/Resources/Textures/Objects/Tools/hand_labeler.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json b/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json
index 216140cec3cafc162d6d4c68a4aaf226df57fd43..a6c02959d247cf1ad0b4d5443509cfd4c545446d 100644 (file)
--- a/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation at commit 44636483b7b2868b3e42c92205539f11f6d7968f. Inhand sprites by Macoron.",
+    "copyright": "Taken from https://github.com/tgstation/tgstation at commit 44636483b7b2868b3e42c92205539f11f6d7968f. Inhand sprites by TiniestShark (github).",
     "size": {
         "x": 32,
         "y": 32