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.

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

morty plushie :3 #2506

Merged
merged 11 commits into from
Dec 22, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
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 @@ -1663,3 +1663,13 @@
- type: PhysicalComposition
materialComposition:
Plastic: 25

- type: entity
parent: BasePlushie
id: PlushieMort
name: Morty plushie
description: A plushie of the lovely Morty. It's a resilient, yet sensitive type of plush.
components:
- type: Sprite
sprite: Objects/Fun/toys.rsi
state: mortplush
juniwoofs marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 3 additions & 0 deletions Resources/Textures/Objects/Fun/toys.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,9 @@
},
{
"name": "rubber_chicken"
},
{
"name": "mortplush"
juniwoofs marked this conversation as resolved.
Show resolved Hide resolved
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading