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

Let entities attack their outermost container (#13406)

Browse Source 
Closes https://github.com/space-wizards/space-station-14/issues/13405
closes https://github.com/space-wizards/space-station-14/issues/13403
This commit is contained in:
Rane
2023-01-20 10:48:28 -05:00
committed by GitHub
parent f0429edbb1
commit 943495922a
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Shared/ActionBlocker/ActionBlockerSystem.cs
View File

@@ -146,7 +146,8 @@ namespace Content.Shared.ActionBlocker
public bool CanAttack(EntityUid uid, EntityUid? target = null)
{
if (_container.IsEntityInContainer(uid))
_container.TryGetOuterContainer(uid, Transform(uid), out var outerContainer);
if (target != null && target != outerContainer?.Owner && _container.IsEntityInContainer(uid))
{
var containerEv = new CanAttackFromContainerEvent(uid, target);
RaiseLocalEvent(uid, containerEv);