Merge remote-tracking branch 'refs/remotes/barotrauma/master'

Conflicts:
	Subsurface/Barotrauma.csproj
	Subsurface/Source/Screens/GameScreen.cs

Subsurface/Source/Items/Components/Holdable/Pickable.cs

@@ -7,7 +7,7 @@ using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
-    class Pickable : ItemComponent, IDrawableComponent
+    class Pickable : ItemComponent
     {
         protected Character picker;
 
@@ -115,6 +115,13 @@ namespace Barotrauma.Items.Components
                     yield return CoroutineStatus.Success;
                 }
 
+
+                picker.UpdateHUDProgressBar(
+                    this,
+                    item.WorldPosition,
+                    pickTimer / requiredTime,
+                    Color.Red, Color.Green);
+
                 picker.AnimController.Anim = AnimController.Animation.UsingConstruction;
 
                 picker.AnimController.TargetMovement = Vector2.Zero;
@@ -165,23 +172,7 @@ namespace Barotrauma.Items.Components
                 }
             }            
         }
-
         
-        public void Draw(SpriteBatch spriteBatch, bool editing = false)
-        {
-            if (pickTimer <= 0.0f)
-            {
-                Drawable = false;
-                return;
-            }
-
-            float progressBarWidth = 100.0f;
-
-            GUI.DrawProgressBar(spriteBatch, item.DrawPosition + new Vector2(-progressBarWidth/2.0f, 50.0f), new Vector2(progressBarWidth, 15.0f), 
-                pickTimer / PickingTime,
-                Color.Lerp(Color.Red, Color.Green, pickTimer / PickingTime));
-        }
-
         public override void Drop(Character dropper)
         {            
             if (picker == null)