животные умеют прыгать, танцевать и делать сальто

space-sunrise · Dec 26, 2024 · 01bc225 · 01bc225
1 parent 39f1e14
commit 01bc225
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml
@@ -8858,3 +8858,13 @@
   id: 618
   time: '2024-12-26T21:41:40.0000000+00:00'
   url: https://github.com/space-sunrise/space-station-14/pull/937
+- author: VigersRay
+  changes:
+  - message: "\u0413\u0430\u043C\u043B\u0435\u0442 \u0438 \u043F\u0440\u043E\u0447\
+      \u0438\u0435 \u0436\u0438\u0432\u043E\u0442\u043D\u044B\u0435 \u043D\u0430\u0443\
+      \u0447\u0438\u043B\u0438\u0441\u044C \u043F\u0440\u044B\u0433\u0430\u0442\u044C\
+      , \u0442\u0430\u043D\u0446\u0435\u0432\u0430\u0442\u044C \u0438 \u0434\u0435\
+      \u043B\u0430\u0442\u044C \u0441\u0430\u043B\u044C\u0442\u043E."
+    type: Fix
+  id: 619
+  time: '2024-12-26T22:22:55.195811+00:00'
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -32,6 +32,7 @@
     - Adrenaline
     - Jump # Sunrise-Edit
     - Flip # Sunrise-Edit
+  - type: EmoteAnimation # Sunrise-Edit
   - type: Buckle
   - type: StandingState
   - type: Tag
@@ -112,6 +113,7 @@
     - Adrenaline
     - Jump # Sunrise-Edit
     - Flip # Sunrise-Edit
+  - type: EmoteAnimation # Sunrise-Edit
   - type: Bloodstream
     bloodMaxVolume: 150
   - type: MobPrice

diff --git a/Resources/Prototypes/Entities/Mobs/Player/terminator.yml b/Resources/Prototypes/Entities/Mobs/Player/terminator.yml
@@ -42,6 +42,7 @@
     - StaminaModifier
     - Jump # Sunrise-Edit
     - Flip # Sunrise-Edit
+  - type: EmoteAnimation # Sunrise-Edit
   - type: MobState
     allowedStates:
     - Alive

diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -261,7 +261,6 @@
   - type: Carriable
   - type: CanEscapeInventory
   - type: Mood
-  - type: EmoteAnimation
   # Sunrise-End
   - type: Barotrauma
     damage:

diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -46,6 +46,7 @@
   # Sunrise-Start
   - type: TTS
   - type: DamageOverlay
+  - type: EmoteAnimation
   # Sunrise-End
 
 - type: entity

diff --git a/Resources/Prototypes/_Sunrise/Actions/animations.yml b/Resources/Prototypes/_Sunrise/Actions/animations.yml
@@ -4,7 +4,7 @@
   name: Сальто
   whitelist:
     components:
-    - Hands
+    - Body
   blacklist:
     components:
     - Ghost
@@ -26,7 +26,7 @@
   name: Прыгнуть
   whitelist:
     components:
-    - Hands
+    - Body
   blacklist:
     components:
     - Ghost
@@ -49,7 +49,7 @@
   name: Танцевать
   whitelist:
     components:
-    - Hands
+    - Body
   blacklist:
     components:
     - Ghost
@@ -72,12 +72,12 @@
   whitelist:
     components:
     - Hands
-    - Jump
-    - Flip
   blacklist:
     components:
     - Ghost
     - BorgChassis
+    - Jump
+    - Flip
   animation: true
 
 - type: emote