Split smoke grenade sound into two parts (#26095)

* Split smoke grenade sound into two parts and converted to mono

* Restore old sound for admin trigger effect

diff --git a/Resources/Audio/Items/attributions.yml b/Resources/Audio/Items/attributions.yml
index 8942e41db23cb99cf81ea179d074f1217fe09a17..e63b678ef81f2c3cabb7a0b2b8e3236ae427cb18 100644 (file)
--- a/Resources/Audio/Items/attributions.yml
+++ b/Resources/Audio/Items/attributions.yml
@@ -102,3 +102,8 @@
   license: "CC-BY-SA-3.0"
   copyright: "Taken from tgstation, modified by themias (github) for ss14"
   source: "https://github.com/tgstation/tgstation/tree/85a0925051bb00e7a950ee66cb7f87982cd22439/sound/effects/shovel_dig.ogg"
+
+- files: ["smoke_grenade_prime.ogg", "smoke_grenade_smoke.ogg"]
+  license: "CC0-1.0"
+  copyright: "Bhijn and Myr (github username deathride58)"
+  source: "https://github.com/space-wizards/space-station-14/pull/23476"

diff --git a/Resources/Audio/Items/smoke_grenade_prime.ogg b/Resources/Audio/Items/smoke_grenade_prime.ogg
new file mode 100644 (file)
index 0000000..1c6cbcd
Binary files /dev/null and b/Resources/Audio/Items/smoke_grenade_prime.ogg differ

diff --git a/Resources/Audio/Items/smoke_grenade_smoke.ogg b/Resources/Audio/Items/smoke_grenade_smoke.ogg
new file mode 100644 (file)
index 0000000..7603869
Binary files /dev/null and b/Resources/Audio/Items/smoke_grenade_smoke.ogg differ

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index 326fd41acab8eff863c2c1283660807d7a2756c0..cd2f63976d5784d1b1f5c3cda891133afa458cb5 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -358,11 +358,11 @@
     duration: 30
     spreadAmount: 50
   - type: SoundOnTrigger
-    sound: /Audio/Effects/smoke.ogg
+    sound: /Audio/Items/smoke_grenade_smoke.ogg
   - type: DeleteOnTrigger
   - type: TimerTriggerVisuals
     primingSound:
-      path: /Audio/Effects/Smoke-grenade.ogg
+      path: /Audio/Items/smoke_grenade_prime.ogg
 
 - type: entity
   parent: SmokeGrenade