Merge remote-tracking branch 'upstream/master' into ups

Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs

@@ -227,7 +227,7 @@ public abstract class SharedStorageSystem : EntitySystem
 
         if (TryComp<VirtualItemComponent>(args.Used, out var virtualItem)) // WD
         {
-            RaiseLocalEvent(uid, new PseudoItemInteractEvent(virtualItem.BlockingEntity, args.User));
+            RaiseLocalEvent(uid, new PseudoItemInteractEvent(virtualItem.BlockingEntity, args.User, args.Used));
             return;
         }
 
@@ -517,6 +517,9 @@ public abstract class SharedStorageSystem : EntitySystem
         if (!ActionBlocker.CanInteract(player, itemEnt))
             return;
 
+        if (HasComp<PseudoItemComponent>(itemEnt)) // WD
+            return;
+
         TransformSystem.DropNextTo(itemEnt, player);
         Audio.PlayPredicted(storageComp.StorageRemoveSound, storageEnt, player);
     }
@@ -681,6 +684,8 @@ public abstract class SharedStorageSystem : EntitySystem
 
         foreach (var entity in entities.ToArray())
         {
+            if (HasComp<PseudoItemComponent>(entity)) // WD
+                continue;
             Insert(target, entity, out _, user: user, targetComp, playSound: false);
         }