diff --git a/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl b/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl index f6a06c81215..e33e14bc0b9 100644 --- a/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl +++ b/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl @@ -34,4 +34,7 @@ ent-ADTPlushieKoff = плюшевая Ксения .desc = Милая плюшевая игрушка одетая в костюм бармена. Ее причудливый котелок на голове добавляет ей особый шарм. ent-ADTPlushieUrs = плюшевый Урс - .desc = Милая плюшевая игрушка Урса. \ No newline at end of file + .desc = Милая плюшевая игрушка Урса. + +ent-ADTPlushiePochita = плюшевая Почита + .desc = Плюшевая игрушка-собака с торчащим из головы лезвием бензопилы. \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml index cec5150dedf..92bbedd18ef 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml @@ -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. @@ -596,8 +613,6 @@ sound: path: /Audio/Effects/unwrap.ogg - - - type: entity parent: BaseItem id: toyC4 @@ -629,4 +644,4 @@ types: Blunt: 0 - type: UseDelay - delay: 28 + delay: 28 \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json index 9ff22d2188b..ff2bb719e46 100644 --- a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json @@ -170,6 +170,17 @@ }, { "name": "rainbowcarpplush" + }, + { + "name": "plushie_pochita" + }, + { + "name": "pochita-inhand-right", + "directions": 4 + }, + { + "name": "pochita-inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_pochita.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_pochita.png new file mode 100644 index 00000000000..487087aad78 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_pochita.png differ diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/pochita-inhand-left.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/pochita-inhand-left.png new file mode 100644 index 00000000000..41169d0ec50 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Fun/toys.rsi/pochita-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/pochita-inhand-right.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/pochita-inhand-right.png new file mode 100644 index 00000000000..2274418ad8c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Fun/toys.rsi/pochita-inhand-right.png differ diff --git a/global.json b/global.json index b4262a6109a..2114078f500 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.x", + "version": "8.0.203", "rollForward": "disable" } }