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

Decouple interactions from hands, cleanup old events, add new fears (#28393)

Browse Source 
* ok basic shit

* second part

* pretend it isn't real it can't hurt you.

* 👁️ 👁️

* shadowcommander review
This commit is contained in:
Nemanja
2024-05-31 16:26:19 -04:00
committed by GitHub
parent c4291920a6
commit a1a8f04036
72 changed files with 312 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
View File

@@ -40,7 +40,7 @@ public sealed class MechGrabberSystem : EntitySystem
SubscribeLocalEvent<MechGrabberComponent, MechEquipmentRemovedEvent>(OnEquipmentRemoved);
SubscribeLocalEvent<MechGrabberComponent, AttemptRemoveMechEquipmentEvent>(OnAttemptRemove);
SubscribeLocalEvent<MechGrabberComponent, InteractNoHandEvent>(OnInteract);
SubscribeLocalEvent<MechGrabberComponent, UserActivateInWorldEvent>(OnInteract);
SubscribeLocalEvent<MechGrabberComponent, GrabberDoAfterEvent>(OnMechGrab);
}
@@ -123,10 +123,11 @@ public sealed class MechGrabberSystem : EntitySystem
args.States.Add(GetNetEntity(uid), state);
}
private void OnInteract(EntityUid uid, MechGrabberComponent component, InteractNoHandEvent args)
private void OnInteract(EntityUid uid, MechGrabberComponent component, UserActivateInWorldEvent args)
{
if (args.Handled || args.Target is not {} target)
if (args.Handled)
return;
var target = args.Target;
if (args.Target == args.User || component.DoAfter != null)
return;