From d958ababb938b4d0d0f24bedd700265140bbad9a Mon Sep 17 00:00:00 2001 From: Morber <14136326+Morb0@users.noreply.github.com> Date: Wed, 22 Jun 2022 03:51:42 +0300 Subject: [PATCH] Add SignalSwitch sound (#9013) --- .../Components/SignalSwitchComponent.cs | 4 ++++ .../MachineLinking/System/SignalSwitchSystem.cs | 5 +++++ Resources/Audio/Machines/license.txt | 4 +++- Resources/Audio/Machines/lightswitch.ogg | Bin 0 -> 11877 bytes 4 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 Resources/Audio/Machines/lightswitch.ogg diff --git a/Content.Server/MachineLinking/Components/SignalSwitchComponent.cs b/Content.Server/MachineLinking/Components/SignalSwitchComponent.cs index ec79d083eb..5a00df5b7e 100644 --- a/Content.Server/MachineLinking/Components/SignalSwitchComponent.cs +++ b/Content.Server/MachineLinking/Components/SignalSwitchComponent.cs @@ -1,4 +1,5 @@ using Content.Shared.MachineLinking; +using Content.Shared.Sound; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; namespace Content.Server.MachineLinking.Components @@ -24,5 +25,8 @@ namespace Content.Server.MachineLinking.Components [DataField("state")] public bool State; + + [DataField("clickSound")] + public SoundSpecifier ClickSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/lightswitch.ogg"); } } diff --git a/Content.Server/MachineLinking/System/SignalSwitchSystem.cs b/Content.Server/MachineLinking/System/SignalSwitchSystem.cs index b254bd2f2c..78a0ef2ca4 100644 --- a/Content.Server/MachineLinking/System/SignalSwitchSystem.cs +++ b/Content.Server/MachineLinking/System/SignalSwitchSystem.cs @@ -1,5 +1,8 @@ using Content.Server.MachineLinking.Components; +using Content.Shared.Audio; using Content.Shared.Interaction; +using Robust.Shared.Audio; +using Robust.Shared.Player; namespace Content.Server.MachineLinking.System { @@ -27,6 +30,8 @@ namespace Content.Server.MachineLinking.System component.State = !component.State; _signalSystem.InvokePort(uid, component.State ? component.OnPort : component.OffPort); + SoundSystem.Play(component.ClickSound.GetSound(), Filter.Pvs(component.Owner), component.Owner, + AudioHelpers.WithVariation(0.125f).WithVolume(8f)); args.Handled = true; } diff --git a/Resources/Audio/Machines/license.txt b/Resources/Audio/Machines/license.txt index f3447aaeba..966e6d9569 100644 --- a/Resources/Audio/Machines/license.txt +++ b/Resources/Audio/Machines/license.txt @@ -8,4 +8,6 @@ uniformprinter.ogg taken from https://freesound.org/people/sukaton/sounds/60640/ vaccinator_running.ogg taken from https://freesound.org/people/RutgerMuller/sounds/365413/ and edited -vending_jingle.ogg made by github.com/hubismal licensed under CC-BY-3.0 \ No newline at end of file +vending_jingle.ogg made by github.com/hubismal licensed under CC-BY-3.0 + +lightswitch.ogg taken from https://github.com/Skyrat-SS13/Skyrat-tg/blob/3f6099bbc3c2afdc609bf1991c2f06297a0f13c2/modular_skyrat/modules/aesthetics/lightswitch/sound/lightswitch.ogg under CC-BY-SA 3.0 \ No newline at end of file diff --git a/Resources/Audio/Machines/lightswitch.ogg b/Resources/Audio/Machines/lightswitch.ogg new file mode 100644 index 0000000000000000000000000000000000000000..4cf5f3633091ed5d70e1850b8fd7b04f5e5bbbb3 GIT binary patch literal 11877 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 A8~^|S literal 0 HcmV?d00001