]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Toy/Plushie Inhands and Wearables (#38514)
authorTiniest Shark <head.rebel@yahoo.com>
Fri, 27 Jun 2025 01:07:29 +0000 (21:07 -0400)
committerGitHub <noreply@github.com>
Fri, 27 Jun 2025 01:07:29 +0000 (18:07 -0700)
123 files changed:
Resources/Prototypes/Entities/Objects/Fun/mech_figurines.yml
Resources/Prototypes/Entities/Objects/Fun/plushies.yml
Resources/Prototypes/Entities/Objects/Fun/toys.yml
Resources/Textures/Mobs/Ghosts/ghost_human.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Mobs/Ghosts/ghost_human.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Mobs/Ghosts/ghost_human.rsi/meta.json
Resources/Textures/Mobs/Ghosts/revenant.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Mobs/Ghosts/revenant.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Mobs/Ghosts/revenant.rsi/meta.json
Resources/Textures/Objects/Fun/AI.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/AI.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/AI.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/AI.rsi/meta.json
Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/meta.json
Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/meta.json
Resources/Textures/Objects/Fun/Plushies/diona.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/diona.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/diona.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/diona.rsi/meta.json
Resources/Textures/Objects/Fun/Plushies/hampter.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/hampter.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/hampter.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/hampter.rsi/meta.json
Resources/Textures/Objects/Fun/Plushies/human.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/human.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/human.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/human.rsi/meta.json
Resources/Textures/Objects/Fun/Plushies/lamp.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/lamp.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/lamp.rsi/meta.json
Resources/Textures/Objects/Fun/Plushies/moth.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/moth.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/moth.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/moth.rsi/meta.json
Resources/Textures/Objects/Fun/Plushies/narsie.rsi/equipped-NECK.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/narsie.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/narsie.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/narsie.rsi/meta.json
Resources/Textures/Objects/Fun/Plushies/nukie.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/nukie.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/nukie.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/nukie.rsi/meta.json
Resources/Textures/Objects/Fun/Plushies/penguin.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/penguin.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/penguin.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/penguin.rsi/meta.json
Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/equipped-NECK.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/meta.json
Resources/Textures/Objects/Fun/Plushies/rouny.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/rouny.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/rouny.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/rouny.rsi/meta.json
Resources/Textures/Objects/Fun/Plushies/slime.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/slime.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/slime.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/slime.rsi/meta.json
Resources/Textures/Objects/Fun/Plushies/snake.rsi/equipped-NECK-vox.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/snake.rsi/meta.json
Resources/Textures/Objects/Fun/Plushies/vox.rsi/equipped-HELMET-vox.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/vox.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/vox.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/vox.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/vox.rsi/meta.json
Resources/Textures/Objects/Fun/Plushies/xeno.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/xeno.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/xeno.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Plushies/xeno.rsi/meta.json
Resources/Textures/Objects/Fun/clownrecorder.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/clownrecorder.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/clownrecorder.rsi/meta.json
Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-base.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-body.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-trim.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-visor.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-base.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-body.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-trim.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-visor.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/mech_figurines.rsi/meta.json
Resources/Textures/Objects/Fun/newton_cradle.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/newton_cradle.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/newton_cradle.rsi/meta.json
Resources/Textures/Objects/Fun/pequeno.rsi/equipped-HELMET-body.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/pequeno.rsi/equipped-HELMET-vis.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/pequeno.rsi/inhand-left-body.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/pequeno.rsi/inhand-left-vis.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/pequeno.rsi/inhand-right-body.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/pequeno.rsi/inhand-right-vis.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/pequeno.rsi/meta.json
Resources/Textures/Objects/Fun/rubber_chicken.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/rubber_chicken.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/rubber_chicken.rsi/meta.json
Resources/Textures/Objects/Fun/toy_ian.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/toy_ian.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/toy_ian.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/toy_ian.rsi/meta.json
Resources/Textures/Objects/Fun/toy_mouse.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/toy_mouse.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/toy_mouse.rsi/meta.json
Resources/Textures/Objects/Fun/toy_nuke.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/toy_nuke.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/toy_nuke.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/toy_nuke.rsi/meta.json
Resources/Textures/Objects/Fun/toy_singularity.rsi/icon.png
Resources/Textures/Objects/Fun/toy_singularity.rsi/meta.json
Resources/Textures/Objects/Fun/toy_singularity.rsi/singu-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/toy_singularity.rsi/singu-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json
Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-left.png
Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-right.png
Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-left.png
Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-right.png
Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/meta.json
Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/tesla-inhand-left.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/tesla-inhand-right.png [new file with mode: 0644]

index 7cc6aaaeaf8c30929e71573eaeb832b17ca9eff0..f04fa19a040bce8013049eb5679a34bb8ceae3b8 100644 (file)
@@ -17,7 +17,7 @@
   - type: Tag
     tags:
     - Figurine
-    
+
 #Ripley APLU
 - type: entity
   parent: BaseFigurineMech
   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
   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
   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
   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
   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
   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
   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
   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
   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
   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
   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
   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"
index f29841ea08d915e0dc1d59567de0205dda3165f2..f0ab2931c0dc581a175abe06a6cc880144f0d01e 100644 (file)
     noRot: true
   - type: Item
     size: Normal
+  - type: MultiHandedItem
   - type: Construction
     graph: PlushieGhostRevenant
     node: plushie
     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
   - 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
     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
     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
         - 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
   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
   - 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
   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
   - 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
     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
     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
   - 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
     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
   - 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
   - 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
     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
index 495d044f010a1a34a2a8f8e9c888176737811031..4daffe1c560a855f5d323c1402a009cc4cea46a2 100644 (file)
   - 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
   - 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
   - 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
     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
     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
     - 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 (file)
index 0000000..c29cb7c
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 (file)
index 0000000..363b460
Binary files /dev/null and b/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/inhand-right.png differ
index e7b01df53d563f96324246343e77eaa90e6eb511..a465e90b6cfe90d8a821692ba00e300824824a3a 100644 (file)
@@ -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 (file)
index 0000000..f7fe8a1
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 (file)
index 0000000..f7fe8a1
Binary files /dev/null and b/Resources/Textures/Mobs/Ghosts/revenant.rsi/inhand-right.png differ
index 5a430a2a379565e22605a0983309d8025c20b298..b5d8bc70868884b603ed18320cbc292fbd004d79 100644 (file)
@@ -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
           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 (file)
index 0000000..a393a02
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 (file)
index 0000000..b81fb4c
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 (file)
index 0000000..3b91539
Binary files /dev/null and b/Resources/Textures/Objects/Fun/AI.rsi/inhand-right.png differ
index e5ddb0f4d7543ddf00a9727ec5f71623cc276ec1..5312d061afd5f1e5b4900ad0ab1e7edff511fee0 100644 (file)
@@ -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 (file)
index 0000000..885e848
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 (file)
index 0000000..1f13d52
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 (file)
index 0000000..73ca020
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/inhand-right.png differ
index c26c4da7cec76f78585395b3a3654ec100b86695..cbd97acd20933701506e26c1902e5b3fc2118c59 100644 (file)
@@ -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 (file)
index 0000000..9dfdff7
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 (file)
index 0000000..903b2e6
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 (file)
index 0000000..bc17747
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/inhand-right.png differ
index e5ddb0f4d7543ddf00a9727ec5f71623cc276ec1..5312d061afd5f1e5b4900ad0ab1e7edff511fee0 100644 (file)
@@ -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 (file)
index 0000000..9caf992
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 (file)
index 0000000..1aff8b0
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 (file)
index 0000000..015a920
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/diona.rsi/inhand-right.png differ
index 3843fed26f187cf9f6c4f3fbd54b1aa5ad4679da..4fabeaa69f9d20561f1b7989d4591db75b38c98e 100644 (file)
@@ -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
         },
         {
             "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 (file)
index 0000000..23a8f6b
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 (file)
index 0000000..cf51e5b
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 (file)
index 0000000..7f5f6d4
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/inhand-right.png differ
index ddeb50c7444f7f2b97c76f185e122878ccd2a12c..0f99a998c346290cf35da2a1ff723e88f578fae7 100644 (file)
@@ -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 (file)
index 0000000..944db83
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 (file)
index 0000000..3ad686c
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 (file)
index 0000000..e08a997
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/human.rsi/inhand-right.png differ
index 23d0f71a20ab41d317d82c8b97c4325b5eb19d1f..ad2be4bd4002750ea297ba9a6c15f3e88d9f014a 100644 (file)
@@ -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 (file)
index 0000000..02153a4
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 (file)
index 0000000..b70a213
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/inhand-right.png differ
index e5ddb0f4d7543ddf00a9727ec5f71623cc276ec1..04454077ab32d6fe63ea706199c1be370d1673e4 100644 (file)
@@ -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 (file)
index 0000000..9e3cb9e
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 (file)
index 0000000..04de645
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 (file)
index 0000000..d84670d
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/moth.rsi/inhand-right.png differ
index e5ddb0f4d7543ddf00a9727ec5f71623cc276ec1..5312d061afd5f1e5b4900ad0ab1e7edff511fee0 100644 (file)
@@ -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 (file)
index 0000000..f9ae44c
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 (file)
index 0000000..8374c6d
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 (file)
index 0000000..8374c6d
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/inhand-right.png differ
index e5ddb0f4d7543ddf00a9727ec5f71623cc276ec1..2962536bcef2c79656d3ce3324b0c139301e13c8 100644 (file)
@@ -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 (file)
index 0000000..87a57d0
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 (file)
index 0000000..90220ea
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 (file)
index 0000000..0b69f7b
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/inhand-right.png differ
index e5ddb0f4d7543ddf00a9727ec5f71623cc276ec1..5312d061afd5f1e5b4900ad0ab1e7edff511fee0 100644 (file)
@@ -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 (file)
index 0000000..e8c7767
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 (file)
index 0000000..d5e7743
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 (file)
index 0000000..b929a97
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/inhand-right.png differ
index 95024a5e4a5f7fac42e5cf58cb49da9c6ae6aebd..83191c2a0bfcdd83907e633c0ab53b03edcb2604 100644 (file)
@@ -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 (file)
index 0000000..f9349a9
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 (file)
index 0000000..64530fd
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 (file)
index 0000000..64530fd
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/inhand-right.png differ
index e5ddb0f4d7543ddf00a9727ec5f71623cc276ec1..2962536bcef2c79656d3ce3324b0c139301e13c8 100644 (file)
@@ -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 (file)
index 0000000..1bf687b
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 (file)
index 0000000..c37131b
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 (file)
index 0000000..bdd8b85
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/inhand-right.png differ
index 5be34bc59160d10efa6e52be881b2ba305f2cb5c..e4d7938e5e6ffb569cb02a138b12bb48078ca353 100644 (file)
@@ -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
         {
             "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 (file)
index 0000000..c218e0d
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 (file)
index 0000000..1e30789
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 (file)
index 0000000..43d30e2
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/slime.rsi/inhand-right.png differ
index e5ddb0f4d7543ddf00a9727ec5f71623cc276ec1..5312d061afd5f1e5b4900ad0ab1e7edff511fee0 100644 (file)
@@ -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 (file)
index 0000000..b80dd1b
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/snake.rsi/equipped-NECK-vox.png differ
index 2db39210895d5c1feca2702f237ea76b05099727..412a5030897b940b08a4f506eb7276fd223b2671 100644 (file)
         {
             "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 (file)
index 0000000..69ffbd6
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 (file)
index 0000000..0642b4e
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 (file)
index 0000000..be3707c
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 (file)
index 0000000..3143c99
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/inhand-right.png differ
index e36a30b20059e8b46a590832c8644eff8b21952f..9ed84dc98b2fe7dd9e77747bff16ad5afd247042 100644 (file)
@@ -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 (file)
index 0000000..c60ace3
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 (file)
index 0000000..a25259b
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 (file)
index 0000000..ded904d
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/inhand-right.png differ
index e36a30b20059e8b46a590832c8644eff8b21952f..bd583cd1ab3f0c38ae065a450803d5cb1b3bf6ec 100644 (file)
@@ -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 (file)
index 0000000..1900726
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 (file)
index 0000000..836570c
Binary files /dev/null and b/Resources/Textures/Objects/Fun/clownrecorder.rsi/inhand-right.png differ
index 84dd1f0fa30823b68328b29b6df6bb0886ddb649..9095fe2338b1b72efc350b691fb64d1045e24387 100644 (file)
@@ -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 (file)
index 0000000..32497b5
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 (file)
index 0000000..52215ce
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 (file)
index 0000000..8aaacb9
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 (file)
index 0000000..a08b69e
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 (file)
index 0000000..c34bca9
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 (file)
index 0000000..c10267e
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 (file)
index 0000000..8288a86
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 (file)
index 0000000..b7241f5
Binary files /dev/null and b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-visor.png differ
index f92464abc6495cd8a94cdca808cc95541a5b7198..99a92db0052676ebe77e8cb1c5e56bc8dc58c545 100644 (file)
@@ -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 (file)
index 0000000..29c03cb
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 (file)
index 0000000..23dfd5d
Binary files /dev/null and b/Resources/Textures/Objects/Fun/newton_cradle.rsi/inhand-right.png differ
index 0ff9e80425f931bd828d7e4de250a977e67a4b64..b92514703a03e81e009f287f2e98d49384b2efc4 100644 (file)
@@ -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 (file)
index 0000000..0dff7f0
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 (file)
index 0000000..5cc26f4
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 (file)
index 0000000..db68481
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 (file)
index 0000000..db7fa0e
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 (file)
index 0000000..520171f
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 (file)
index 0000000..d1f9c4a
Binary files /dev/null and b/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-right-vis.png differ
index 7559d254d05f39c5fadb830ebe29e2337efbda54..09b795e539850b57787d0bda8b8dc2a3895e2d56 100644 (file)
@@ -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
         },
         {
             "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 (file)
index 0000000..d41be0a
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 (file)
index 0000000..c2de8ad
Binary files /dev/null and b/Resources/Textures/Objects/Fun/rubber_chicken.rsi/inhand-right.png differ
index 2b9f6ab0c44ef74be0b3724e6924fc140e9f01a9..54d3a2ea0c7e4eda13652270f7cf484e45232a4b 100644 (file)
@@ -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 (file)
index 0000000..7d38c22
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 (file)
index 0000000..aeb7cc7
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 (file)
index 0000000..a91a280
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_ian.rsi/inhand-right.png differ
index e5ddb0f4d7543ddf00a9727ec5f71623cc276ec1..cd301be6be8ae0fd96514e941ff563e3a00e152f 100644 (file)
@@ -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 (file)
index 0000000..0849935
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 (file)
index 0000000..8b547cd
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_mouse.rsi/inhand-right.png differ
index f917441a322de40f813ca967f74dd80cdb3506cd..1871ac4942f9d09c41b56cf35080d46d792efb9b 100644 (file)
@@ -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
         {
             "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 (file)
index 0000000..2de0b5c
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 (file)
index 0000000..7266a1a
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 (file)
index 0000000..2ae111a
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_nuke.rsi/inhand-right.png differ
index f61272b0d366235db68c86ccae0a8232819756c5..4ea3d80c1d6bae31960a580f83b108d24bbe5e22 100644 (file)
@@ -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
                     0.2
                 ]
             ]
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
index b609db734fd6eb9dc0689b1da1453017589829a9..4472021307df88a88e5367865c88e9848d8f1c1d 100644 (file)
Binary files a/Resources/Textures/Objects/Fun/toy_singularity.rsi/icon.png and b/Resources/Textures/Objects/Fun/toy_singularity.rsi/icon.png differ
index 6f1abc4d4f45ba2aec337035e3dce0f0d5434915..dcec3a58a3677d532447eb9628446f5af4e3146b 100644 (file)
@@ -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
                     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 (file)
index 0000000..951fccd
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 (file)
index 0000000..4314aeb
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_singularity.rsi/singu-inhand-right.png differ
index 74b0fa0da213efb01b35169bbac399a8a655487c..b229184c2a9d0f034abb8338275b7a10c9ba05b6 100644 (file)
@@ -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
index e936ee22141daaa8b302e7dc1fb4a852b0ae8007..9dc387afcafe65422a8fded7e3a638486b279400 100644 (file)
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
index 2aa9a84475fced4e33a0cc261e9a2dbc7314b6af..bd41d68df9f52b83468b65363ceacf634caea575 100644 (file)
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
index 22c2c62be5cd849ea6ccb93d4a8a46bc5599347d..02153a45dc235bb7f8f5d3090a70e5e9a4998f62 100644 (file)
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
index 71d3696007f1bb5e891a616d4d823b55ac02d53a..b70a213869049a6b73db27cd739545369439b020 100644 (file)
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
index 029bc54b5a1c31dafe5725a7aff42f4e8e8f360d..d818915f87231c6238c65adb9654c7b823144a24 100644 (file)
@@ -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
           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 (file)
index 0000000..3e8260e
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 (file)
index 0000000..b70f15e
Binary files /dev/null and b/Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/tesla-inhand-right.png differ