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

hands ECS (#7081)

Browse Source
This commit is contained in:
Leon Friedrich
2022-03-17 20:13:31 +13:00
committed by GitHub
parent 7b84362901
commit bfd95c493b
94 changed files with 1454 additions and 2185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,17 +76,15 @@ namespace Content.Server.Strip
if (TryComp(uid, out HandsComponent? handsComp))
{
foreach (var hand in handsComp.HandNames)
foreach (var hand in handsComp.Hands.Values)
{
var owner = handsComp.GetItem(hand)?.Owner;
if (!owner.HasValue || HasComp<HandVirtualItemComponent>(owner.Value))
if (hand.HeldEntity == null || HasComp<HandVirtualItemComponent>(hand.HeldEntity))
{
hands[hand] = "None";
hands[hand.Name] = "None";
continue;
}
hands[hand] = Name(owner.Value);
hands[hand.Name] = Name(hand.HeldEntity.Value);
}
}