Skip to content

Bounty IPC Emotes fix #606

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.

Sign up for GitHub

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

Merged
NotActuallyMarty merged 6 commits into from
Mar 9, 2026
Merged

Bounty IPC Emotes fix #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d84113f
removes the ipc blacklist
Feb 24, 2026
f200635
IPC cough (same as disease) and deathgasp (borg scream)
Feb 24, 2026
351bc6c
Merge branch 'master' into fixIpcEmote
NotActuallyMarty Feb 28, 2026
80db450
removes death scream because vitals ipc.yml
CometVoid Mar 4, 2026
0d1d0e0
Merge branch 'master' into fixIpcEmote
NotActuallyMarty Mar 7, 2026
3f5f6a9
Merge branch 'master' into fixIpcEmote
harryhulse12-alt Mar 9, 2026
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
22 changes: 11 additions & 11 deletions Resources/Prototypes/Voice/speech_emotes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
- Vocal
blacklist:
tags:
- SiliconEmotes
# - SiliconEmotes # Omu, robots have their own vocal noises, let them use them!
chatMessages: ["chat-emote-msg-sigh"]
chatTriggers:
- sigh
Expand All @@ -170,7 +170,7 @@
- Vocal
blacklist:
tags:
- SiliconEmotes
# - SiliconEmotes # Omu, robots have their own vocal noises, let them use them!
chatMessages: ["chat-emote-msg-whistle"]
chatTriggers:
- whistle
Expand All @@ -187,7 +187,7 @@
- Vocal
blacklist:
tags:
- SiliconEmotes
# - SiliconEmotes # Omu, robots have their own vocal noises, let them use them!
chatMessages: ["chat-emote-msg-crying"]
chatTriggers:
- cry
Expand Down Expand Up @@ -222,7 +222,7 @@
available: false
icon: Interface/Emotes/chitter.png
whitelist:
tags:
tags:
- HarpyEmotes # Omu, allow harpy to chitter
components:
- Vocal
Expand All @@ -242,7 +242,7 @@
available: false
icon: Interface/Emotes/squeak.png
whitelist:
tags:
tags:
- HarpyEmotes # Omu, allow harpy to squeak
components:
- Vocal
Expand All @@ -256,13 +256,13 @@
- squeaked

- type: emote
id: Click
id: Click
name: chat-emote-name-click
category: Vocal
available: false
icon: Interface/Emotes/click.png
whitelist:
tags:
tags:
- HarpyEmotes # Omu, allow harpy to click
components:
- Vocal
Expand All @@ -285,7 +285,7 @@
- Hands
blacklist:
tags:
- SiliconEmotes
# - SiliconEmotes # Omu, let IPCs and other hand robots emote with them
chatMessages: ["chat-emote-msg-clap"]
chatTriggers:
- claps
Expand All @@ -302,7 +302,7 @@
- Hands
blacklist:
tags:
- SiliconEmotes
# - SiliconEmotes # Omu, let IPCs and other hand robots emote with them
chatMessages: ["chat-emote-msg-snap"] # snaps <{THEIR($ent)}> fingers?
chatTriggers:
- snap
Expand Down Expand Up @@ -350,7 +350,7 @@
- Hands
blacklist:
tags:
- SiliconEmotes
# - SiliconEmotes # Omu, let IPCs and other hand robots emote with them
chatMessages: ["chat-emote-msg-salute"]
chatTriggers:
- salute
Expand Down Expand Up @@ -441,7 +441,7 @@
tags:
- HarpyEmotes # Omu, allow harpy to hew
chatTriggers: # Omu, allow harpy to hew
- hew
- hew
- hews

- type: emote
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/_EinsteinEngines/Voice/speech_emote_sounds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@
path: /Audio/_Goobstation/Voice/surprised.ogg
params:
variation: 0
Cough: # Omu
path: /Audio/Effects/tesla_consume.ogg # same as their disease noise
params:
variation: 0.125

- type: emoteSounds
id: MaleShadowkin
Expand Down
Loading