Skip to content

Commit 22938a9

Browse files
authored
Allow strip removing items if you're holding something (space-wizards#32750)
You were already able to strip more items at once from somebody than you could hold, and they would drop to the floor. This matched the behavior in SS13. Annoyingly, however, you were not allowed to *start* a stripping action if you're holding something. This just feels like an annoying paper cut, so this is no longer a thing.
1 parent 091e4c1 commit 22938a9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

‎Content.Shared/Strip/SharedStrippableSystem.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ private void OnStripButtonPressed(Entity<StrippableComponent> strippable, ref St
103103

104104
if (userHands.ActiveHandEntity != null && !hasEnt)
105105
StartStripInsertInventory((user, userHands), strippable.Owner, userHands.ActiveHandEntity.Value, args.Slot);
106-
else if (userHands.ActiveHandEntity == null && hasEnt)
106+
else if (hasEnt)
107107
StartStripRemoveInventory(user, strippable.Owner, held!.Value, args.Slot);
108108
}
109109

@@ -135,7 +135,7 @@ private void StripHand(
135135

136136
if (user.Comp.ActiveHandEntity != null && handSlot.HeldEntity == null)
137137
StartStripInsertHand(user, target, user.Comp.ActiveHandEntity.Value, handId, targetStrippable);
138-
else if (user.Comp.ActiveHandEntity == null && handSlot.HeldEntity != null)
138+
else if (handSlot.HeldEntity != null)
139139
StartStripRemoveHand(user, target, handSlot.HeldEntity.Value, handId, targetStrippable);
140140
}
141141

0 commit comments

Comments
 (0)