Merge branch 'master' into shark-race-real

Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com>

Resources/Changelog/DeltaVChangelog.yml

@@ -1,10 +1,4 @@
 Entries:
-- author: DebugOk
-  changes:
-  - message: Prisoners will no longer spawn in cryopods instead of in the brig.
-    type: Fix
-  id: 216
-  time: '2024-01-31T09:42:57.0000000+00:00'
 - author: leonardo-dabepis
   changes:
   - message: Made HCV cocktail less immediately lethal (damnation!!!)
@@ -3780,3 +3774,10 @@
   id: 715
   time: '2024-11-29T01:27:57.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2307
+- author: Emily9031
+  changes:
+  - message: Felinids, vulpkanin, harpies, and rodentia now have gasping sounds.
+    type: Fix
+  id: 716
+  time: '2024-11-29T06:35:24.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2313

Resources/Prototypes/DeltaV/SoundCollections/harpy.yml

@@ -0,0 +1,8 @@
+- type: soundCollection
+  id: HarpyGasp
+  files:
+  - /Audio/Effects/Gasp/gasp_male1.ogg
+  - /Audio/Effects/Gasp/gasp_male2.ogg
+  - /Audio/Effects/Gasp/gasp_female1.ogg
+  - /Audio/Effects/Gasp/gasp_female2.ogg
+  - /Audio/Effects/Gasp/gasp_female3.ogg

Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml

@@ -64,6 +64,10 @@
 #      collection: BikeHorn
     Weh:
       collection: Weh
+    Gasp:
+      collection: HarpyGasp
+    DefaultDeathgasp:
+      collection: DeathGasp
 
 - type: emoteSounds
   id: MaleVulpkanin
@@ -104,6 +108,10 @@
       collection: VulpkaninHowls
     Awoo:
       collection: VulpkaninHowls
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: MaleDeathGasp
 
 - type: emoteSounds
   id: FemaleVulpkanin
@@ -144,6 +152,10 @@
       collection: VulpkaninHowls
     Awoo:
       collection: VulpkaninHowls
+    Gasp:
+      collection: FemaleGasp
+    DefaultDeathgasp:
+      collection: FemaleDeathGasp
 
 - type: emoteSounds
   id: MobDog
@@ -190,8 +202,12 @@
       collection: Whistles
     Weh:
       collection: Weh
-    Squeak: 
+    Squeak:
       path: /Audio/Animals/mouse_squeak.ogg
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: MaleDeathGasp
 
 - type: emoteSounds
   id: FemaleRodentia
@@ -220,8 +236,12 @@
       collection: Whistles
     Weh:
       collection: Weh
-    Squeak: 
+    Squeak:
       path: /Audio/Animals/mouse_squeak.ogg
+    Gasp:
+      collection: FemaleGasp
+    DefaultDeathgasp:
+      collection: FemaleDeathGasp
 
 - type: emoteSounds
   id: MaleFeroxi
@@ -252,6 +272,10 @@
       collection: Weh
     Gnash:
       path: /Audio/Effects/bite.ogg
+    Gasp:
+      collection: FemaleGasp
+    DefaultDeathgasp:
+      collection: FemaleDeathGasp
 
 - type: emoteSounds
   id: FemaleFeroxi
@@ -282,3 +306,7 @@
       collection: Weh
     Gnash:
       collection: FeroxiGnashes
+    Gasp:
+      collection: FemaleGasp
+    DefaultDeathgasp:
+      collection: FemaleDeathGasp

Resources/Prototypes/Nyanotrasen/Voice/speech_emote_sounds.yml

@@ -36,6 +36,10 @@
       collection: FelinidGrowls
     Purr:
       collection: FelinidPurrs
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: MaleDeathGasp
 
 - type: emoteSounds
   id: FemaleFelinid
@@ -74,3 +78,7 @@
       collection: FelinidGrowls
     Purr:
       collection: FelinidPurrs
+    Gasp:
+      collection: FemaleGasp
+    DefaultDeathgasp:
+      collection: FemaleDeathGasp