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

fix stripping (#5983)

Browse Source
This commit is contained in:
Leon Friedrich
2022-01-02 06:03:29 +13:00
committed by GitHub
parent 1b581f1a9b
commit 4acb8c12af
6 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Strip/StrippableComponent.cs
View File

@@ -116,7 +116,7 @@ namespace Content.Server.Strip
return false;
}
if (!invSystem.CanEquip(Owner, item.Owner, slot, out _))
if (!invSystem.CanEquip(user, Owner, item.Owner, slot, out _))
{
user.PopupMessageCursor(Loc.GetString("strippable-component-cannot-equip-message",("owner", Owner)));
return false;
@@ -141,7 +141,7 @@ namespace Content.Server.Strip
if (result != DoAfterStatus.Finished) return;
userHands.Drop(item!.Owner, false);
invSystem.TryEquip(Owner, item.Owner, slot);
invSystem.TryEquip(user, Owner, item.Owner, slot);
UpdateState();
}
@@ -258,7 +258,7 @@ namespace Content.Server.Strip
var result = await doAfterSystem.WaitDoAfter(doAfterArgs);
if (result != DoAfterStatus.Finished) return;
if (invSystem.TryGetSlotEntity(Owner, slot, out var item) && invSystem.TryUnequip(Owner, slot))
if (invSystem.TryGetSlotEntity(Owner, slot, out var item) && invSystem.TryUnequip(user, Owner, slot))
{
userHands.PutInHandOrDrop(item.Value);
}