From: lunarcomets <140772713+lunarcomets@users.noreply.github.com> Date: Thu, 8 Jan 2026 14:35:39 +0000 (-0800) Subject: fix electrify sound effects being reversed (#42294) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=80d38c51b376f9185eb1e8a8d0f5b96f03d53ec5;p=space-station-14.git fix electrify sound effects being reversed (#42294) * The Fix * The Fix Part 2 --- diff --git a/Content.Shared/Electrocution/Components/ElectrifiedComponent.cs b/Content.Shared/Electrocution/Components/ElectrifiedComponent.cs index 1de5b47c57..c780a263de 100644 --- a/Content.Shared/Electrocution/Components/ElectrifiedComponent.cs +++ b/Content.Shared/Electrocution/Components/ElectrifiedComponent.cs @@ -112,10 +112,10 @@ public sealed partial class ElectrifiedComponent : Component public SoundSpecifier ShockNoises = new SoundCollectionSpecifier("sparks"); [DataField, AutoNetworkedField] - public SoundPathSpecifier AirlockElectrifyDisabled = new("/Audio/Machines/airlock_electrify_on.ogg"); + public SoundPathSpecifier AirlockElectrifyDisabled = new("/Audio/Machines/airlock_electrify_off.ogg"); [DataField, AutoNetworkedField] - public SoundPathSpecifier AirlockElectrifyEnabled = new("/Audio/Machines/airlock_electrify_off.ogg"); + public SoundPathSpecifier AirlockElectrifyEnabled = new("/Audio/Machines/airlock_electrify_on.ogg"); [DataField, AutoNetworkedField] public bool PlaySoundOnShock = true; diff --git a/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs b/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs index 7af311cc1e..0c562a6de3 100644 --- a/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs +++ b/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs @@ -123,8 +123,8 @@ public abstract class SharedDoorRemoteSystem : EntitySystem { _electrify.SetElectrified((args.Target.Value, eletrifiedComp), !eletrifiedComp.Enabled); var soundToPlay = eletrifiedComp.Enabled - ? eletrifiedComp.AirlockElectrifyDisabled - : eletrifiedComp.AirlockElectrifyEnabled; + ? eletrifiedComp.AirlockElectrifyEnabled + : eletrifiedComp.AirlockElectrifyDisabled; _audio.PlayLocal(soundToPlay, args.Target.Value, args.User); _adminLogger.Add(LogType.Action, LogImpact.Medium, diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs index f11cba419e..68025ac515 100644 --- a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs +++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs @@ -101,8 +101,8 @@ public abstract partial class SharedStationAiSystem _adminLogger.Add(LogType.Action, $"{args.User} set electrified status on {ent} to [{args.Electrified}] using the Station AI radial."); _electrify.SetElectrified((ent, component), args.Electrified); var soundToPlay = component.Enabled - ? component.AirlockElectrifyDisabled - : component.AirlockElectrifyEnabled; + ? component.AirlockElectrifyEnabled + : component.AirlockElectrifyDisabled; _audio.PlayLocal(soundToPlay, ent, args.User); } }