added cackle emote, new lobby music

tmcqueen · Aug 18, 2024 · e3bc807 · e3bc807
1 parent 405e2e6
commit e3bc807
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 1 deletion.
diff --git a/Resources/Audio/Effects/Emotes/cackle.ogg b/Resources/Audio/Effects/Emotes/cackle.ogg
diff --git a/Resources/Audio/Lobby/Cyclic.ogg b/Resources/Audio/Lobby/Cyclic.ogg
diff --git a/Resources/Audio/Lobby/Pulse.ogg b/Resources/Audio/Lobby/Pulse.ogg
diff --git a/Resources/Audio/Lobby/Return.ogg b/Resources/Audio/Lobby/Return.ogg
diff --git 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
@@ -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
@@ -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