diff --git a/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl b/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl index 9a30771ab0a..0e1756c8fc6 100644 --- a/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl +++ b/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl @@ -10,4 +10,14 @@ ent-ADTCrateFunAdminPlushie = Ящик милых плюшевых игруше ent-ADTPlushieMiniPinkShark = розовый акулёнок .desc = Ныне старая игрушка, вдохнувшая в себя новую жизнь, выглядит тщательно ухоженной и выстиранной. На игрушке можно увидеть бирку с надписью "Моя удача будет с тобой, Тимри.К.". - .suffix = Именная, Клавед \ No newline at end of file + .suffix = Именная, Клавед + +ent-ADTPlushieJungar = плюшевый Джунгарик + .desc = Джунгарский плюшевый хомячок, маленький, пушистый и пузатенький! В его крохотных лапках виднеется кусочек сыра, который пахнет как сырные шарики. На его мордочке застыло выражение удивления. Этикетка, висящая у него под ножкой, имеет надпись: "Джунга-джунга, джунгарёк, принеси-ка мне сырок!". + +ent-ADTPlushieMigel = плюшевый Мигель + .desc = Плюшевый Мига, Мигеля, Мигелюшка. О-о да, этот загорелый парень будто сошёл с обложки всеми любимого приключенческого сай-фай фильма. Он красив, смел, харизматичен и добр. Верность друзьям и жажда справедливости – два главных его имени. А также "Мать вашу, как это работает?" и "Господи, прошу, дай мне сил.." + +ent-ADTPlushieTeo = плюшевый Тео + .desc = Он мрачен, как грозовая туча. + diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml index 0af956b3af5..23b11fc6889 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml @@ -83,7 +83,38 @@ heldPrefix: garbagerama - type: ItemCooldown - +- type: entity + parent: BasePlushie + id: ADTPlushieMiniPinkShark + name: mini shark plushie + description: A pretty old plushie, that got a refresh. Looks well-groomed and washed. There is a label on it that says "My luck will be always with you. Timri.K." + components: + - type: Sprite + sprite: ADT/Objects/Fun/toys.rsi + state: shark_mini_pink + - type: Item + size: Tiny + sprite: ADT/Objects/Fun/toys.rsi + heldPrefix: shark + - type: EmitSoundOnUse + sound: + path: /Audio/ADT/Items/Toys/soundshark.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/ADT/Items/Toys/soundshark.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/ADT/Items/Toys/soundshark.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/ADT/Items/Toys/soundshark.ogg + - type: MeleeWeapon + soundHit: + path: /Audio/ADT/Items/Toys/soundshark.ogg + damage: + types: + Blunt: 0 + - type: entity parent: BasePlushie id: ADTPlushieJessie @@ -446,32 +477,30 @@ - type: entity parent: BasePlushie - id: ADTPlushieMiniPinkShark - name: mini shark plushie - description: A pretty old plushie, that got a refresh. Looks well-groomed and washed. There is a label on it that says "My luck will be always with you. Timri.K." + id: ADTPlushieJungar + name: Djessie plushie + description: It looks like a soft and cute blondie. components: - type: Sprite sprite: ADT/Objects/Fun/toys.rsi - state: shark_mini_pink - - type: Item - size: Tiny + state: plushie_jungar + +- type: entity + parent: BasePlushie + id: ADTPlushieMigel + name: Djessie plushie + description: It looks like a soft and cute blondie. + components: + - type: Sprite sprite: ADT/Objects/Fun/toys.rsi - heldPrefix: shark - - type: EmitSoundOnUse - sound: - path: /Audio/ADT/Items/Toys/soundshark.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/ADT/Items/Toys/soundshark.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/ADT/Items/Toys/soundshark.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/ADT/Items/Toys/soundshark.ogg - - type: MeleeWeapon - soundHit: - path: /Audio/ADT/Items/Toys/soundshark.ogg - damage: - types: - Blunt: 0 + state: plushie_migel + +- type: entity + parent: BasePlushie + id: ADTPlushieTeo + name: Djessie plushie + description: It looks like a soft and cute blondie. + components: + - type: Sprite + sprite: ADT/Objects/Fun/toys.rsi + state: plushie_teo diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json index cadbe2ba7cf..027d286736f 100644 --- a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json @@ -123,7 +123,15 @@ }, { "name": "shark_inhand-right" + }, + { + "name": "plushie_jungar" + }, + { + "name": "plushie_migel" + }, + { + "name": "plushie_teo" } ] } - diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_jungar.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_jungar.png new file mode 100644 index 00000000000..40e3da9e377 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_jungar.png differ diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_migel.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_migel.png new file mode 100644 index 00000000000..271641b12a6 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_migel.png differ diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_teo.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_teo.png new file mode 100644 index 00000000000..5a109b02244 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_teo.png differ