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

Fix master

Browse Source
This commit is contained in:
metalgearsloth
2021-10-04 01:29:50 +11:00
parent 4f70dc87f0
commit c8193ef393
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Cuffs/CuffableSystem.cs
View File

@@ -9,6 +9,7 @@ using JetBrains.Annotations;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Player;
namespace Content.Server.Cuffs namespace Content.Server.Cuffs
{ {
@@ -65,7 +66,7 @@ namespace Content.Server.Cuffs
} }
if (args.Cancelled) if (args.Cancelled)
{ {
_popupSystem.PopupEntity(Loc.GetString("cuffable-component-cannot-interact-message"), args.Target, _popupSystem.GetFilterFromEntity(userEntity)); _popupSystem.PopupEntity(Loc.GetString("cuffable-component-cannot-interact-message"), args.Target, Filter.Entities(userEntity.Uid));
} }
} }

3
Content.Server/Stack/StackSystem.cs
View File

@@ -8,6 +8,7 @@ using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Player;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
namespace Content.Server.Stack namespace Content.Server.Stack
@@ -94,7 +95,7 @@ namespace Content.Server.Stack
popupPos = args.User.Transform.Coordinates; popupPos = args.User.Transform.Coordinates;
} }
var filter = _popupSystem.GetFilterFromEntity(args.User); var filter = Filter.Entities(args.User.Uid);
switch (toTransfer) switch (toTransfer)
{ {