Skip to content

Commit

Permalink
Merge pull request #262 from 1Altius/Toys
Browse files Browse the repository at this point in the history
Игрушки.
  • Loading branch information
Schrodinger71 authored Dec 31, 2023
2 parents 1d83fda + ccc31d9 commit e7cf270
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 28 deletions.
12 changes: 11 additions & 1 deletion Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,14 @@ ent-ADTCrateFunAdminPlushie = Ящик милых плюшевых игруше
ent-ADTPlushieMiniPinkShark = розовый акулёнок
.desc = Ныне старая игрушка, вдохнувшая в себя новую жизнь, выглядит тщательно ухоженной и выстиранной. На игрушке можно увидеть бирку с надписью "Моя удача будет с тобой, Тимри.К.".
.suffix = Именная, Клавед
.suffix = Именная, Клавед
ent-ADTPlushieJungar = плюшевый Джунгарик
.desc = Джунгарский плюшевый хомячок, маленький, пушистый и пузатенький! В его крохотных лапках виднеется кусочек сыра, который пахнет как сырные шарики. На его мордочке застыло выражение удивления. Этикетка, висящая у него под ножкой, имеет надпись: "Джунга-джунга, джунгарёк, принеси-ка мне сырок!".
ent-ADTPlushieMigel = плюшевый Мигель
.desc = Плюшевый Мига, Мигеля, Мигелюшка. О-о да, этот загорелый парень будто сошёл с обложки всеми любимого приключенческого сай-фай фильма. Он красив, смел, харизматичен и добр. Верность друзьям и жажда справедливости – два главных его имени. А также "Мать вашу, как это работает?" и "Господи, прошу, дай мне сил.."
ent-ADTPlushieTeo = плюшевый Тео
.desc = Он мрачен, как грозовая туча.
81 changes: 55 additions & 26 deletions Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
10 changes: 9 additions & 1 deletion Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,15 @@
},
{
"name": "shark_inhand-right"
},
{
"name": "plushie_jungar"
},
{
"name": "plushie_migel"
},
{
"name": "plushie_teo"
}
]
}

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.

0 comments on commit e7cf270

Please sign in to comment.