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

Fixes some integration tests

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-06 16:40:04 +01:00
parent 0577f60df6
commit 8d4799e611
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Interaction/InteractionSystem.cs
View File

@@ -5,6 +5,7 @@ using System.Threading.Tasks;
using Content.Server.Administration.Logs;
using Content.Server.CombatMode;
using Content.Server.Hands.Components;
using Content.Server.Items;
using Content.Server.Pulling;
using Content.Server.Storage.Components;
using Content.Shared.ActionBlocker;
@@ -507,7 +508,7 @@ namespace Content.Server.Interaction
}
}
}
else if (!wideAttack && targetUid != default)
else if (!wideAttack && targetUid != default && _entityManager.HasComponent<ItemComponent>(targetUid))
{
// We pick up items if our hand is empty, even if we're in combat mode.
InteractHand(user, targetUid);