Merge pull request #228 from modern-nm/emoteAnimationsOnEmotePanel

EmotePanel gets 3 new emotes.
AdventureTimeSS14 · Dec 19, 2023 · 71a605e · 71a605e
2 parents 20afcad + b852fde
commit 71a605e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 0 deletions.
diff --git a/Content.Server/ADT/EmotePanel/EmotePanelSystem.cs b/Content.Server/ADT/EmotePanel/EmotePanelSystem.cs
@@ -8,6 +8,7 @@
 using Content.Shared.Chat.Prototypes;
 using Content.Server.Emoting.Components;
 using Content.Server.Speech.Components;
+using Content.Shared.Sirena.Animations;
 
 namespace Content.Server.ADT.EmotePanel;
 
@@ -79,6 +80,10 @@ private void OnEmotingAction(EntityUid uid, EmotePanelComponent component, OpenE
                         if (EntityManager.TryGetComponent<VocalComponent>(uid, out var _))
                             ev.Prototypes.Add(prototype.ID);
                         break;
+                    case EmoteCategory.Animations:
+                        if(EntityManager.TryGetComponent<EmoteAnimationComponent>(uid, out var _))
+                            ev.Prototypes.Add(prototype.ID);
+                        break;
                 }
             }
             ev.Prototypes.Sort();

diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml
@@ -846,3 +846,9 @@ Entries:
   - {message: Куртки теперь правда работают, type: Fix}
   id: 55639 #костыль отображения в Обновлениях
   time: '2023-12-18T20:20:00.0000000+00:00'
+
+- author: modern.df
+  changes:
+  - {message: "Эмоции \"сальто\", \"прыгает\" и \"кружится\" добавлены в панель эмоций", type: Add}
+  id: 55640 #костыль отображения в Обновлениях
+  time: '2023-12-19T20:20:00.0000000+00:00'
diff --git a/Resources/Prototypes/Sirena/Actions/emotes.yml b/Resources/Prototypes/Sirena/Actions/emotes.yml
@@ -52,6 +52,7 @@
 # Using EmoteAnimation from IC action chat
 - type: emote
   id: EmoteFlip
+  icon: Interface/Emotes/somersaults.png
   category: Animations
   chatMessages: [делает сальто]
   chatTriggers:
@@ -63,6 +64,7 @@
 
 - type: emote
   id: EmoteJump
+  icon: Interface/Emotes/jump.png
   category: Animations
   chatMessages: [прыгает]
   chatTriggers:
@@ -75,6 +77,7 @@
 
 - type: emote
   id: EmoteTurn
+  icon: Interface/Emotes/spin.png
   category: Animations
   chatMessages: [кружится]
   chatTriggers:

diff --git a/Resources/Textures/Interface/Emotes/jump.png b/Resources/Textures/Interface/Emotes/jump.png
diff --git a/Resources/Textures/Interface/Emotes/somersaults.png b/Resources/Textures/Interface/Emotes/somersaults.png
diff --git a/Resources/Textures/Interface/Emotes/spin.png b/Resources/Textures/Interface/Emotes/spin.png