Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove plushie_lizard_mirrored.png #33855

Merged
merged 5 commits into from
Dec 19, 2024
Merged

Remove plushie_lizard_mirrored.png #33855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8360a4c
Remove plushie_lizard_mirrored.png
Dec 14, 2024
199f622
Remove from meta.json
Dec 14, 2024
ab0f5dd
Merge and conflict resolution
Dec 19, 2024
36a3f3f
Replace mirrored state from yml
Dec 19, 2024
b37c71b
Merge branch 'space-wizards:master' into cleanup/plush-mirrored
LevitatingTree Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Resources/Prototypes/Entities/Objects/Fun/toys.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,8 @@
- type: Item
size: Small
- type: Sprite
state: plushie_lizard_mirrored
state: plushie_lizard
scale: -1, 1

- type: entity
parent: BasePlushie
Expand Down
3 changes: 0 additions & 3 deletions Resources/Textures/Objects/Fun/toys.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,6 @@
{
"name": "plushie_arachnid"
},
{
"name": "plushie_lizard_mirrored"
},
{
"name": "plushie_lizard_inversed"
},
Expand Down
Binary file removed Resources/Textures/Objects/Fun/toys.rsi/plushie_lizard_mirrored.png
View file
Open in desktop
Binary file not shown.
Loading