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

add mirotvorec, fixed some stuff #490

Merged
merged 6 commits into from
Oct 11, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Binary file added Resources/Audio/_Sunrise/vizhu_pidorasa.ogg
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -1789,6 +1789,28 @@
- !type:ListingLimitedStockCondition
stock: 1

- type: listing
id: UplinkSunrisePlushieNara
productEntity: PlushieNara
cost:
Suntick: 4
categories:
- SpecialThings
conditions:
- !type:ListingLimitedStockCondition
stock: 1

- type: listing
id: UplinkSunrisePlushieMirotvorec

This comment was marked as resolved.

productEntity: PlushieMirotvorec

This comment was marked as resolved.

cost:
Suntick: 4
categories:
- SpecialThings
conditions:
- !type:ListingLimitedStockCondition
stock: 1

# ГСБ:
- type: listing
id: UplinkSunriseClothingMaskGasSwat
Expand Down
22 changes: 21 additions & 1 deletion Resources/Prototypes/_Sunrise/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -683,4 +683,24 @@
path: /Audio/_Sunrise/papich_naaa.ogg
- type: EmitSoundOnTrigger
sound:
path: /Audio/_Sunrise/papich_naaa.ogg
path: /Audio/_Sunrise/papich_naaa.ogg
- type: UseDelay
delay: 20.0

- type: entity
parent: BasePlushie

This comment was marked as resolved.

id: PlushieMirotvorec
name: Миротворец
Comment on lines +693 to +694
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

локализация в .yml ай-ай-ай. А фиксить кто будет? Отныне русские символы в прототипах караються. Локализацию делать только в Locale/ru-Ru по соответсвующим папкам/файлам, в твоем случае это
Locale/ru-RU/_prototypes/_sunrise/objects/fun/toys.ftl.

description: Там где он, там мир, но там где война, там он несëт смерть.
components:
- type: Sprite
state: plushie-mirotvorec
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
3 changes: 3 additions & 0 deletions Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/meta.json

This comment was marked as resolved.

Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,9 @@
},
{
"name": "plushie-nara"
},
{
"name": "plushie-mirotvorec"
}
]
}

This comment was marked as resolved.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading