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

Thieving gloves now actually hide stripping messages (#9933)

Browse Source 
* changed the description of thieving gloves

* fixed the strip/place popups not being hidden

* moved the ev.Stealth check

* Revert "changed the description of thieving gloves"

This reverts commit e0d242ddb8902873fbcd095a58e49641588414f5.

* Refactor/format

Co-authored-by: wrexbe <wrexbe@protonmail.com>
This commit is contained in:
Level10Cybermancer
2022-07-30 23:02:27 -07:00
committed by GitHub
parent b5de805083
commit f0d17e328c
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -293,7 +293,11 @@ namespace Content.Server.Strip
return;
}
var doAfterArgs = new DoAfterEventArgs(user, slotDef.StripTime, CancellationToken.None, component.Owner)
var ev = new BeforeStripEvent(slotDef.StripTime);
RaiseLocalEvent(user, ev);
var finalStripTime = ev.Time + ev.Additive;
var doAfterArgs = new DoAfterEventArgs(user, finalStripTime, CancellationToken.None, component.Owner)
{
ExtraCheck = Check,
BreakOnStun = true,
@@ -303,13 +307,11 @@ namespace Content.Server.Strip
NeedHand = true,
};
if (Check())
if (!ev.Stealth && Check() && userHands.ActiveHandEntity != null)
{
if (userHands.ActiveHandEntity != null)
{
_popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner-insert", ("user", Identity.Entity(user, EntityManager)), ("item", userHands.ActiveHandEntity)), component.Owner,
Filter.Entities(component.Owner), PopupType.Large);
}
var message = Loc.GetString("strippable-component-alert-owner-insert",
("user", Identity.Entity(user, EntityManager)), ("item", userHands.ActiveHandEntity));
_popupSystem.PopupEntity(message, component.Owner, Filter.Entities(component.Owner), PopupType.Large);
}
var result = await _doAfterSystem.WaitDoAfter(doAfterArgs);
@@ -430,16 +432,17 @@ namespace Content.Server.Strip
BreakOnUserMove = true,
};
if (Check())
if (!ev.Stealth && Check())
{
if (slotDef.StripHidden && !ev.Stealth)
if (slotDef.StripHidden)
{
_popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner-hidden", ("slot", slot)), component.Owner,
Filter.Entities(component.Owner), PopupType.Large);
else
}
else if (_inventorySystem.TryGetSlotEntity(component.Owner, slot, out var slotItem))
{
if (_inventorySystem.TryGetSlotEntity(component.Owner, slot, out var slotItem))
_popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner", ("user", Identity.Entity(user, EntityManager)), ("item", slotItem)), component.Owner,
Filter.Entities(component.Owner), PopupType.Large);
_popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner", ("user", Identity.Entity(user, EntityManager)), ("item", slotItem)), component.Owner,
Filter.Entities(component.Owner), PopupType.Large);
}
}