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

New plushie #748

Merged
merged 3 commits into from
Jun 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
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
5 changes: 4 additions & 1 deletion Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,7 @@ ent-ADTPlushieKoff = плюшевая Ксения
.desc = Милая плюшевая игрушка одетая в костюм бармена. Ее причудливый котелок на голове добавляет ей особый шарм.

ent-ADTPlushieUrs = плюшевый Урс
.desc = Милая плюшевая игрушка Урса.
.desc = Милая плюшевая игрушка Урса.

ent-ADTPlushiePochita = плюшевая Почита
.desc = Плюшевая игрушка-собака с торчащим из головы лезвием бензопилы.
21 changes: 18 additions & 3 deletions Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,23 @@
sprite: ADT/Objects/Fun/toys.rsi
state: plusie_mio

- type: entity
parent: BasePlushie
id: ADTPlushiePochita
name: Plush pochita
description: A plush dog toy with a chainsaw blade sticking out of its head
components:
- type: Sprite
sprite: ADT/Objects/Fun/toys.rsi
state: plushie_pochita
- type: Item
sprite: ADT/Objects/Fun/toys.rsi
inhandVisuals:
left:
- state: pochita-inhand-left
right:
- state: pochita-inhand-right

- type: entity
name: Suspicious gift
description: A gift of suspicious appearance. A barely audible beeping sound comes from it.
Expand All @@ -596,8 +613,6 @@
sound:
path: /Audio/Effects/unwrap.ogg



- type: entity
parent: BaseItem
id: toyC4
Expand Down Expand Up @@ -629,4 +644,4 @@
types:
Blunt: 0
- type: UseDelay
delay: 28
delay: 28
11 changes: 11 additions & 0 deletions Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,17 @@
},
{
"name": "rainbowcarpplush"
},
{
"name": "plushie_pochita"
},
{
"name": "pochita-inhand-right",
"directions": 4
},
{
"name": "pochita-inhand-left",
"directions": 4
}
]
}
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.
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.x",
"version": "8.0.203",
"rollForward": "disable"
}
}
Loading