Skip to content

Commit

Permalink
Fix rainbow lizard plushie inhands (space-wizards#34128)
Browse files Browse the repository at this point in the history
* fix rainbow plushie inhands

* address requested changes

* attribute sprites
  • Loading branch information
ArtisticRoomba authored Jan 5, 2025
1 parent 9532b61 commit 0639a49
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 1 deletion.
10 changes: 10 additions & 0 deletions Resources/Prototypes/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,8 @@
description: An adorable stuffed toy that resembles a lizardperson of every color. You just might trip while staring at it...
name: rainbow lizard plushie
components:
- type: Sprite
state: rainbowlizardplush
- type: PointLight
radius: 1.5
energy: 2
Expand All @@ -364,6 +366,14 @@
head:
- state: lizard-equipped-HELMET
shader: unshaded
- type: Item
inhandVisuals:
left:
- state: rainbowlizardplush-inhand-left
shader: unshaded
right:
- state: rainbowlizardplush-inhand-right
shader: unshaded

- type: entity
parent: PlushieLizard
Expand Down
13 changes: 12 additions & 1 deletion Resources/Textures/Objects/Fun/toys.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github), lizard hat sprite made by Cinder, rubber_chicken by xprospero, in-hand lizard plushie sprites by KieueCaprie, plushie_lizard_inversed and inhand sprites modified from plushie_lizard_mirrored and plushielizard-inhand-left, plushielizard-inhand-right by ArtisticRoomba",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github), lizard hat sprite made by Cinder, rubber_chicken by xprospero, in-hand lizard plushie sprites by KieueCaprie, plushie_lizard_inversed and inhand sprites modified from plushie_lizard_mirrored and plushielizard-inhand-left, plushielizard-inhand-right by ArtisticRoomba, rainbowcarplush and inhand sprites modified from carpplush and inhand sprites by ArtisticRoomba",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -76,6 +76,17 @@
"name": "rainbowcarpplush-inhand-right",
"directions": 4
},
{
"name": "rainbowlizardplush"
},
{
"name": "rainbowlizardplush-inhand-left",
"directions": 4
},
{
"name": "rainbowlizardplush-inhand-right",
"directions": 4
},
{
"name": "narplush"
},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0639a49

Please sign in to comment.