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

EmotePanel gets 3 new emotes. #228

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
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
5 changes: 5 additions & 0 deletions Content.Server/ADT/EmotePanel/EmotePanelSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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();
Expand Down
6 changes: 6 additions & 0 deletions Resources/Changelog/ChangelogADT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
3 changes: 3 additions & 0 deletions Resources/Prototypes/Sirena/Actions/emotes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
# Using EmoteAnimation from IC action chat
- type: emote
id: EmoteFlip
icon: Interface/Emotes/somersaults.png
category: Animations
chatMessages: [делает сальто]
chatTriggers:
Expand All @@ -63,6 +64,7 @@

- type: emote
id: EmoteJump
icon: Interface/Emotes/jump.png
category: Animations
chatMessages: [прыгает]
chatTriggers:
Expand All @@ -75,6 +77,7 @@

- type: emote
id: EmoteTurn
icon: Interface/Emotes/spin.png
category: Animations
chatMessages: [кружится]
chatTriggers:
Expand Down
Binary file added Resources/Textures/Interface/Emotes/jump.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/somersaults.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Interface/Emotes/spin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading