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

Aghost tweaks (#12373)

Browse Source
This commit is contained in:
Leon Friedrich
2022-11-04 12:40:01 +13:00
committed by GitHub
parent c0abea8047
commit af1b255524
6 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Strip/StrippableSystem.cs
View File

@@ -245,7 +245,12 @@ namespace Content.Server.Strip
return true;
}
var doAfterArgs = new DoAfterEventArgs(user, component.HandStripDelay, CancellationToken.None, component.Owner)
var userEv = new BeforeStripEvent(component.HandStripDelay);
RaiseLocalEvent(user, userEv);
var ev = new BeforeGettingStrippedEvent(userEv.Time, userEv.Stealth);
RaiseLocalEvent(component.Owner, ev);
var doAfterArgs = new DoAfterEventArgs(user, ev.Time, CancellationToken.None, component.Owner)
{
ExtraCheck = Check,
BreakOnStun = true,
@@ -292,9 +297,9 @@ namespace Content.Server.Strip
return false;
}
if (!_inventorySystem.CanUnequip(user, component.Owner, slot, out _))
if (!_inventorySystem.CanUnequip(user, component.Owner, slot, out var reason))
{
user.PopupMessageCursor(Loc.GetString("strippable-component-cannot-unequip-message", ("owner", component.Owner)));
user.PopupMessageCursor(reason);
return false;
}
@@ -376,7 +381,6 @@ namespace Content.Server.Strip
return true;
}
var userEv = new BeforeStripEvent(component.HandStripDelay);
RaiseLocalEvent(user, userEv);
var ev = new BeforeGettingStrippedEvent(userEv.Time, userEv.Stealth);