diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
index 827d7f4d326..5dbefa16841 100644
--- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
@@ -28,25 +28,25 @@
       collection: HarpyGrowls
     Purr:
       collection: HarpyPurrs
-    Ring:
+    HarpyRing:
       collection: HarpyRings
-    HonkHarpy:
+    HarpyHonk:
       collection: HarpyHonks
-    Pew:
+    HarpyPew:
       collection: HarpyPews
-    Bang:
+    HarpyBang:
       collection: HarpyBangs
-    Beep:
+    HarpyBeep:
       collection: HarpyBeeps
-    Rev:
+    HarpyRev:
       collection: HarpyRevs
-#    Click:
-#      collection: HarpyClicks
+    Click:
+      collection: HarpyClicks
     Chitter:
       collection: HarpyChitter
     Squeak:
       collection: HarpySqueak
-    Caw:
+    HarpyCaw:
       collection: HarpyCaws
     Chirp:
       collection: HarpyChirps
diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
index 45eec7cb411..2cef3fd038c 100644
--- a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
@@ -1,89 +1,157 @@
 # Harpy
 - type: emote
-  id: HonkHarpy
+  id: HarpyHonk
   category: Vocal
   chatMessages: [honks.]
   chatTriggers:
+    - honk
     - honk.
+    - honk!
+    - honk?
+    - honks
     - honks.
     - honks!
+    - honks?
+    - honking
     - honking.
+    - honking!
+    - honking?
+    - honked
     - honked.
+    - honked!
+    - honked?
 
 - type: emote
-  id: Ring
+  id: HarpyRing
   category: Vocal
   chatMessages: [rings.]
   chatTriggers:
+    - ring
     - ring.
+    - ring!
+    - ring?
+    - rings
     - rings.
     - rings!
+    - rings?
+    - ringing
     - ringing.
+    - ringing!
+    - ringing?
+    - ringed
     - ringed.
+    - ringed!
+    - ringed?
+    - rang
+    - rang.
+    - rang!
+    - rang?
 
 - type: emote
-  id: Pew
+  id: HarpyPew
   category: Vocal
   chatMessages: [pews.]
   chatTriggers:
+    - pew
     - pew.
-    - pews.
     - pew!
+    - pew?
+    - pews
+    - pews.
+    - pews!
+    - pews?
+    - pewpew
+    - pewpew.
+    - pewpew!
+    - pewpew?
 
 - type: emote
-  id: Bang
+  id: HarpyBang
   category: Vocal
   chatMessages: [bangs.]
   chatTriggers:
-    - bangs.
+    - bang
     - bang.
     - bang!
+    - bang?
+    - bangs
+    - bangs.
+    - bangs!
+    - bangs?
+    - banging
     - banging.
+    - banging!
+    - banging?
+    - banged
     - banged.
+    - banged!
+    - banged?
 
 - type: emote
-  id: Beep
+  id: HarpyBeep
   category: Vocal
   chatMessages: [beeps.]
   chatTriggers:
-    - beeps.
+    - beep
     - beep.
     - beep!
+    - beep?
+    - beeps
+    - beeps.
+    - beeps!
+    - beeps?
+    - beeping
     - beeping.
+    - beeping!
+    - beeping?
+    - beeped
     - beeped.
+    - beeped!
+    - beeped?
 
 - type: emote
-  id: Rev
+  id: HarpyRev
   category: Vocal
   chatMessages: [revs.]
   chatTriggers:
-    - revs.
+    - rev
     - rev.
     - rev!
+    - rev?
+    - revs
+    - revs.
+    - revs!
+    - revs?
     - revving
+    - revving.
+    - revving!
+    - revving?
     - revved
-
-#- type: emote
-#  id: Click
-#  category: Vocal
-#  chatMessages: [clicks.]
-#  chatTriggers:
-#    - clicks.
-#    - click.
-#    - click!
-#    - clicking.
-#    - clicked.
+    - revved.
+    - revved!
+    - revved?
 
 - type: emote
-  id: Caw
+  id: HarpyCaw
   category: Vocal
   chatMessages: [caws.]
   chatTriggers:
-    - caws.
+    - caw
     - caw.
     - caw!
+    - caw?
+    - caws
+    - caws.
+    - caws!
+    - caws?
     - cawing
+    - cawing.
+    - cawing!
+    - cawing?
     - cawed
+    - cawed.
+    - cawed!
+    - cawed?
 
 #Vulpkanin
 - type: emote
@@ -91,48 +159,85 @@
   category: Vocal
   chatMessages: [barks.]
   chatTriggers:
+    - bark
     - bark.
     - bark!
+    - bark?
+    - barks
     - barks.
     - barks!
+    - barks?
+    - barked
     - barked.
     - barked!
+    - barked?
+    - barking
     - barking.
+    - barking!
+    - barking?
 
 - type: emote
   id: Snarl
   category: Vocal
   chatMessages: [snarls.]
   chatTriggers:
+    - snarl
     - snarl.
     - snarl!
+    - snarl?
+    - snarls
     - snarls.
     - snarls!
+    - snarls?
+    - snarled
     - snarled.
     - snarled!
+    - snarled?
+    - snarling
     - snarling.
+    - snarling!
+    - snarling?
 
 - type: emote
   id: Whine
   category: Vocal
   chatMessages: [whines.]
   chatTriggers:
+    - whine
     - whine.
     - whine!
+    - whine?
+    - whines
     - whines.
     - whines!
+    - whines?
+    - whined
     - whined.
     - whined!
+    - whined?
+    - whining
     - whining.
+    - whining!
+    - whining?
 
 - type: emote
   id: Howl
   category: Vocal
   chatMessages: [howls.]
   chatTriggers:
+    - howl
     - howl.
     - howl!
+    - howl?
+    - howls
     - howls.
     - howls!
+    - howls?
+    - howling
     - howling.
+    - howling!
+    - howling?
+    - howled
     - howled.
+    - howling!
+    - howling?
diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
index 8e33f483aa3..7eb2bd4f6a0 100644
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -170,9 +170,19 @@
    - click
    - click.
    - click!
+   - click?
    - clicks
    - clicks.
    - clicks!
+   - clicks?
+   - clicked
+   - clicked.
+   - clicked!
+   - clicked?
+   - clicking
+   - clicking.
+   - clicking!
+   - clicking?
 
 # hand emotes
 - type: emote
@@ -253,14 +263,18 @@
   chatMessages: [chirps!]
   chatTriggers:
     - chirp
-    - chirp!
     - chirp.
+    - chirp!
+    - chirp?
     - chirps
-    - churps.
+    - chirps.
     - chirps!
+    - chirps?
     - chirped
     - chirped.
     - chirped!
+    - chirped?
     - chirping
     - chirping.
     - chirping!
+    - chirping?