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

Fix strippable text var (#8302)

Browse Source
This commit is contained in:
Morbo
2022-05-20 12:42:24 +03:00
committed by GitHub
parent 05325d669c
commit 4576c3a934
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -261,13 +261,13 @@ namespace Content.Server.Strip
if (_inventorySystem.TryGetSlotEntity(component.Owner, slot, out _)) if (_inventorySystem.TryGetSlotEntity(component.Owner, slot, out _))
{ {
user.PopupMessageCursor(Loc.GetString("strippable-component-item-slot-occupied",("uid", component.Owner))); user.PopupMessageCursor(Loc.GetString("strippable-component-item-slot-occupied",("owner", component.Owner)));
return false; return false;
} }
if (!_inventorySystem.CanEquip(user, component.Owner, held, slot, out _)) if (!_inventorySystem.CanEquip(user, component.Owner, held, slot, out _))
{ {
user.PopupMessageCursor(Loc.GetString("strippable-component-cannot-equip-message",("uid", component.Owner))); user.PopupMessageCursor(Loc.GetString("strippable-component-cannot-equip-message",("owner", component.Owner)));
return false; return false;
} }
@@ -321,7 +321,7 @@ namespace Content.Server.Strip
if (!hands.Hands.TryGetValue(handName, out var hand) if (!hands.Hands.TryGetValue(handName, out var hand)
|| !_handsSystem.CanPickupToHand(component.Owner, userHands.ActiveHandEntity.Value, hand, checkActionBlocker: false, hands)) || !_handsSystem.CanPickupToHand(component.Owner, userHands.ActiveHandEntity.Value, hand, checkActionBlocker: false, hands))
{ {
user.PopupMessageCursor(Loc.GetString("strippable-component-cannot-put-message",("uid", component.Owner))); user.PopupMessageCursor(Loc.GetString("strippable-component-cannot-put-message",("owner", component.Owner)));
return false; return false;
} }
@@ -361,13 +361,13 @@ namespace Content.Server.Strip
if (!_inventorySystem.TryGetSlotEntity(component.Owner, slot, out _)) if (!_inventorySystem.TryGetSlotEntity(component.Owner, slot, out _))
{ {
user.PopupMessageCursor(Loc.GetString("strippable-component-item-slot-free-message", ("uid", component.Owner))); user.PopupMessageCursor(Loc.GetString("strippable-component-item-slot-free-message", ("owner", component.Owner)));
return false; return false;
} }
if (!_inventorySystem.CanUnequip(user, component.Owner, slot, out _)) if (!_inventorySystem.CanUnequip(user, component.Owner, slot, out _))
{ {
user.PopupMessageCursor(Loc.GetString("strippable-component-cannot-unequip-message", ("uid", component.Owner))); user.PopupMessageCursor(Loc.GetString("strippable-component-cannot-unequip-message", ("owner", component.Owner)));
return false; return false;
} }
@@ -409,7 +409,7 @@ namespace Content.Server.Strip
{ {
if (!hands.Hands.TryGetValue(handName, out var hand) || hand.HeldEntity == null) if (!hands.Hands.TryGetValue(handName, out var hand) || hand.HeldEntity == null)
{ {
user.PopupMessageCursor(Loc.GetString("strippable-component-item-slot-free-message",("uid", component.Owner))); user.PopupMessageCursor(Loc.GetString("strippable-component-item-slot-free-message",("owner", component.Owner)));
return false; return false;
} }
@@ -418,7 +418,7 @@ namespace Content.Server.Strip
if (!_handsSystem.CanDropHeld(component.Owner, hand, false)) if (!_handsSystem.CanDropHeld(component.Owner, hand, false))
{ {
user.PopupMessageCursor(Loc.GetString("strippable-component-cannot-drop-message",("uid", component.Owner))); user.PopupMessageCursor(Loc.GetString("strippable-component-cannot-drop-message",("owner", component.Owner)));
return false; return false;
} }