diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/toys.yml index 0f5331fa020..32b897a200a 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/toys.yml @@ -678,14 +678,6 @@ - type: Sprite state: plushie-nara sprite: _Sunrise/Objects/Fun/toys.rsi - - type: EmitSoundOnUse - sound: - path: /Audio/_Sunrise/papich_naaa.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/_Sunrise/papich_naaa.ogg - - type: UseDelay - delay: 20.0 - type: entity parent: BasePlushie @@ -696,11 +688,36 @@ - type: Sprite state: plushie-peacemaker sprite: _Sunrise/Objects/Fun/toys.rsi - - type: EmitSoundOnUse - sound: - path: /Audio/_Sunrise/vizhu_pidorasa.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/_Sunrise/vizhu_pidorasa.ogg - - type: UseDelay - delay: 20.0 + +- type: entity + parent: [ EmitVulpGrowl, BasePlushie ] + id: PlushieLu + name: Плюшевый Лу'Сайм + description: Вы думаете, это вульпа-химик - женщина? Думайте так дальше... Иногда фыркает + components: + - type: Sprite + state: plushie-lu + sprite: _Sunrise/Objects/Fun/toys.rsi + +- type: entity + parent: BasePlushie + id: PlushieAgata + name: Плюшеывый агент Агата Кацухиро + description: Эта плюшка была сделана на планетарной тюрьме, осуждёнными агентами Синдиката. Носи её с гордостью, корпорат + components: + - type: Sprite + state: plushie-agata + sprite: _Sunrise/Objects/Fun/toys.rsi + +- type: entity + parent: BasePlushie + id: PlushieMilosTanka + name: Плюшевый Милос-Танака + description: Унати в форме Центрального Командования, что он может в себе скрывать кроме двух ножей и револьвера? + components: + - type: Sprite + sprite: _Sunrise/Objects/Fun/toys.rsi + layers: + - state: plushie-milos-tan + - state: syndie-visor + shader: unshaded diff --git a/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/meta.json index f0bade1b61b..b49a85b7923 100644 --- a/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/meta.json @@ -188,6 +188,28 @@ }, { "name": "plushie-peacemaker" + }, + { + "name": "plushie-lu" + }, + { + "name": "plushie-agata" + }, + { + "name": "plushie-milos-tan" + }, + { + "name": "syndie-visor", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] } ] } diff --git a/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/plushie-agata.png b/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/plushie-agata.png new file mode 100644 index 00000000000..7456b6988f6 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/plushie-agata.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/plushie-lu.png b/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/plushie-lu.png new file mode 100644 index 00000000000..7778b80db56 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/plushie-lu.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/plushie-milos-tan.png b/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/plushie-milos-tan.png new file mode 100644 index 00000000000..575eed05328 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/plushie-milos-tan.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/syndie-visor.png b/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/syndie-visor.png new file mode 100644 index 00000000000..ef95bbd57ec Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/syndie-visor.png differ