Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix being able to do most verbs from within a container (#1613)

Browse Source 
* Fix being able to do most verbs from within a container

* Fix missing container check when using global verbs
This commit is contained in:
DrSmugleaf
2020-08-15 20:38:37 +02:00
committed by GitHub
parent f37d6343ce
commit add4986001
7 changed files with 77 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/GameObjects/Verbs/GlobalVerb.cs
View File

@@ -20,6 +20,12 @@ namespace Content.Shared.GameObjects.Verbs
/// </summary>
public virtual bool RequireInteractionRange => true;
/// <summary>
/// If true, this verb requires both the user and the entity on which
/// this verb resides to be in the same container or no container.
/// </summary>
public virtual bool BlockedByContainers => true;
/// <summary>
/// Gets the visible verb data for the user.
/// </summary>

6
Content.Shared/GameObjects/Verbs/Verb.cs
View File

@@ -20,6 +20,12 @@ namespace Content.Shared.GameObjects.Verbs
/// </summary>
public virtual bool RequireInteractionRange => true;
/// <summary>
/// If true, this verb requires both the user and the entity on which
/// this verb resides to be in the same container or no container.
/// </summary>
public virtual bool BlockedByContainers => true;
/// <summary>
/// Gets the visible verb data for the user.
/// </summary>