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

fixes stripping of stunned/dead people

Browse Source 
fixes magboots alert
This commit is contained in:
Paul Ritter
2021-12-31 10:41:08 +01:00
parent a3e7bdea42
commit c5a3515322
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Clothing/MagbootsSystem.cs
View File

@@ -52,7 +52,7 @@ namespace Content.Server.Clothing
{ {
if (args.Slot == "shoes") if (args.Slot == "shoes")
{ {
UpdateMagbootEffects(args.Equipee, uid, true, component); UpdateMagbootEffects(args.Equipee, uid, false, component);
} }
} }
@@ -60,7 +60,7 @@ namespace Content.Server.Clothing
{ {
if (args.Slot == "shoes") if (args.Slot == "shoes")
{ {
UpdateMagbootEffects(args.Equipee, uid, false, component); UpdateMagbootEffects(args.Equipee, uid, true, component);
} }
} }

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

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