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

no use in pocket (#17785)

Browse Source
This commit is contained in:
LankLTE
2023-07-03 14:36:59 -07:00
committed by GitHub
parent e9665f2a44
commit 48f29cbbf7
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/Blocking/BlockingSystem.cs
View File

@@ -161,6 +161,13 @@ public sealed partial class BlockingSystem : EntitySystem
return false; return false;
} }
// Don't allow someone to block if they're not holding the shield
if(!_handsSystem.IsHolding(user, item, out _))
{
CantBlockError(user);
return false;
}
//Don't allow someone to block if someone else is on the same tile //Don't allow someone to block if someone else is on the same tile
var playerTileRef = xform.Coordinates.GetTileRef(); var playerTileRef = xform.Coordinates.GetTileRef();
if (playerTileRef != null) if (playerTileRef != null)