From: Tiniest Shark Date: Fri, 27 Jun 2025 01:07:29 +0000 (-0400) Subject: Toy/Plushie Inhands and Wearables (#38514) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=a1cf4903606c08928b2469357e876f14d491d5b1;p=space-station-14.git Toy/Plushie Inhands and Wearables (#38514) --- diff --git a/Resources/Prototypes/Entities/Objects/Fun/mech_figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/mech_figurines.yml index 7cc6aaaeaf..f04fa19a04 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/mech_figurines.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/mech_figurines.yml @@ -17,7 +17,7 @@ - type: Tag tags: - Figurine - + #Ripley APLU - type: entity parent: BaseFigurineMech @@ -27,6 +27,24 @@ components: - type: Sprite state: ripley + - type: Item + inhandVisuals: + left: + - state: inhand-left-base + - state: inhand-left-body + color: "#d5c644" + - state: inhand-left-trim + color: "#524c14" + - state: inhand-left-visor + color: "#7aef83" + right: + - state: inhand-right-base + - state: inhand-right-body + color: "#d5c644" + - state: inhand-right-trim + color: "#524c14" + - state: inhand-right-visor + color: "#7aef83" #Fire Ripley - type: entity @@ -37,6 +55,24 @@ components: - type: Sprite state: fireripley + - type: Item + inhandVisuals: + left: + - state: inhand-left-base + - state: inhand-left-body + color: "#819a73" + - state: inhand-left-trim + color: "#486b2f" + - state: inhand-left-visor + color: "#5a150e" + right: + - state: inhand-right-base + - state: inhand-right-body + color: "#819a73" + - state: inhand-right-trim + color: "#486b2f" + - state: inhand-right-visor + color: "#5a150e" #Death Ripley - type: entity @@ -47,6 +83,24 @@ components: - type: Sprite state: deathripley + - type: Item + inhandVisuals: + left: + - state: inhand-left-base + - state: inhand-left-body + color: "#575757" + - state: inhand-left-trim + color: "#b3001b" + - state: inhand-left-visor + color: "#e1131e" + right: + - state: inhand-right-base + - state: inhand-right-body + color: "#575757" + - state: inhand-right-trim + color: "#b3001b" + - state: inhand-right-visor + color: "#e1131e" #Ggygax - type: entity @@ -57,6 +111,24 @@ components: - type: Sprite state: gygax + - type: Item + inhandVisuals: + left: + - state: inhand-left-base + - state: inhand-left-body + color: "#e76241" + - state: inhand-left-trim + color: "#4f5359" + - state: inhand-left-visor + color: "#00ff33" + right: + - state: inhand-right-base + - state: inhand-right-body + color: "#e76241" + - state: inhand-right-trim + color: "#4f5359" + - state: inhand-right-visor + color: "#00ff33" #Durand - type: entity @@ -67,6 +139,24 @@ components: - type: Sprite state: durand + - type: Item + inhandVisuals: + left: + - state: inhand-left-base + - state: inhand-left-body + color: "#a8abb3" + - state: inhand-left-trim + color: "#686d78" + - state: inhand-left-visor + color: "#8cc865" + right: + - state: inhand-right-base + - state: inhand-right-body + color: "#a8abb3" + - state: inhand-right-trim + color: "#686d78" + - state: inhand-right-visor + color: "#8cc865" #H.O.N.K - type: entity @@ -77,6 +167,24 @@ components: - type: Sprite state: honk + - type: Item + inhandVisuals: + left: + - state: inhand-left-base + - state: inhand-left-body + color: "#ed1c24" + - state: inhand-left-trim + color: "#ffffff" + - state: inhand-left-visor + color: "#ff040b" + right: + - state: inhand-right-base + - state: inhand-right-body + color: "#ed1c24" + - state: inhand-right-trim + color: "#ffffff" + - state: inhand-right-visor + color: "#ff040b" #Marauder - type: entity @@ -87,6 +195,24 @@ components: - type: Sprite state: marauder + - type: Item + inhandVisuals: + left: + - state: inhand-left-base + - state: inhand-left-body + color: "#9da6be" + - state: inhand-left-trim + color: "#557a48" + - state: inhand-left-visor + color: "#00ff33" + right: + - state: inhand-right-base + - state: inhand-right-body + color: "#9da6be" + - state: inhand-right-trim + color: "#557a48" + - state: inhand-right-visor + color: "#00ff33" #Seraph - type: entity @@ -97,6 +223,24 @@ components: - type: Sprite state: seraph + - type: Item + inhandVisuals: + left: + - state: inhand-left-base + - state: inhand-left-body + color: "#878c97" + - state: inhand-left-trim + color: "#943226" + - state: inhand-left-visor + color: "#f31a33" + right: + - state: inhand-right-base + - state: inhand-right-body + color: "#878c97" + - state: inhand-right-trim + color: "#943226" + - state: inhand-right-visor + color: "#f31a33" #Mauler - type: entity @@ -107,6 +251,24 @@ components: - type: Sprite state: mauler + - type: Item + inhandVisuals: + left: + - state: inhand-left-base + - state: inhand-left-body + color: "#2b2b2b" + - state: inhand-left-trim + color: "#660000" + - state: inhand-left-visor + color: "#ff0000" + right: + - state: inhand-right-base + - state: inhand-right-body + color: "#2b2b2b" + - state: inhand-right-trim + color: "#660000" + - state: inhand-right-visor + color: "#ff0000" #Odysseus - type: entity @@ -117,6 +279,24 @@ components: - type: Sprite state: odysseus + - type: Item + inhandVisuals: + left: + - state: inhand-left-base + - state: inhand-left-body + color: "#ffffff" + - state: inhand-left-trim + color: "#7d7f97" + - state: inhand-left-visor + color: "#857149" + right: + - state: inhand-right-base + - state: inhand-right-body + color: "#ffffff" + - state: inhand-right-trim + color: "#7d7f97" + - state: inhand-right-visor + color: "#857149" #Phazon - type: entity @@ -127,6 +307,24 @@ components: - type: Sprite state: phazon + - type: Item + inhandVisuals: + left: + - state: inhand-left-base + - state: inhand-left-body + color: "#4d79a0" + - state: inhand-left-trim + color: "#f38233" + - state: inhand-left-visor + color: "#f38233" + right: + - state: inhand-right-base + - state: inhand-right-body + color: "#4d79a0" + - state: inhand-right-trim + color: "#f38233" + - state: inhand-right-visor + color: "#f38233" #Reticence - type: entity @@ -137,3 +335,21 @@ components: - type: Sprite state: reticence + - type: Item + inhandVisuals: + left: + - state: inhand-left-base + - state: inhand-left-body + color: "#d9d9d9" + - state: inhand-left-trim + color: "#8b8b8b" + - state: inhand-left-visor + color: "#1f1f1f" + right: + - state: inhand-right-base + - state: inhand-right-body + color: "#d9d9d9" + - state: inhand-right-trim + color: "#8b8b8b" + - state: inhand-right-visor + color: "#1f1f1f" diff --git a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml index f29841ea08..f0ab2931c0 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml @@ -127,6 +127,7 @@ noRot: true - type: Item size: Normal + - type: MultiHandedItem - type: Construction graph: PlushieGhostRevenant node: plushie @@ -202,6 +203,15 @@ wideAnimationRotation: 180 soundHit: path: /Audio/Items/Toys/mousesqueek.ogg + - type: Clothing + quickEquip: false + sprite: Objects/Fun/Plushies/hampter.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET + offset: "0, 0.04" - type: FoodSequenceElement entries: CottonBurger: HamptrPlushie @@ -240,6 +250,15 @@ - type: Sprite sprite: Objects/Fun/Plushies/nukie.rsi state: icon + - type: Clothing + quickEquip: false + sprite: Objects/Fun/Plushies/nukie.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET + offset: "0, 0.03" - type: FoodSequenceElement entries: CottonBurger: NukiePlushie @@ -254,6 +273,15 @@ sprite: Objects/Fun/Plushies/rouny.rsi state: icon - type: Rotatable + - type: Clothing + quickEquip: false + sprite: Objects/Fun/Plushies/rouny.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET + offset: "0, 0.03" - type: FoodSequenceElement entries: CottonBurger: RounyPlushie @@ -307,6 +335,11 @@ wideAnimationRotation: 180 soundHit: path: /Audio/Voice/Arachnid/arachnid_laugh.ogg + - type: Clothing + quickEquip: false + sprite: Objects/Fun/Plushies/arachnid.rsi + slots: + - HEAD - type: FoodSequenceElement entries: CottonBurger: ArachnidPlushie @@ -650,6 +683,15 @@ - LowImpassable - type: CollisionWake enabled: false + - type: Clothing + quickEquip: false + sprite: Objects/Fun/Plushies/diona.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET + offset: "0, 0.09" - type: FoodSequenceElement entries: CottonBurger: DionaPlushie @@ -739,7 +781,7 @@ parent: BasePlushie id: PlushieRatvar name: ratvar plushie - description: A small stuffed doll of the elder god Ratvar. + description: A large stuffed doll of the elder god Ratvar. components: - type: Sprite sprite: Objects/Fun/Plushies/ratvar.rsi @@ -747,6 +789,12 @@ - type: Item size: Normal sprite: Objects/Fun/Plushies/ratvar.rsi + - type: MultiHandedItem + - type: Clothing + quickEquip: false + sprite: Objects/Fun/Plushies/ratvar.rsi + slots: + - neck - type: FoodSequenceElement entries: CottonBurger: RatvarPlushie @@ -755,7 +803,7 @@ parent: BasePlushie id: PlushieNar name: nar'sie plushie - description: A small stuffed doll of the elder goddess Nar'Sie. + description: A large stuffed doll of the elder goddess Nar'Sie. components: - type: Sprite sprite: Objects/Fun/Plushies/narsie.rsi @@ -763,6 +811,12 @@ - type: Item size: Normal sprite: Objects/Fun/Plushies/narsie.rsi + - type: MultiHandedItem + - type: Clothing + quickEquip: false + sprite: Objects/Fun/Plushies/narsie.rsi + slots: + - neck - type: FoodSequenceElement entries: CottonBurger: NarPlushie @@ -885,6 +939,11 @@ wideAnimationRotation: 180 soundHit: path: /Audio/Voice/Slime/slime_squish.ogg + - type: Clothing + quickEquip: false + sprite: Objects/Fun/Plushies/slime.rsi + slots: + - HEAD - type: FoodSequenceElement entries: CottonBurger: SlimePlushie @@ -1007,6 +1066,15 @@ wideAnimationRotation: 180 soundHit: path: /Audio/Voice/Vox/shriek1.ogg + - type: Clothing + quickEquip: false + sprite: Objects/Fun/Plushies/vox.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET + offset: "0, 0.09" - type: FoodSequenceElement entries: CottonBurger: VoxPlushie @@ -1020,6 +1088,15 @@ - type: Sprite sprite: Objects/Fun/Plushies/atmosian.rsi state: icon + - type: Clothing + quickEquip: false + sprite: Objects/Fun/Plushies/atmosian.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET + offset: "0, 0.04" - type: FoodSequenceElement entries: CottonBurger: AtmosianPlushie @@ -1058,6 +1135,15 @@ wideAnimationRotation: 180 soundHit: path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: Clothing + quickEquip: false + sprite: Objects/Fun/Plushies/xeno.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET + offset: "0, 0.03" - type: FoodSequenceElement entries: CottonBurger: XenoPlushie @@ -1071,6 +1157,11 @@ - type: Sprite sprite: Objects/Fun/Plushies/penguin.rsi state: icon + - type: Clothing + quickEquip: false + sprite: Objects/Fun/Plushies/penguin.rsi + slots: + - HEAD - type: FoodSequenceElement entries: CottonBurger: PenguinPlushie @@ -1106,6 +1197,11 @@ - type: EmitSoundOnTrigger sound: path: /Audio/Voice/Human/malescream_5.ogg + - type: Clothing + quickEquip: false + sprite: Objects/Fun/Plushies/human.rsi + slots: + - HEAD - type: FoodSequenceElement entries: CottonBurger: HumanPlushie @@ -1141,6 +1237,11 @@ requiresSpecialDigestion: true useSound: path: /Audio/Voice/Moth/moth_chitter.ogg + - type: Clothing + quickEquip: false + sprite: Objects/Fun/Plushies/moth.rsi + slots: + - HEAD - type: FoodSequenceElement entries: CottonBurger: MothPlushie diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 495d044f01..4daffe1c56 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -155,6 +155,15 @@ - type: Sprite sprite: Objects/Fun/AI.rsi state: icon + - type: Clothing + quickEquip: false + sprite: Objects/Fun/AI.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET + offset: "0, 0.06" - type: entity parent: BaseFigurineCheapo @@ -165,6 +174,15 @@ - type: Sprite sprite: Objects/Fun/toy_nuke.rsi state: icon + - type: Clothing + quickEquip: false + sprite: Objects/Fun/toy_nuke.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET + offset: "0, 0.12" - type: Tag tags: - Payload @@ -198,6 +216,15 @@ - type: Sprite sprite: Objects/Fun/toy_ian.rsi state: icon + - type: Clothing + quickEquip: false + sprite: Objects/Fun/toy_ian.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET + offset: "0, 0.06" - type: Item size: Tiny - type: EmitSoundOnUse @@ -478,11 +505,17 @@ sprite: Objects/Fun/toy_singularity.rsi state: icon - type: SingularityDistortion - intensity: 2000 + intensity: 25 falloffPower: 2.6 - type: Item size: Normal - sprite: Objects/Fun/icon.rsi + inhandVisuals: + left: + - state: singu-inhand-left + shader: unshaded + right: + - state: singu-inhand-right + shader: unshaded - type: entity parent: BaseItem @@ -495,6 +528,14 @@ shader: unshaded layers: - state: tesla_projectile + - type: Item + inhandVisuals: + left: + - state: tesla-inhand-left + shader: unshaded + right: + - state: tesla-inhand-right + shader: unshaded - type: PointLight enabled: true radius: 5 @@ -632,6 +673,22 @@ - state: base map: [ "enum.DamageStateVisualLayers.Base" ] - state: visor + - type: Clothing + sprite: Objects/Fun/pequeno.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET-body + - state: equipped-HELMET-vis + - type: Item + inhandVisuals: + left: + - state: inhand-left-body + - state: inhand-left-vis + right: + - state: inhand-right-body + - state: inhand-right-vis - type: RandomSprite available: - enum.DamageStateVisualLayers.Base: diff --git a/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/inhand-left.png b/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/inhand-left.png new file mode 100644 index 0000000000..c29cb7ca64 Binary files /dev/null and b/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/inhand-left.png differ diff --git a/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/inhand-right.png b/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/inhand-right.png new file mode 100644 index 0000000000..363b460645 Binary files /dev/null and b/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/inhand-right.png differ diff --git a/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/meta.json b/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/meta.json index e7b01df53d..a465e90b6c 100644 --- a/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/meta.json +++ b/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/meta.json @@ -1,18 +1,26 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/blob/f80e7ba62d27c77cfeac709dd71033744d0015c4/icons/mob/mob.dmi", + "copyright": "https://github.com/tgstation/tgstation/blob/f80e7ba62d27c77cfeac709dd71033744d0015c4/icons/mob/mob.dmi, inhand sprites by TiniestShark (github)", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "animated", - "directions": 4 - }, - { - "name": "icon" - } + { + "name": "animated", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } ] } diff --git a/Resources/Textures/Mobs/Ghosts/revenant.rsi/inhand-left.png b/Resources/Textures/Mobs/Ghosts/revenant.rsi/inhand-left.png new file mode 100644 index 0000000000..f7fe8a1b79 Binary files /dev/null and b/Resources/Textures/Mobs/Ghosts/revenant.rsi/inhand-left.png differ diff --git a/Resources/Textures/Mobs/Ghosts/revenant.rsi/inhand-right.png b/Resources/Textures/Mobs/Ghosts/revenant.rsi/inhand-right.png new file mode 100644 index 0000000000..f7fe8a1b79 Binary files /dev/null and b/Resources/Textures/Mobs/Ghosts/revenant.rsi/inhand-right.png differ diff --git a/Resources/Textures/Mobs/Ghosts/revenant.rsi/meta.json b/Resources/Textures/Mobs/Ghosts/revenant.rsi/meta.json index 5a430a2a37..b5d8bc7086 100644 --- a/Resources/Textures/Mobs/Ghosts/revenant.rsi/meta.json +++ b/Resources/Textures/Mobs/Ghosts/revenant.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/blob/f80e7ba62d27c77cfeac709dd71033744d0015c4/icons/mob/mob.dmi", + "copyright": "https://github.com/tgstation/tgstation/blob/f80e7ba62d27c77cfeac709dd71033744d0015c4/icons/mob/mob.dmi, inhand sprites by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -185,6 +185,14 @@ 0.1 ] ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Fun/AI.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/AI.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..a393a02f3e Binary files /dev/null and b/Resources/Textures/Objects/Fun/AI.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Fun/AI.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/AI.rsi/inhand-left.png new file mode 100644 index 0000000000..b81fb4c222 Binary files /dev/null and b/Resources/Textures/Objects/Fun/AI.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/AI.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/AI.rsi/inhand-right.png new file mode 100644 index 0000000000..3b91539d8e Binary files /dev/null and b/Resources/Textures/Objects/Fun/AI.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/AI.rsi/meta.json b/Resources/Textures/Objects/Fun/AI.rsi/meta.json index e5ddb0f4d7..5312d061af 100644 --- a/Resources/Textures/Objects/Fun/AI.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/AI.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-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, inhand and helmet sprites by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -9,6 +9,18 @@ "states": [ { "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..885e8484fe Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/inhand-left.png new file mode 100644 index 0000000000..1f13d528eb Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/inhand-right.png new file mode 100644 index 0000000000..73ca020748 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/meta.json index c26c4da7ce..cbd97acd20 100644 --- a/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Sprite by PixelTheKermit (github)", + "copyright": "Sprite by PixelTheKermit (github), inhand and helmet sprites by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -9,6 +9,18 @@ "states": [ { "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..9dfdff7d09 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/inhand-left.png new file mode 100644 index 0000000000..903b2e68b8 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/inhand-right.png new file mode 100644 index 0000000000..bc17747bdf Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/meta.json index e5ddb0f4d7..5312d061af 100644 --- a/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-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, inhand and helmet sprites by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -9,6 +9,18 @@ "states": [ { "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Fun/Plushies/diona.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/diona.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..9caf992314 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/diona.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/diona.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/diona.rsi/inhand-left.png new file mode 100644 index 0000000000..1aff8b0591 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/diona.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/diona.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/diona.rsi/inhand-right.png new file mode 100644 index 0000000000..015a920f33 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/diona.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/diona.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/diona.rsi/meta.json index 3843fed26f..4fabeaa69f 100644 --- a/Resources/Textures/Objects/Fun/Plushies/diona.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Plushies/diona.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Sprites by discord user Deos#5630", + "copyright": "Sprites by discord user Deos#5630, inhand and helmet sprites by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -12,6 +12,18 @@ }, { "name": "plushie_diona1" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..23a8f6b55a Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/inhand-left.png new file mode 100644 index 0000000000..cf51e5b5d4 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/inhand-right.png new file mode 100644 index 0000000000..7f5f6d4028 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/meta.json index ddeb50c744..0f99a998c3 100644 --- a/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Sprite by RenLou#4333", + "copyright": "Sprite by RenLou#4333, inhand and helmet sprites by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -9,6 +9,18 @@ "states": [ { "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Fun/Plushies/human.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/human.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..944db83589 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/human.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/human.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/human.rsi/inhand-left.png new file mode 100644 index 0000000000..3ad686c098 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/human.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/human.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/human.rsi/inhand-right.png new file mode 100644 index 0000000000..e08a9977b1 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/human.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/human.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/human.rsi/meta.json index 23d0f71a20..ad2be4bd40 100644 --- a/Resources/Textures/Objects/Fun/Plushies/human.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Plushies/human.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Sprite by TheShuEd", + "copyright": "Sprite by TheShuEd, inhand and helmet sprites by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -9,6 +9,18 @@ "states": [ { "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/inhand-left.png new file mode 100644 index 0000000000..02153a45dc Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/inhand-right.png new file mode 100644 index 0000000000..b70a213869 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/meta.json index e5ddb0f4d7..04454077ab 100644 --- a/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-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, inhand sprites by TiniestShark (github)", "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/Fun/Plushies/moth.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/moth.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..9e3cb9e197 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/moth.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/moth.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/moth.rsi/inhand-left.png new file mode 100644 index 0000000000..04de645653 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/moth.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/moth.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/moth.rsi/inhand-right.png new file mode 100644 index 0000000000..d84670db29 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/moth.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/moth.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/moth.rsi/meta.json index e5ddb0f4d7..5312d061af 100644 --- a/Resources/Textures/Objects/Fun/Plushies/moth.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Plushies/moth.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-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, inhand and helmet sprites by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -9,6 +9,18 @@ "states": [ { "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/equipped-NECK.png b/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/equipped-NECK.png new file mode 100644 index 0000000000..f9ae44c187 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/inhand-left.png new file mode 100644 index 0000000000..8374c6d4aa Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/inhand-right.png new file mode 100644 index 0000000000..8374c6d4aa Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/meta.json index e5ddb0f4d7..2962536bce 100644 --- a/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-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, inhand and neck sprites by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -9,6 +9,18 @@ "states": [ { "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..87a57d085e Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/inhand-left.png new file mode 100644 index 0000000000..90220ea0dc Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/inhand-right.png new file mode 100644 index 0000000000..0b69f7b194 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/meta.json index e5ddb0f4d7..5312d061af 100644 --- a/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-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, inhand and helmet sprites by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -9,6 +9,18 @@ "states": [ { "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..e8c7767680 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/inhand-left.png new file mode 100644 index 0000000000..d5e7743d2c Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/inhand-right.png new file mode 100644 index 0000000000..b929a976db Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/meta.json index 95024a5e4a..83191c2a0b 100644 --- a/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Sprite by netwy", + "copyright": "Sprite by netwy, inhand and helmet sprites by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -9,6 +9,18 @@ "states": [ { "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/equipped-NECK.png b/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/equipped-NECK.png new file mode 100644 index 0000000000..f9349a93e7 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/inhand-left.png new file mode 100644 index 0000000000..64530fd6fd Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/inhand-right.png new file mode 100644 index 0000000000..64530fd6fd Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/meta.json index e5ddb0f4d7..2962536bce 100644 --- a/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-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, inhand and neck sprites by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -9,6 +9,18 @@ "states": [ { "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..1bf687bcc2 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/inhand-left.png new file mode 100644 index 0000000000..c37131b84a Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/inhand-right.png new file mode 100644 index 0000000000..bdd8b8562d Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/meta.json index 5be34bc591..e4d7938e5e 100644 --- a/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-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, inhand and helmet sprites by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -10,6 +10,18 @@ { "name": "icon", "directions": 4 + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Fun/Plushies/slime.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/slime.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..c218e0dc4c Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/slime.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/slime.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/slime.rsi/inhand-left.png new file mode 100644 index 0000000000..1e30789bde Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/slime.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/slime.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/slime.rsi/inhand-right.png new file mode 100644 index 0000000000..43d30e2171 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/slime.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/slime.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/slime.rsi/meta.json index e5ddb0f4d7..5312d061af 100644 --- a/Resources/Textures/Objects/Fun/Plushies/slime.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Plushies/slime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-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, inhand and helmet sprites by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -9,6 +9,18 @@ "states": [ { "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Fun/Plushies/snake.rsi/equipped-NECK-vox.png b/Resources/Textures/Objects/Fun/Plushies/snake.rsi/equipped-NECK-vox.png new file mode 100644 index 0000000000..b80dd1be4b Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/snake.rsi/equipped-NECK-vox.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/snake.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/snake.rsi/meta.json index 2db3921089..412a503089 100644 --- a/Resources/Textures/Objects/Fun/Plushies/snake.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Plushies/snake.rsi/meta.json @@ -21,6 +21,10 @@ { "name": "equipped-NECK", "directions": 4 + }, + { + "name": "equipped-NECK-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Fun/Plushies/vox.rsi/equipped-HELMET-vox.png b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..69ffbd6d89 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/vox.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..0642b4efc0 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/vox.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/inhand-left.png new file mode 100644 index 0000000000..be3707ce65 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/vox.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/inhand-right.png new file mode 100644 index 0000000000..3143c99893 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/vox.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/meta.json index e36a30b200..9ed84dc98b 100644 --- a/Resources/Textures/Objects/Fun/Plushies/vox.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Sprite by LinkUyx#6557", + "copyright": "Sprite by LinkUyx#6557, inhand and helmet sprites by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -9,6 +9,22 @@ "states": [ { "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..c60ace3607 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/inhand-left.png new file mode 100644 index 0000000000..a25259b82c Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/inhand-right.png new file mode 100644 index 0000000000..ded904dbe3 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/meta.json index e36a30b200..bd583cd1ab 100644 --- a/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Sprite by LinkUyx#6557", + "copyright": "Sprite by LinkUyx#6557, inhand and helmet sprites by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -9,6 +9,18 @@ "states": [ { "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Fun/clownrecorder.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/clownrecorder.rsi/inhand-left.png new file mode 100644 index 0000000000..190072658b Binary files /dev/null and b/Resources/Textures/Objects/Fun/clownrecorder.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/clownrecorder.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/clownrecorder.rsi/inhand-right.png new file mode 100644 index 0000000000..836570c0f5 Binary files /dev/null and b/Resources/Textures/Objects/Fun/clownrecorder.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/clownrecorder.rsi/meta.json b/Resources/Textures/Objects/Fun/clownrecorder.rsi/meta.json index 84dd1f0fa3..9095fe2338 100644 --- a/Resources/Textures/Objects/Fun/clownrecorder.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/clownrecorder.rsi/meta.json @@ -1,14 +1,22 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Taken from ParadiseSS13 at commit https://github.com/ParadiseSS13/Paradise/pull/19710/commits/6fb423d9045d43f04e47770bbf505770f2d7b75a", + "copyright": "Taken from ParadiseSS13 at commit https://github.com/ParadiseSS13/Paradise/pull/19710/commits/6fb423d9045d43f04e47770bbf505770f2d7b75a, inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - } + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } ] } diff --git a/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-base.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-base.png new file mode 100644 index 0000000000..32497b548a Binary files /dev/null and b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-base.png differ diff --git a/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-body.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-body.png new file mode 100644 index 0000000000..52215ce9a5 Binary files /dev/null and b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-body.png differ diff --git a/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-trim.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-trim.png new file mode 100644 index 0000000000..8aaacb9dd1 Binary files /dev/null and b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-trim.png differ diff --git a/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-visor.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-visor.png new file mode 100644 index 0000000000..a08b69e7c3 Binary files /dev/null and b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-visor.png differ diff --git a/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-base.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-base.png new file mode 100644 index 0000000000..c34bca921d Binary files /dev/null and b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-base.png differ diff --git a/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-body.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-body.png new file mode 100644 index 0000000000..c10267ea8e Binary files /dev/null and b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-body.png differ diff --git a/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-trim.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-trim.png new file mode 100644 index 0000000000..8288a861bd Binary files /dev/null and b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-trim.png differ diff --git a/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-visor.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-visor.png new file mode 100644 index 0000000000..b7241f5085 Binary files /dev/null and b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-visor.png differ diff --git a/Resources/Textures/Objects/Fun/mech_figurines.rsi/meta.json b/Resources/Textures/Objects/Fun/mech_figurines.rsi/meta.json index f92464abc6..99a92db005 100644 --- a/Resources/Textures/Objects/Fun/mech_figurines.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/mech_figurines.rsi/meta.json @@ -1,47 +1,79 @@ { "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, inhand sprites by TiniestShark (github)", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "deathripley" - }, - { - "name": "ripley" - }, - { - "name": "fireripley" - }, - { - "name": "marauder" - }, - { - "name": "mauler" - }, - { - "name": "gygax" - }, - { - "name": "durand" - }, - { - "name": "odysseus" - }, - { - "name": "honk" - }, - { - "name": "seraph" - }, - { - "name": "reticence" - }, - { - "name": "phazon" - } + { + "name": "deathripley" + }, + { + "name": "ripley" + }, + { + "name": "fireripley" + }, + { + "name": "marauder" + }, + { + "name": "mauler" + }, + { + "name": "gygax" + }, + { + "name": "durand" + }, + { + "name": "odysseus" + }, + { + "name": "honk" + }, + { + "name": "seraph" + }, + { + "name": "reticence" + }, + { + "name": "phazon" + }, + { + "name": "inhand-left-base", + "directions": 4 + }, + { + "name": "inhand-left-body", + "directions": 4 + }, + { + "name": "inhand-left-trim", + "directions": 4 + }, + { + "name": "inhand-left-visor", + "directions": 4 + }, + { + "name": "inhand-right-base", + "directions": 4 + }, + { + "name": "inhand-right-body", + "directions": 4 + }, + { + "name": "inhand-right-trim", + "directions": 4 + }, + { + "name": "inhand-right-visor", + "directions": 4 + } ] } diff --git a/Resources/Textures/Objects/Fun/newton_cradle.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/newton_cradle.rsi/inhand-left.png new file mode 100644 index 0000000000..29c03cb388 Binary files /dev/null and b/Resources/Textures/Objects/Fun/newton_cradle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/newton_cradle.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/newton_cradle.rsi/inhand-right.png new file mode 100644 index 0000000000..23dfd5d2ea Binary files /dev/null and b/Resources/Textures/Objects/Fun/newton_cradle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/newton_cradle.rsi/meta.json b/Resources/Textures/Objects/Fun/newton_cradle.rsi/meta.json index 0ff9e80425..b92514703a 100644 --- a/Resources/Textures/Objects/Fun/newton_cradle.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/newton_cradle.rsi/meta.json @@ -1,25 +1,85 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/commit/aa7a7b3cee09b313705343a6859658b928a3da03", + "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/commit/aa7a7b3cee09b313705343a6859658b928a3da03, inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon-off" - }, - { - "name": "icon", - "delays": [ - [ - 0.3, - 0.1, - 0.3, - 0.1 + { + "name": "icon-off" + }, + { + "name": "icon", + "delays": [ + [ + 0.3, + 0.1, + 0.3, + 0.1 + ] ] - ] - } + }, + { + "name": "inhand-left", + "directions": 4, + "delays":[ + [ + 0.1, + 0.3, + 0.1, + 0.3 + ], + [ + 0.1, + 0.3, + 0.1, + 0.3 + ], + [ + 0.1, + 0.3, + 0.1, + 0.3 + ], + [ + 0.1, + 0.3, + 0.1, + 0.3 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.3, + 0.1, + 0.3 + ], + [ + 0.1, + 0.3, + 0.1, + 0.3 + ], + [ + 0.1, + 0.3, + 0.1, + 0.3 + ], + [ + 0.1, + 0.3, + 0.1, + 0.3 + ] + ] + } ] } diff --git a/Resources/Textures/Objects/Fun/pequeno.rsi/equipped-HELMET-body.png b/Resources/Textures/Objects/Fun/pequeno.rsi/equipped-HELMET-body.png new file mode 100644 index 0000000000..0dff7f0535 Binary files /dev/null and b/Resources/Textures/Objects/Fun/pequeno.rsi/equipped-HELMET-body.png differ diff --git a/Resources/Textures/Objects/Fun/pequeno.rsi/equipped-HELMET-vis.png b/Resources/Textures/Objects/Fun/pequeno.rsi/equipped-HELMET-vis.png new file mode 100644 index 0000000000..5cc26f4de9 Binary files /dev/null and b/Resources/Textures/Objects/Fun/pequeno.rsi/equipped-HELMET-vis.png differ diff --git a/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-left-body.png b/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-left-body.png new file mode 100644 index 0000000000..db68481440 Binary files /dev/null and b/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-left-body.png differ diff --git a/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-left-vis.png b/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-left-vis.png new file mode 100644 index 0000000000..db7fa0e8be Binary files /dev/null and b/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-left-vis.png differ diff --git a/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-right-body.png b/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-right-body.png new file mode 100644 index 0000000000..520171f621 Binary files /dev/null and b/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-right-body.png differ diff --git a/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-right-vis.png b/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-right-vis.png new file mode 100644 index 0000000000..d1f9c4a279 Binary files /dev/null and b/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-right-vis.png differ diff --git a/Resources/Textures/Objects/Fun/pequeno.rsi/meta.json b/Resources/Textures/Objects/Fun/pequeno.rsi/meta.json index 7559d254d0..09b795e539 100644 --- a/Resources/Textures/Objects/Fun/pequeno.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/pequeno.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from shiptest at https://github.com/shiptest-ss13/Shiptest/commit/6e13b1f051512b16a2d7b75694b6cd36c7f5efbd, Among Us IP used with respect to policy at https://www.innersloth.com/fan-creation-policy/", + "copyright": "Taken from shiptest at https://github.com/shiptest-ss13/Shiptest/commit/6e13b1f051512b16a2d7b75694b6cd36c7f5efbd, Among Us IP used with respect to policy at https://www.innersloth.com/fan-creation-policy/, inhand and helmet sprites by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -12,6 +12,30 @@ }, { "name": "visor" + }, + { + "name": "equipped-HELMET-body", + "directions": 4 + }, + { + "name": "equipped-HELMET-vis", + "directions": 4 + }, + { + "name": "inhand-left-body", + "directions": 4 + }, + { + "name": "inhand-left-vis", + "directions": 4 + }, + { + "name": "inhand-right-body", + "directions": 4 + }, + { + "name": "inhand-right-vis", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Fun/rubber_chicken.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/rubber_chicken.rsi/inhand-left.png new file mode 100644 index 0000000000..d41be0a3b5 Binary files /dev/null and b/Resources/Textures/Objects/Fun/rubber_chicken.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/rubber_chicken.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/rubber_chicken.rsi/inhand-right.png new file mode 100644 index 0000000000..c2de8ad12c Binary files /dev/null and b/Resources/Textures/Objects/Fun/rubber_chicken.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/rubber_chicken.rsi/meta.json b/Resources/Textures/Objects/Fun/rubber_chicken.rsi/meta.json index 2b9f6ab0c4..54d3a2ea0c 100644 --- a/Resources/Textures/Objects/Fun/rubber_chicken.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/rubber_chicken.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Sprite by xprospero", + "copyright": "Sprite by xprospero, inhands by TiniestShark (github)", "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/Fun/toy_ian.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/toy_ian.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..7d38c22e88 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_ian.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Fun/toy_ian.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/toy_ian.rsi/inhand-left.png new file mode 100644 index 0000000000..aeb7cc70a3 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_ian.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/toy_ian.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/toy_ian.rsi/inhand-right.png new file mode 100644 index 0000000000..a91a28080b Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_ian.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/toy_ian.rsi/meta.json b/Resources/Textures/Objects/Fun/toy_ian.rsi/meta.json index e5ddb0f4d7..cd301be6be 100644 --- a/Resources/Textures/Objects/Fun/toy_ian.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toy_ian.rsi/meta.json @@ -9,6 +9,18 @@ "states": [ { "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Fun/toy_mouse.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/toy_mouse.rsi/inhand-left.png new file mode 100644 index 0000000000..08499359cc Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_mouse.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/toy_mouse.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/toy_mouse.rsi/inhand-right.png new file mode 100644 index 0000000000..8b547cd0fa Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_mouse.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/toy_mouse.rsi/meta.json b/Resources/Textures/Objects/Fun/toy_mouse.rsi/meta.json index f917441a32..1871ac4942 100644 --- a/Resources/Textures/Objects/Fun/toy_mouse.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toy_mouse.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github)", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), inhands resprited from Mouse inhands by TiniestShark", "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/Fun/toy_nuke.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/toy_nuke.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..2de0b5c5ce Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_nuke.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Fun/toy_nuke.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/toy_nuke.rsi/inhand-left.png new file mode 100644 index 0000000000..7266a1a86d Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_nuke.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/toy_nuke.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/toy_nuke.rsi/inhand-right.png new file mode 100644 index 0000000000..2ae111a3aa Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_nuke.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/toy_nuke.rsi/meta.json b/Resources/Textures/Objects/Fun/toy_nuke.rsi/meta.json index f61272b0d3..4ea3d80c1d 100644 --- a/Resources/Textures/Objects/Fun/toy_nuke.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toy_nuke.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-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, inhand and helmet sprites by TiniestShark (Github)", "size": { "x": 32, "y": 32 @@ -15,6 +15,18 @@ 0.2 ] ] + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Fun/toy_singularity.rsi/icon.png b/Resources/Textures/Objects/Fun/toy_singularity.rsi/icon.png index b609db734f..4472021307 100644 Binary files a/Resources/Textures/Objects/Fun/toy_singularity.rsi/icon.png and b/Resources/Textures/Objects/Fun/toy_singularity.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/toy_singularity.rsi/meta.json b/Resources/Textures/Objects/Fun/toy_singularity.rsi/meta.json index 6f1abc4d4f..dcec3a58a3 100644 --- a/Resources/Textures/Objects/Fun/toy_singularity.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toy_singularity.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-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, inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -18,10 +18,77 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] + }, + { + "name": "singu-inhand-left", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "singu-inhand-right", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] } ] } diff --git a/Resources/Textures/Objects/Fun/toy_singularity.rsi/singu-inhand-left.png b/Resources/Textures/Objects/Fun/toy_singularity.rsi/singu-inhand-left.png new file mode 100644 index 0000000000..951fccd0bb Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_singularity.rsi/singu-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/toy_singularity.rsi/singu-inhand-right.png b/Resources/Textures/Objects/Fun/toy_singularity.rsi/singu-inhand-right.png new file mode 100644 index 0000000000..4314aeb336 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_singularity.rsi/singu-inhand-right.png differ diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json index 74b0fa0da2..b229184c2a 100644 --- a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/Lights/lampgreen.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, inhand sprites by TiniestShark (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-left.png b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-left.png index e936ee2214..9dc387afca 100644 Binary files a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-left.png and b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-right.png b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-right.png index 2aa9a84475..bd41d68df9 100644 Binary files a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-right.png and b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-left.png b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-left.png index 22c2c62be5..02153a45dc 100644 Binary files a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-left.png and b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-right.png b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-right.png index 71d3696007..b70a213869 100644 Binary files a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-right.png and b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/meta.json index 029bc54b5a..d818915f87 100644 --- a/Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/meta.json +++ b/Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "taken from tgstation https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/weapons/guns/projectiles.dmi", + "copyright": "taken from tgstation https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/weapons/guns/projectiles.dmi, inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -25,6 +25,66 @@ 0.08 ] ] - } + }, + { + "name": "tesla-inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "tesla-inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/tesla-inhand-left.png b/Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/tesla-inhand-left.png new file mode 100644 index 0000000000..3e8260ea59 Binary files /dev/null and b/Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/tesla-inhand-left.png differ diff --git a/Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/tesla-inhand-right.png b/Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/tesla-inhand-right.png new file mode 100644 index 0000000000..b70f15e2bd Binary files /dev/null and b/Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/tesla-inhand-right.png differ