From 8c6f15c4cc471c775aa79f941a3c6e273eb020cf Mon Sep 17 00:00:00 2001
From: Emily <182209267+Emily9031@users.noreply.github.com>
Date: Thu, 28 Nov 2024 23:35:23 -0700
Subject: [PATCH 1/2] Delta V Species Gasps (#2313)

Adds gasps to felinids, harpies, vulpkanins, and rodentia.
---
 .../DeltaV/SoundCollections/harpy.yml         |  8 +++++++
 .../DeltaV/Voice/speech_emote_sounds.yml      | 24 +++++++++++++++++--
 .../Nyanotrasen/Voice/speech_emote_sounds.yml |  8 +++++++
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Prototypes/DeltaV/SoundCollections/harpy.yml

diff --git a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml
new file mode 100644
index 00000000000..926903fbb3e
--- /dev/null
+++ b/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
diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
index 7fafa0538d7..02a332544d0 100644
--- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
+++ b/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,5 +236,9 @@
       collection: Whistles
     Weh:
       collection: Weh
-    Squeak: 
+    Squeak:
       path: /Audio/Animals/mouse_squeak.ogg
+    Gasp:
+      collection: FemaleGasp
+    DefaultDeathgasp:
+      collection: FemaleDeathGasp
diff --git a/Resources/Prototypes/Nyanotrasen/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Nyanotrasen/Voice/speech_emote_sounds.yml
index b752e94020f..95371745564 100644
--- a/Resources/Prototypes/Nyanotrasen/Voice/speech_emote_sounds.yml
+++ b/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

From d4d22c97ac6b2ce2dfc0f4fc6bb4134316efba84 Mon Sep 17 00:00:00 2001
From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com>
Date: Fri, 29 Nov 2024 07:35:43 +0100
Subject: [PATCH 2/2] Automatic changelog update

---
 Resources/Changelog/DeltaVChangelog.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
index e0213fb2f49..9ee80291afa 100644
--- a/Resources/Changelog/DeltaVChangelog.yml
+++ b/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