More Vox Sounds (#39914)

* Added more vox sounds

WHY IS IT ORGANIZED THIS WAY.

* Fix incorrect license fields

* License fix

* move vox_gasp.ogg to gasps

* Update Attributions

* Update attributions.yml

* file path fix

* Update attributions.yml

* Update attributions.yml

* Update attributions.yml

* Update attributions.yml

* Update attributions.yml

* Update attributions.yml

* Standardize Attributions, fixed sources

* Adjusted Vox DeathGasp and sigh to be more auditorily distinct from one-another

* Made vox gasp slightly faster

diff --git a/Resources/Audio/Effects/Gasp/attributions.yml b/Resources/Audio/Effects/Gasp/attributions.yml
index 8d84b770f3ab4a2fac3d8313c6b682a85018a690..481b9f2f280fe44625ad90ccf11c883e82489bbe 100644 (file)
--- a/Resources/Audio/Effects/Gasp/attributions.yml
+++ b/Resources/Audio/Effects/Gasp/attributions.yml
@@ -30,3 +30,10 @@
   license: "CC-BY-SA-3.0"
   copyright: "Taken from tgstation at https://github.com/tgstation/tgstation/commit/948ad3dd5b22803a01cd74c27f37e509dc61395b"
   source: "https://github.com/tgstation/tgstation/blob/948ad3dd5b22803a01cd74c27f37e509dc61395b/sound/voice/moth/moth_death.ogg"
+
+- files:
+  - vox_DeathGasp.ogg
+  - vox_gasp.ogg
+  license: "CC-BY-SA-3.0"
+  copyright: "Made by TrixxedHeart, modified from shriek1.ogg"
+  source: "https://github.com/space-wizards/space-station-14/pull/39914"

diff --git a/Resources/Audio/Effects/Gasp/vox_DeathGasp.ogg b/Resources/Audio/Effects/Gasp/vox_DeathGasp.ogg
new file mode 100644 (file)
index 0000000..b2883b6
Binary files /dev/null and b/Resources/Audio/Effects/Gasp/vox_DeathGasp.ogg differ

diff --git a/Resources/Audio/Effects/Gasp/vox_gasp.ogg b/Resources/Audio/Effects/Gasp/vox_gasp.ogg
new file mode 100644 (file)
index 0000000..c475daf
Binary files /dev/null and b/Resources/Audio/Effects/Gasp/vox_gasp.ogg differ

diff --git a/Resources/Audio/Voice/Talk/attributions.yml b/Resources/Audio/Voice/Talk/attributions.yml
index e4347315fff9bf789135dabd28e576da113e9860..b9efbeb3f20f068f2752b85c8fae3482092236ef 100644 (file)
--- a/Resources/Audio/Voice/Talk/attributions.yml
+++ b/Resources/Audio/Voice/Talk/attributions.yml
@@ -33,9 +33,9 @@
   source: "https://github.com/goonstation/goonstation/tree/eb3e7df6292d23f6af2f18b4372d3a8ba4b0fda7/sound/misc/talk"
 
 - files: ["vox.ogg","vox_ask.ogg","vox_exclaim.ogg" ]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "Derived from shriek1.ogg by Errant"
-  source: "https://github.com/goonstation/goonstation/tree/eb3e7df6292d23f6af2f18b4372d3a8ba4b0fda7/sound/misc/talk"
+  license: "CC-BY-SA-3.0"
+  copyright: "Derived from shriek1.ogg (originally from Paradise Station) by Errant"
+  source: "https://github.com/ParadiseSS13/Paradise/commit/43e60ab01eda88fe30eb93612614bde836e55fe4"
 
 - files: ["vulp.ogg, vulp_ask.ogg, vulp_exclaim.ogg"]
   license: "CC-BY-NC-SA-3.0"

diff --git a/Resources/Audio/Voice/Vox/attributions.yml b/Resources/Audio/Voice/Vox/attributions.yml
new file mode 100644 (file)
index 0000000..dd31a9c
--- /dev/null
+++ b/Resources/Audio/Voice/Vox/attributions.yml
@@ -0,0 +1,30 @@
+- files:
+  - shriek1.ogg
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from https://github.com/ParadiseSS13/Paradise/blob/master/sound/voice/shriek1.ogg"
+  source: "https://github.com/ParadiseSS13/Paradise/commit/43e60ab01eda88fe30eb93612614bde836e55fe4"
+
+- files:
+  - vox_laugh.ogg
+  license: "CC-BY-SA-3.0"
+  copyright: "Made by Errant, modified from shriek1.ogg"
+  source: "https://github.com/space-wizards/space-station-14/commit/2b0f227940d9163e06ac75e0f6af7140fb3fd11f"
+
+- files:
+  - vox_cough.ogg
+  license: "CC-BY-SA-3.0"
+  copyright: "Made by TrixxedHeart, modified from vox_laugh.ogg"
+  source: "https://github.com/space-wizards/space-station-14/pull/39914"
+
+- files:
+  - vox_sigh.ogg
+  license: "CC-BY-SA-3.0"
+  copyright: "Made by TrixxedHeart, modified from shriek1.ogg"
+  source: "https://github.com/space-wizards/space-station-14/pull/39914"
+
+- files:
+  - vox_cry.ogg
+  license: "CC0-1.0"
+  copyright: "raptorgoesextinct.wav by Nerdwizard78"
+  source: "https://freesound.org/people/Nerdwizard78/sounds/643928/"
+

diff --git a/Resources/Audio/Voice/Vox/vox_cough.ogg b/Resources/Audio/Voice/Vox/vox_cough.ogg
new file mode 100644 (file)
index 0000000..7815d83
Binary files /dev/null and b/Resources/Audio/Voice/Vox/vox_cough.ogg differ

diff --git a/Resources/Audio/Voice/Vox/vox_cry.ogg b/Resources/Audio/Voice/Vox/vox_cry.ogg
new file mode 100644 (file)
index 0000000..1b60017
Binary files /dev/null and b/Resources/Audio/Voice/Vox/vox_cry.ogg differ

diff --git a/Resources/Audio/Voice/Vox/vox_sigh.ogg b/Resources/Audio/Voice/Vox/vox_sigh.ogg
new file mode 100644 (file)
index 0000000..b8661da
Binary files /dev/null and b/Resources/Audio/Voice/Vox/vox_sigh.ogg differ

diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index c21091051cc360343fd813e4c0ab2b28fe465f05..4c8401dc2abf588b294d7a4b65ea27b02c587457 100644 (file)
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -226,12 +226,22 @@
       path: /Audio/Voice/Vox/shriek1.ogg
     Laugh:
       path: /Audio/Voice/Vox/vox_laugh.ogg
+    Cough:
+      path: /Audio/Voice/Vox/vox_cough.ogg
+    Sigh:
+      path: /Audio/Voice/Vox/vox_sigh.ogg
     Honk:
       collection: BikeHorn
+    Crying:
+      path: /Audio/Voice/Vox/vox_cry.ogg
     Weh:
       collection: Weh
     Hew:
       collection: Hew
+    Gasp:
+      path: /Audio/Effects/Gasp/vox_gasp.ogg
+    DefaultDeathgasp:
+      path: /Audio/Effects/Gasp/vox_DeathGasp.ogg
   params:
     variation: 0.125
     # We need vox sounds for the other emotes