From: Unkn0wn_Gh0st <shadowstalkermll@gmail.com>
Date: Sun, 18 Aug 2024 16:00:42 +0000 (-0500)
Subject: Coughing and coughing changes (#30893)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=73331416e3e7e9e1cd4c1ee1aaac0ba65238c0a3;p=space-station-14.git

Coughing and coughing changes (#30893)

* Coughing

* Merge branch 'space-wizards:master' into coughing

* Coughing

* Coughing
---

diff --git a/Resources/Audio/Voice/Human/attributions.yml b/Resources/Audio/Voice/Human/attributions.yml
index 0f6f9af2a8..2ebc0e423e 100644
--- a/Resources/Audio/Voice/Human/attributions.yml
+++ b/Resources/Audio/Voice/Human/attributions.yml
@@ -80,10 +80,15 @@
   copyright: "thatkellytrna on freesound.org"
   source: "https://freesound.org/people/thatkellytrna/sounds/425777/"
 
+- files: ["male_cough_1.ogg"]
+  license: "CC0-1.0"
+  copyright: "dastudiospr on freesound.org"
+  source: "https://freesound.org/people/dastudiospr/sounds/537150/"
+
 - files: ["male_cough_2.ogg"]
   license: "CC0-1.0"
-  copyright: "Harris85 on freesound.org"
-  source: "https://freesound.org/people/Harris85/sounds/208761/"
+  copyright: "qubodup on freesound.org"
+  source: "https://freesound.org/people/qubodup/sounds/743360/"
 
 - files: ["female_sneeze_1.ogg"]
   license: "CC0-1.0"
diff --git a/Resources/Audio/Voice/Human/male_cough_1.ogg b/Resources/Audio/Voice/Human/male_cough_1.ogg
index 4154402bab..8ddc420244 100644
Binary files a/Resources/Audio/Voice/Human/male_cough_1.ogg and b/Resources/Audio/Voice/Human/male_cough_1.ogg differ
diff --git a/Resources/Audio/Voice/Human/male_cough_2.ogg b/Resources/Audio/Voice/Human/male_cough_2.ogg
index c6a96351c8..428b06ff9e 100644
Binary files a/Resources/Audio/Voice/Human/male_cough_2.ogg and b/Resources/Audio/Voice/Human/male_cough_2.ogg differ
diff --git a/Resources/Prototypes/SoundCollections/emotes.yml b/Resources/Prototypes/SoundCollections/emotes.yml
index 1fbd88b48f..6e7b5c0fa0 100644
--- a/Resources/Prototypes/SoundCollections/emotes.yml
+++ b/Resources/Prototypes/SoundCollections/emotes.yml
@@ -9,6 +9,19 @@
   files:
     - /Audio/Voice/Human/womanlaugh.ogg
 
+- type: soundCollection
+  id: MaleCough
+  files:
+    - /Audio/Voice/Human/male_cough_1.ogg
+    - /Audio/Voice/Human/male_cough_2.ogg
+
+- type: soundCollection
+  id: FemaleCough
+  files:
+    - /Audio/Voice/Human/female_cough_1.ogg
+    - /Audio/Voice/Human/female_cough_2.ogg
+
+
 - type: soundCollection
   id: Claps
   files:
diff --git a/Resources/Prototypes/Voice/disease_emotes.yml b/Resources/Prototypes/Voice/disease_emotes.yml
index 73b36c137b..eab4b0bc33 100644
--- a/Resources/Prototypes/Voice/disease_emotes.yml
+++ b/Resources/Prototypes/Voice/disease_emotes.yml
@@ -19,6 +19,13 @@
   chatTriggers:
     - cough
     - coughs
+    - coughed 
+    - cough.
+    - coughs.
+    - coughed.
+    - cough!
+    - coughs!
+    - coughed!
 
 - type: emote
   id: CatMeow