tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix airlocks inconsistently auto-closing after unbolting (#33524)

Browse Source 
fix door auto close timer
This commit is contained in:
slarticodefast
2024-11-25 05:26:54 +01:00
committed by GitHub
parent d642ee7707
commit 3c6c5ab6c9
5 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Shared/Doors/Systems/SharedAirlockSystem.cs
View File

@@ -22,6 +22,7 @@ public abstract class SharedAirlockSystem : EntitySystem
SubscribeLocalEvent<AirlockComponent, BeforeDoorClosedEvent>(OnBeforeDoorClosed);
SubscribeLocalEvent<AirlockComponent, DoorStateChangedEvent>(OnStateChanged);
SubscribeLocalEvent<AirlockComponent, DoorBoltsChangedEvent>(OnBoltsChanged);
SubscribeLocalEvent<AirlockComponent, BeforeDoorOpenedEvent>(OnBeforeDoorOpened);
SubscribeLocalEvent<AirlockComponent, BeforeDoorDeniedEvent>(OnBeforeDoorDenied);
SubscribeLocalEvent<AirlockComponent, GetPryTimeModifierEvent>(OnGetPryMod);
@@ -70,6 +71,13 @@ public abstract class SharedAirlockSystem : EntitySystem
}
}
private void OnBoltsChanged(EntityUid uid, AirlockComponent component, DoorBoltsChangedEvent args)
{
// If unbolted, reset the auto close timer
if (!args.BoltsDown)
UpdateAutoClose(uid, component);
}
private void OnBeforeDoorOpened(EntityUid uid, AirlockComponent component, BeforeDoorOpenedEvent args)
{
if (!CanChangeState(uid, component))
@@ -145,7 +153,7 @@ public abstract class SharedAirlockSystem : EntitySystem
ent.Comp.EmergencyAccess = value;
Dirty(ent, ent.Comp); // This only runs on the server apparently so we need this.
UpdateEmergencyLightStatus(ent, ent.Comp);
var sound = ent.Comp.EmergencyAccess ? ent.Comp.EmergencyOnSound : ent.Comp.EmergencyOffSound;
if (predicted)
Audio.PlayPredicted(sound, ent, user: user);