Vehicles (#7336)

2022-04-23 21:05:02 -04:00
parent 18220b6488
commit 98cd4fdb58
44 changed files with 1160 additions and 15 deletions
--- a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
+++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
@@ -336,10 +336,16 @@ namespace Content.Shared.Containers.ItemSlots
        {
            item = null;

+            /// This handles logic with the slot itself
            if (!CanEject(slot))
                return false;

            item = slot.Item;
+
+            /// This handles user logic
+            if (user != null && item != null && !_actionBlockerSystem.CanPickup(user.Value, item.Value))
+                return false;
+
            Eject(uid, slot, item!.Value, user, excludeUserAudio);
            return true;
        }