Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git

Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs

@@ -390,7 +390,7 @@ namespace Barotrauma.Items.Components
             IsActive = isActive;
         }
 
-        public void SetRequiredItems(ContentXElement element)
+        public void SetRequiredItems(ContentXElement element, bool allowEmpty = false)
         {
             bool returnEmpty = false;
 #if CLIENT
@@ -412,13 +412,13 @@ namespace Barotrauma.Items.Components
                     requiredItems[ri.Type].Add(ri);
                 }
             }
-            else
+            else if (!allowEmpty)
             {
                 DebugConsole.ThrowError("Error in item config \"" + item.ConfigFilePath + "\" - component " + GetType().ToString() + " requires an item with no identifiers.");
             }
         }
 
-        public virtual void Move(Vector2 amount) { }
+        public virtual void Move(Vector2 amount, bool ignoreContacts = false) { }
 
         /// <summary>a Character has picked the item</summary>
         public virtual bool Pick(Character picker)