]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Adds sound to Smoke Grenades (#22866)
authorHmeister-fake <144629361+Hmeister-fake@users.noreply.github.com>
Sun, 24 Dec 2023 15:20:08 +0000 (15:20 +0000)
committerGitHub <noreply@github.com>
Sun, 24 Dec 2023 15:20:08 +0000 (10:20 -0500)
* 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

Resources/Audio/Effects/Smoke-grenade.ogg [new file with mode: 0644]
Resources/Audio/Effects/attributions.yml
Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml

diff --git a/Resources/Audio/Effects/Smoke-grenade.ogg b/Resources/Audio/Effects/Smoke-grenade.ogg
new file mode 100644 (file)
index 0000000..789d8e3
Binary files /dev/null and b/Resources/Audio/Effects/Smoke-grenade.ogg differ
index aa5609ab3d7a2e1cdf892054f942c6e7356633fa..22743ab1e9a318b77b8308fdcd7240e9bebf1c90 100644 (file)
   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
index a3727351ece5fcaf466db873a7a9355f8d4a8b2b..2bcc113037f88eacb68a1cb1ee0c399646b4f3b7 100644 (file)
   - type: SoundOnTrigger
     sound: /Audio/Effects/smoke.ogg
   - type: DeleteOnTrigger
+    primingSound:
+      path: /Audio/Effects/Smoke-grenade.ogg
 
 - type: entity
   parent: SmokeGrenade