diff --git a/Resources/Audio/_Sunrise/vizhu_pidorasa.ogg b/Resources/Audio/_Sunrise/vizhu_pidorasa.ogg new file mode 100644 index 00000000000..1a320b6d3c5 Binary files /dev/null and b/Resources/Audio/_Sunrise/vizhu_pidorasa.ogg differ diff --git a/Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml index b3a9fd26b28..ce45ab9398f 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml @@ -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: UplinkSunrisePlushiePeacemaker + productEntity: PlushiePeacemaker + cost: + Suntick: 4 + categories: + - SpecialThings + conditions: + - !type:ListingLimitedStockCondition + stock: 1 + # ГСБ: - type: listing id: UplinkSunriseClothingMaskGasSwat diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/toys.yml index 842c0b54a18..0f5331fa020 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/toys.yml @@ -683,4 +683,24 @@ path: /Audio/_Sunrise/papich_naaa.ogg - type: EmitSoundOnTrigger sound: - path: /Audio/_Sunrise/papich_naaa.ogg \ No newline at end of file + path: /Audio/_Sunrise/papich_naaa.ogg + - type: UseDelay + delay: 20.0 + +- type: entity + parent: BasePlushie + id: PlushiePeacemaker + name: Миротворец + description: Там где он, там мир, но там где война, там он несëт смерть. + components: + - 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 diff --git a/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/meta.json index 003a6e44f7c..f0bade1b61b 100644 --- a/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/meta.json @@ -185,6 +185,9 @@ }, { "name": "plushie-nara" + }, + { + "name": "plushie-peacemaker" } ] } diff --git a/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/plushie-peacemaker.png b/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/plushie-peacemaker.png new file mode 100644 index 00000000000..726a350e4fc Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/plushie-peacemaker.png differ