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 0f6f9af2a8437dbd772347fdade353d42fd24062..2ebc0e423e79119559a407766c52a48c05a5e908 100644 (file)
--- 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 4154402babad622345ca0fe1a5e4638c7f39b92c..8ddc42024474f27604fe11b32badc9123224bc59 100644 (file)
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 c6a96351c87a8d5a936412a175be89e779e93e18..428b06ff9ebdab602cde6491b7a5149dfe1e87e0 100644 (file)
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 1fbd88b48f7c1d9d2220b8089a4706ddb47e88b7..6e7b5c0fa0038d8e9a43ee57abc43a295ad60a8b 100644 (file)
--- 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 73b36c137b359c6e638d34608c16d507a1c5d366..eab4b0bc33e32a04abd951efea6aadec4e0fe739 100644 (file)
--- 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