diff --git a/Resources/Audio/Effects/Emotes/cackle.ogg b/Resources/Audio/Effects/Emotes/cackle.ogg new file mode 100644 index 00000000000..5783cada489 Binary files /dev/null and b/Resources/Audio/Effects/Emotes/cackle.ogg differ diff --git a/Resources/Audio/Lobby/Cyclic.ogg b/Resources/Audio/Lobby/Cyclic.ogg new file mode 100644 index 00000000000..edc9f5fa11a Binary files /dev/null and b/Resources/Audio/Lobby/Cyclic.ogg differ diff --git a/Resources/Audio/Lobby/Pulse.ogg b/Resources/Audio/Lobby/Pulse.ogg new file mode 100644 index 00000000000..a8d02a0dc50 Binary files /dev/null and b/Resources/Audio/Lobby/Pulse.ogg differ diff --git a/Resources/Audio/Lobby/Return.ogg b/Resources/Audio/Lobby/Return.ogg new file mode 100644 index 00000000000..0d0a9de36a2 Binary files /dev/null and b/Resources/Audio/Lobby/Return.ogg differ diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml index bf50cb58f0e..eaddd7d8404 100644 --- a/Resources/Prototypes/SoundCollections/lobby.yml +++ b/Resources/Prototypes/SoundCollections/lobby.yml @@ -18,7 +18,10 @@ - /Audio/Lobby/superposition.ogg - /Audio/Lobby/hackers.ogg - /Audio/Lobby/every_light_is_blinking_at_once.ogg - - /Audio/Lobby/DOS=HIGH,_UMB.ogg + #- /Audio/Lobby/DOS=HIGH,_UMB.ogg - /Audio/Lobby/Intermission.ogg - /Audio/Lobby/Epilogue.ogg - /Audio/Lobby/Resonance.ogg + - /Audio/Lobby/Return.ogg + - /Audio/Lobby/Cyclic.ogg + - /Audio/Lobby/Pulse.ogg diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index 88f9a0c33c0..52483d77e36 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -34,6 +34,8 @@ collection: Whistles Weh: collection: Weh + LaughEvil: + path: /Audio/Effects/Emotes/cackle.ogg - type: emoteSounds id: FemaleHuman diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 5be8ef3f1cc..c6ebdfbc83b 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -19,6 +19,15 @@ - giggles - chortles +- type: emote + id: LaughEvil + category: Vocal + chatMessages: [ cackles ] + chatTriggers: + - does an evil laugh + - cackles + - laughs evilly + - type: emote id: Honk category: Vocal