Fixes license violation with Smoke-grenade.ogg by replacing it with a freshly-made...

* smoke grenade license compliance

* source link

* lets bring the pin sound down a peg

diff --git a/Resources/Audio/Effects/Smoke-grenade.ogg b/Resources/Audio/Effects/Smoke-grenade.ogg
index 789d8e311b4c59104572f8d7fa9db0180ad1fcab..c697214c2a571e1b6cc900b51c284fb073b8625c 100644 (file)
Binary files a/Resources/Audio/Effects/Smoke-grenade.ogg and b/Resources/Audio/Effects/Smoke-grenade.ogg differ

diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml
index bbda0e9becdd17526cb5b0161b31fd3205c6cb38..fecc4267ba51df93eadc26468e56fb97b1a53795 100644 (file)
--- a/Resources/Audio/Effects/attributions.yml
+++ b/Resources/Audio/Effects/attributions.yml
@@ -193,9 +193,9 @@
   source: https://github.com/vgstation-coders/vgstation13/tree/c5edbfd7179288080f081e2b8ac2496b7e4455db/sound/effects
 
 - files: [Smoke-grenade.ogg]
-  copyright: 'Sound effects from https://quicksounds.com"'
+  copyright: Bhijn and Myr (github username deathride58)
   license: CC0-1.0
-  source: https://quicksounds.com/library/sounds/grenade
+  source: https://github.com/space-wizards/space-station-14/pull/23476
 
 - files: ["eye_open.ogg", "eye_close.ogg"]
   copyright: Bhijn and Myr (github username deathride58)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index 2bcc113037f88eacb68a1cb1ee0c399646b4f3b7..90cb751e40a884abd4f96ca9e290684b258e202c 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -360,6 +360,7 @@
   - type: SoundOnTrigger
     sound: /Audio/Effects/smoke.ogg
   - type: DeleteOnTrigger
+  - type: TimerTriggerVisuals
     primingSound:
       path: /Audio/Effects/Smoke-grenade.ogg