From: Bixkitts <72874643+Bixkitts@users.noreply.github.com> Date: Mon, 20 Nov 2023 15:36:25 +0000 (+0100) Subject: Sound Effect For Emagged Borgs (#21451) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=646aee0b7a92b93398dbddbf391d78599ed72e16;p=space-station-14.git Sound Effect For Emagged Borgs (#21451) * Added sound effect for borg being emagged * attributions * license * patched for #21460 * Made the sound trigger on emag instead of role add * oops --- diff --git a/Content.Server/Silicons/Laws/SiliconLawSystem.cs b/Content.Server/Silicons/Laws/SiliconLawSystem.cs index 06d845b72c..182ab6c947 100644 --- a/Content.Server/Silicons/Laws/SiliconLawSystem.cs +++ b/Content.Server/Silicons/Laws/SiliconLawSystem.cs @@ -36,6 +36,7 @@ public sealed class SiliconLawSystem : SharedSiliconLawSystem [Dependency] private readonly SharedStunSystem _stunSystem = default!; [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly SharedRoleSystem _roles = default!; + [Dependency] private readonly SharedAudioSystem _audioSystem = default!; /// public override void Initialize() @@ -187,6 +188,10 @@ public sealed class SiliconLawSystem : SharedSiliconLawSystem EnsureEmaggedRole(uid, component); _stunSystem.TryParalyze(uid, component.StunTime, true); + + if (!_mind.TryGetMind(uid, out var mindId, out _)) + return; + _roles.MindPlaySound(mindId, component.EmaggedSound); } private void OnEmagMindAdded(EntityUid uid, EmagSiliconLawComponent component, MindAddedMessage args) diff --git a/Content.Shared/Silicons/Laws/Components/EmagSiliconLawComponent.cs b/Content.Shared/Silicons/Laws/Components/EmagSiliconLawComponent.cs index f492db4d12..2155401062 100644 --- a/Content.Shared/Silicons/Laws/Components/EmagSiliconLawComponent.cs +++ b/Content.Shared/Silicons/Laws/Components/EmagSiliconLawComponent.cs @@ -1,6 +1,7 @@ -using Content.Shared.Roles; +using Content.Shared.Roles; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; +using Robust.Shared.Audio; namespace Content.Shared.Silicons.Laws.Components; @@ -48,4 +49,12 @@ public sealed partial class EmagSiliconLawComponent : Component /// [DataField] public ProtoId? AntagonistRole = "SubvertedSilicon"; + + /// + /// The sound that plays for the borg player + /// to let them know they've been emagged + /// + [DataField] + public SoundSpecifier EmaggedSound = new SoundPathSpecifier("/Audio/Ambience/Antag/emagged_borg.ogg"); + } diff --git a/Resources/Audio/Ambience/Antag/attributions.yml b/Resources/Audio/Ambience/Antag/attributions.yml index 0a4a0479d1..25917a5da2 100644 --- a/Resources/Audio/Ambience/Antag/attributions.yml +++ b/Resources/Audio/Ambience/Antag/attributions.yml @@ -14,3 +14,7 @@ license: "CC0-1.0" copyright: "Made by https://www.youtube.com/@a-guy173" source: https://github.com/A-Guy173/Music/blob/main/revolution.mp3 +- files: ["emagged_borg.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Made by @ps3moira on github" + source: https://www.youtube.com/watch?v=4-R-_DiqiLo diff --git a/Resources/Audio/Ambience/Antag/emagged_borg.ogg b/Resources/Audio/Ambience/Antag/emagged_borg.ogg new file mode 100644 index 0000000000..4b5982314b Binary files /dev/null and b/Resources/Audio/Ambience/Antag/emagged_borg.ogg differ