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

Allow opening doors mid-deny animation, if you have the access (#24969)

Browse Source 
Allow opening doors mid-deny animation, if you have access ofc
This commit is contained in:
Kot
2024-02-06 03:31:21 +04:00
committed by GitHub
parent 9dc73f0b61
commit bedccf8e31
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/DeviceLinking/Systems/DoorSignalControlSystem.cs
View File

@@ -59,8 +59,7 @@ namespace Content.Server.DeviceLinking.Systems
{ {
if (state == SignalState.High || state == SignalState.Momentary) if (state == SignalState.High || state == SignalState.Momentary)
{ {
if (door.State is DoorState.Closed or DoorState.Open) _doorSystem.TryToggleDoor(uid, door);
_doorSystem.TryToggleDoor(uid, door);
} }
} }
else if (args.Port == component.InBolt) else if (args.Port == component.InBolt)

4
Content.Server/Doors/Systems/DoorSystem.cs
View File

@@ -136,13 +136,13 @@ public sealed class DoorSystem : SharedDoorSystem
if (!door.BumpOpen) if (!door.BumpOpen)
return; return;
if (door.State != DoorState.Closed) if (door.State is not (DoorState.Closed or DoorState.Denying))
return; return;
var otherUid = args.OtherEntity; var otherUid = args.OtherEntity;
if (Tags.HasTag(otherUid, "DoorBumpOpener")) if (Tags.HasTag(otherUid, "DoorBumpOpener"))
TryOpen(uid, door, otherUid); TryOpen(uid, door, otherUid, quiet: door.State == DoorState.Denying);
} }
private void OnEmagged(EntityUid uid, DoorComponent door, ref GotEmaggedEvent args) private void OnEmagged(EntityUid uid, DoorComponent door, ref GotEmaggedEvent args)
{ {

4
Content.Shared/Doors/Systems/SharedDoorSystem.cs
View File

@@ -212,9 +212,9 @@ public abstract class SharedDoorSystem : EntitySystem
if (!Resolve(uid, ref door)) if (!Resolve(uid, ref door))
return false; return false;
if (door.State == DoorState.Closed) if (door.State is DoorState.Closed or DoorState.Denying)
{ {
return TryOpen(uid, door, user, predicted); return TryOpen(uid, door, user, predicted, quiet: door.State == DoorState.Denying);
} }
else if (door.State == DoorState.Open) else if (door.State == DoorState.Open)
{ {