From: Tiniest Shark Date: Tue, 8 Apr 2025 21:27:07 +0000 (-0400) Subject: Add inhands for Holoprojectors, labelers, cone, brb sign, fartbag (#36036) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=bfac77b53f3e625215af89c5678a82f8a7cdad25;p=space-station-14.git 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 2650ff9fe5..845130d332 100644 --- 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 d2354771de..42c625046e 100644 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 index 0000000000..a7bdd36b0d 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 index 0000000000..a0db2e450f 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 539cbe2b58..8a2af03b38 100644 --- 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 index 0000000000..f2c2f84688 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 index 0000000000..805731c8f4 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 3cabdd9f11..8023d637e3 100644 --- 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 index 0000000000..4cac2de710 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 index 0000000000..431dc923db 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 3cabdd9f11..8f203c43c1 100644 --- 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 index 0000000000..7c06de15ac 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 index 0000000000..da62c61924 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 86d3ad0a86..981edc7a35 100644 --- 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 index 0000000000..fb9efc401e 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 index 0000000000..9ecc43ea70 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 c5d03f56bb..4e5ae17108 100644 --- 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 index 0000000000..2fc07a043e 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 index 0000000000..a4bfc84be0 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 8cb5a2fb19..ff3bf61fea 100644 --- 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 index 0000000000..2a1f9710d5 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 index 0000000000..3e516a2410 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 index 0000000000..135621d4fe 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 index 0000000000..3a61189fe7 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 09778afa41..7610a3bb32 100644 --- 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 eb697134d6..d4f3bdcfe4 100644 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 303805398e..4201358c8c 100644 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 216140cec3..a6c02959d2 100644 --- 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