From: deathride58 Date: Thu, 4 Jan 2024 00:36:13 +0000 (-0500) Subject: Fixes license violation with Smoke-grenade.ogg by replacing it with a freshly-made... X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f2da99790ef23c2dce46f390697ada430b14f5c6;p=space-station-14.git Fixes license violation with Smoke-grenade.ogg by replacing it with a freshly-made sound (#23476) * 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 789d8e311b..c697214c2a 100644 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 bbda0e9bec..fecc4267ba 100644 --- 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 2bcc113037..90cb751e40 100644 --- 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