space-wizards/space-station-14
1
0
Fork 0
mirror of https://github.com/space-wizards/space-station-14.git synced 2026-02-14 19:29:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix electrify sound effects being reversed (#42294)

Browse Source 
* The Fix

* The Fix Part 2
This commit is contained in:
lunarcomets
2026-01-08 06:35:39 -08:00
committed by GitHub
parent e27ae3d428
commit 80d38c51b3
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Electrocution/Components/ElectrifiedComponent.cs
View File

@@ -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;

4
Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs
View File

@@ -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,

4
Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
View File

@@ -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);
}
}