diff --git a/Content.Shared/Interaction/BeforeInteract.cs b/Content.Shared/Interaction/BeforeInteract.cs index 2c8bb5ca83..0c36682d48 100644 --- a/Content.Shared/Interaction/BeforeInteract.cs +++ b/Content.Shared/Interaction/BeforeInteract.cs @@ -15,16 +15,31 @@ namespace Content.Shared.Interaction /// public IEntity User { get; } + /// + /// Entity that triggered the interaction. + /// + public EntityUid UserUid => User.Uid; + /// /// Entity that the user used to interact. /// public IEntity Used { get; } + /// + /// Entity that the user used to interact. + /// + public EntityUid UsedUid => Used.Uid; + /// /// Entity that was interacted on. This can be null if the attack did not click on an entity. /// public IEntity? Target { get; } + /// + /// Entity that was interacted on. This can be null if the attack did not click on an entity. + /// + public EntityUid? TargetUid => Target?.Uid; + /// /// Location that the user clicked outside of their interaction range. /// diff --git a/Content.Shared/Interaction/IActivate.cs b/Content.Shared/Interaction/IActivate.cs index 5719b8b4d1..7a0ffa6541 100644 --- a/Content.Shared/Interaction/IActivate.cs +++ b/Content.Shared/Interaction/IActivate.cs @@ -45,11 +45,21 @@ namespace Content.Shared.Interaction /// public IEntity User { get; } + /// + /// Entity that activated the target world entity. + /// + public EntityUid UserUid => User.Uid; + /// /// Entity that was activated in the world. /// public IEntity Target { get; } + /// + /// Entity that was activated in the world. + /// + public EntityUid TargetUid => Target.Uid; + public ActivateInWorldEvent(IEntity user, IEntity target) { User = user; diff --git a/Content.Shared/Interaction/IAfterInteract.cs b/Content.Shared/Interaction/IAfterInteract.cs index a9d12a0b7e..4ae86e6f05 100644 --- a/Content.Shared/Interaction/IAfterInteract.cs +++ b/Content.Shared/Interaction/IAfterInteract.cs @@ -56,16 +56,31 @@ namespace Content.Shared.Interaction /// public IEntity User { get; } + /// + /// Entity that triggered the interaction. + /// + public EntityUid UserUid => User.Uid; + /// /// Entity that the user used to interact. /// public IEntity Used { get; } + /// + /// Entity that the user used to interact. + /// + public EntityUid UsedUid => Used.Uid; + /// /// Entity that was interacted on. This can be null if the attack did not click on an entity. /// public IEntity? Target { get; } + /// + /// Entity that was interacted on. This can be null if the attack did not click on an entity. + /// + public EntityUid? TargetUid => Target?.Uid; + /// /// Location that the user clicked outside of their interaction range. /// diff --git a/Content.Shared/Interaction/IDropped.cs b/Content.Shared/Interaction/IDropped.cs index b1daed20fc..613853cb9c 100644 --- a/Content.Shared/Interaction/IDropped.cs +++ b/Content.Shared/Interaction/IDropped.cs @@ -39,11 +39,21 @@ namespace Content.Shared.Interaction /// public IEntity User { get; } + /// + /// Entity that dropped the item. + /// + public EntityUid UserUid => User.Uid; + /// /// Item that was dropped. /// public IEntity Dropped { get; } + /// + /// Item that was dropped. + /// + public EntityUid DroppedUid => Dropped.Uid; + /// /// If the item was dropped intentionally. /// diff --git a/Content.Shared/Interaction/IInteractHand.cs b/Content.Shared/Interaction/IInteractHand.cs index 5fea0adefb..99fcd25527 100644 --- a/Content.Shared/Interaction/IInteractHand.cs +++ b/Content.Shared/Interaction/IInteractHand.cs @@ -42,11 +42,21 @@ namespace Content.Shared.Interaction /// public IEntity User { get; } + /// + /// Entity that triggered the interaction. + /// + public EntityUid UserUid => User.Uid; + /// /// Entity that was interacted on. /// public IEntity Target { get; } + /// + /// Entity that was interacted on. + /// + public EntityUid TargetUid => Target.Uid; + public InteractHandEvent(IEntity user, IEntity target) { User = user; diff --git a/Content.Shared/Interaction/IInteractUsing.cs b/Content.Shared/Interaction/IInteractUsing.cs index 838039a8d6..e220e1538e 100644 --- a/Content.Shared/Interaction/IInteractUsing.cs +++ b/Content.Shared/Interaction/IInteractUsing.cs @@ -55,16 +55,31 @@ namespace Content.Shared.Interaction /// public IEntity User { get; } + /// + /// Entity that triggered the interaction. + /// + public EntityUid UserUid => User.Uid; + /// /// Entity that the user used to interact. /// public IEntity Used { get; } + /// + /// Entity that the user used to interact. + /// + public EntityUid UsedUid => Used.Uid; + /// /// Entity that was interacted on. /// public IEntity Target { get; } + /// + /// Entity that was interacted on. + /// + public EntityUid TargetUid => Target.Uid; + /// /// The original location that was clicked by the user. /// diff --git a/Content.Shared/Interaction/IRangedInteract.cs b/Content.Shared/Interaction/IRangedInteract.cs index 0e54a3ccbb..45a3e17e1c 100644 --- a/Content.Shared/Interaction/IRangedInteract.cs +++ b/Content.Shared/Interaction/IRangedInteract.cs @@ -46,16 +46,31 @@ namespace Content.Shared.Interaction /// public IEntity User { get; } + /// + /// Entity that triggered the interaction. + /// + public EntityUid UserUid => User.Uid; + /// /// Entity that the user used to interact. /// public IEntity Used { get; } + /// + /// Entity that the user used to interact. + /// + public EntityUid UsedUid => Used.Uid; + /// /// Entity that was interacted on. /// public IEntity Target { get; } + /// + /// Entity that was interacted on. + /// + public EntityUid TargetUid => Target.Uid; + /// /// Location that the user clicked outside of their interaction range. /// diff --git a/Content.Shared/Interaction/IUse.cs b/Content.Shared/Interaction/IUse.cs index 02dc8ab8b3..650bf51b8e 100644 --- a/Content.Shared/Interaction/IUse.cs +++ b/Content.Shared/Interaction/IUse.cs @@ -41,11 +41,21 @@ namespace Content.Shared.Interaction /// public IEntity User { get; } + /// + /// Entity holding the item in their hand. + /// + public EntityUid UserUid => User.Uid; + /// /// Item that was used. /// public IEntity Used { get; } + /// + /// Item that was used. + /// + public EntityUid UsedUid => Used.Uid; + public UseInHandEvent(IEntity user, IEntity used) { User = user;