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

Door opening tweaks (#16799)

Browse Source
This commit is contained in:
metalgearsloth
2023-06-13 20:30:04 +10:00
committed by GitHub
parent 8fd8b878bf
commit c24c6e93ec
5 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,6 +57,7 @@ public abstract class SharedDoorSystem : EntitySystem
SubscribeLocalEvent<DoorComponent, ComponentGetState>(OnGetState);
SubscribeLocalEvent<DoorComponent, ComponentHandleState>(OnHandleState);
SubscribeLocalEvent<DoorComponent, InteractedNoHandEvent>(OnInteractedNoHand);
SubscribeLocalEvent<DoorComponent, ActivateInWorldEvent>(OnActivate);
SubscribeLocalEvent<DoorComponent, StartCollideEvent>(HandleCollide);
@@ -179,9 +180,22 @@ public abstract class SharedDoorSystem : EntitySystem
#endregion
#region Interactions
protected virtual void OnActivate(EntityUid uid, DoorComponent door, ActivateInWorldEvent args)
private void OnInteractedNoHand(EntityUid uid, DoorComponent component, InteractedNoHandEvent args)
{
// avoid client-mispredicts, as the server will definitely handle this event
if (args.Handled || !component.ClickOpen || !Tags.HasTag(args.User, "DoorBumpOpener"))
return;
TryToggleDoor(uid, component, args.User, predicted: true);
args.Handled = true;
}
public void OnActivate(EntityUid uid, DoorComponent door, ActivateInWorldEvent args)
{
if (args.Handled || !door.ClickOpen)
return;
TryToggleDoor(uid, door, args.User, predicted: true);
args.Handled = true;
}