Merge branch 'master' into dedicated-server

# Conflicts: # BarotraumaClient/Source/GameSettings.cs # BarotraumaClient/Source/Screens/NetLobbyScreen.cs
2017-06-23 10:21:02 -03:00
parent 3b343899c0 5d5923ab28
commit 1dc255bc2f
16 changed files with 288 additions and 92 deletions
@@ -70,11 +70,9 @@ namespace Barotrauma.Items.Components
            {
                return OnPicked(picker);
            }
-
-
        }

-        private bool OnPicked(Character picker)
+        protected virtual bool OnPicked(Character picker)
        {
            if (picker.Inventory.TryPutItem(item, allowedSlots))
            {