Merge branch 'master' into new-netcode

Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/Items/Components/Door.cs
	Subsurface/Source/Items/Components/Power/PowerContainer.cs
	Subsurface/Source/Items/Components/Signal/Wire.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/ChatMessage.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Networking/GameServerLogin.cs
	Subsurface/Source/Networking/GameServerSettings.cs
	Subsurface/Source/Networking/NetworkMember.cs

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

@@ -102,10 +102,8 @@ namespace Barotrauma.Items.Components
             var leftHand = picker.AnimController.GetLimb(LimbType.LeftHand);
             var rightHand = picker.AnimController.GetLimb(LimbType.RightHand);
 
-            Drawable = true;
-
             pickTimer = 0.0f;
-            while (pickTimer < requiredTime)
+            while (pickTimer < requiredTime && Screen.Selected != GameMain.EditMapScreen)
             {
                 if (picker.IsKeyDown(InputType.Aim) || 
                     !item.IsInPickRange(picker.WorldPosition) ||
@@ -115,7 +113,6 @@ namespace Barotrauma.Items.Components
                     yield return CoroutineStatus.Success;
                 }
 
-
                 picker.UpdateHUDProgressBar(
                     this,
                     item.WorldPosition,
@@ -148,8 +145,6 @@ namespace Barotrauma.Items.Components
 
         private void StopPicking(Character picker)
         {
-            Drawable = false;
-
             picker.AnimController.Anim = AnimController.Animation.None;
             pickTimer = 0.0f;         
         }