Merge pull request #435 from crystallpunk-14/ed-08-09-2024-upstream

Ed 08 09 2024 upstream
2024-09-17 11:51:51 +03:00
parent 4565f3c574 233b493865
commit bc930da84f
724 changed files with 68393 additions and 36296 deletions
--- a/Resources/Audio/Machines/attributions.yml
+++ b/Resources/Audio/Machines/attributions.yml
@@ -143,6 +143,11 @@
  copyright: "/tg/station"
  source: "https://github.com/tgstation/tgstation/blob/3eeba3899f22638595333c63b7b7433001f91bb2/sound/machines/eject.ogg"

+- files: ["sonar-ping.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "/tg/station"
+  source: "https://github.com/tgstation/tgstation/blob/002051a3d5e4a35af504e52c0990bf4e22a908dc/sound/machines/sonar-ping.ogg"
+
 - files: ["scanning.ogg"]
  license: "CC0-1.0"
  copyright: "Samuel Gremaud on freesound.org"
--- a/Resources/Audio/Machines/sonar-ping.ogg
+++ b/Resources/Audio/Machines/sonar-ping.ogg
--- a/Resources/Audio/Voice/Talk/vox.ogg
+++ b/Resources/Audio/Voice/Talk/vox.ogg
--- a/Resources/Audio/Voice/Talk/vox_ask.ogg
+++ b/Resources/Audio/Voice/Talk/vox_ask.ogg
--- a/Resources/Audio/Voice/Talk/vox_exclaim.ogg
+++ b/Resources/Audio/Voice/Talk/vox_exclaim.ogg
--- a/Resources/Audio/Voice/Vox/vox_laugh.ogg
+++ b/Resources/Audio/Voice/Vox/vox_laugh.ogg