add mirotvorec, fixed some stuff

добавил миротворца (попросили меня) добавил себя и кента в бебеплинк добавил кенту еще один звук дал кд на звуки 20 секунд
space-sunrise · Oct 11, 2024 · 22aa99c · 22aa99c
1 parent d3094b7
commit 22aa99c
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 1 deletion.
diff --git a/Resources/Audio/_Sunrise/vizhu_pidorasa.ogg b/Resources/Audio/_Sunrise/vizhu_pidorasa.ogg
diff --git 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: UplinkSunrisePlushieMirotvorec
+  productEntity: PlushieMirotvorec
+  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
@@ -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
+  id: PlushieMirotvorec
+  name: Миротворец
+  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
diff --git 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-mirotvorec"
         }
     ]
 }
diff --git a/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/plushie-mirotvorec.png b/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/plushie-mirotvorec.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -185,6 +185,9 @@ @@
             },
             {
                 "name": "plushie-nara"
+            },
+            {
+                "name": "plushie-mirotvorec"
             }
         ]
     }