From: SeamLesss Date: Thu, 20 Mar 2025 01:04:41 +0000 (-0700) Subject: Add In-hand Sprites for miscellaneous items (#35433) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=4bb1a62f22137c484f0e0af6688ecd1e18d1440a;p=space-station-14.git 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 1e818226d5..c24e1b1b2c 100644 --- 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 af2af7a420..f712ec1b1d 100644 --- 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 6e10d5274a..4d6cc784af 100644 --- 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 7aee3e5876..b09dfee840 100644 --- 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 index 0000000000..6808a6bb6e 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 index 0000000000..35a676d841 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 b21b92751c..2a334f52b7 100644 --- 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 index 0000000000..d001d66095 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 index 0000000000..5dab7d01ca 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 cf06e9bdd1..777097dc0d 100644 --- 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 index 0000000000..245249b790 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 index 0000000000..2616bdfd09 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 8570594128..793c51e32a 100644 --- 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 index 0000000000..e942661b0e 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 index 0000000000..818934e791 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 c4298b6ec8..38e23e43fb 100644 --- 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 index 0000000000..2616245bbf 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 index 0000000000..d0af1160e2 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 7051793e03..7750b9e009 100644 --- 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 index 0000000000..bc122f36c4 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 index 0000000000..fea250fbf9 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 c7c06adfc8..5b19648740 100644 --- 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 } ] }