From: Hmeister-fake <144629361+Hmeister-fake@users.noreply.github.com>
Date: Sun, 24 Dec 2023 15:20:08 +0000 (+0000)
Subject: Adds sound to Smoke Grenades (#22866)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=bd398a6a9ae5f71eb5077cb612c39bfe82ec5d06;p=space-station-14.git

Adds sound to Smoke Grenades (#22866)

* New smoke grenade sound

Very new to PR's and stuff, sorry

* Adds sound to smoke grenades and tear gas grenades on trigger

* Update attributions.yml

Deltanadas asked for it

* Update grenades.yml

* Change sound to an unlicenced sound

* Update attributions.yml
---

diff --git a/Resources/Audio/Effects/Smoke-grenade.ogg b/Resources/Audio/Effects/Smoke-grenade.ogg
new file mode 100644
index 0000000000..789d8e311b
Binary files /dev/null and b/Resources/Audio/Effects/Smoke-grenade.ogg differ
diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml
index aa5609ab3d..22743ab1e9 100644
--- a/Resources/Audio/Effects/attributions.yml
+++ b/Resources/Audio/Effects/attributions.yml
@@ -176,3 +176,8 @@
   copyright: "vgstation at c5edbfd7179288080f081e2b8ac2496b7e4455db"
   license: CC-BY-SA-3.0
   source: https://github.com/vgstation-coders/vgstation13/tree/c5edbfd7179288080f081e2b8ac2496b7e4455db/sound/effects
+
+- files: [Smoke-grenade.ogg]
+  copyright: 'Sound effects from https://quicksounds.com"'
+  license: CC0-1.0
+  source: https://quicksounds.com/library/sounds/grenade
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index a3727351ec..2bcc113037 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -360,6 +360,8 @@
   - type: SoundOnTrigger
     sound: /Audio/Effects/smoke.ogg
   - type: DeleteOnTrigger
+    primingSound:
+      path: /Audio/Effects/Smoke-grenade.ogg
 
 - type: entity
   parent: SmokeGrenade