Merge branch 'master' of https://github.com/Faerdan/Barotrauma into Faerdan-master

Conflicts:
	Barotrauma/BarotraumaClient/Source/Map/MapEntity.cs
	Barotrauma/BarotraumaClient/Source/Screens/GameScreen.cs
	Barotrauma/BarotraumaShared/Source/Characters/Character.cs
	Barotrauma/BarotraumaShared/Source/Items/Item.cs

Barotrauma/BarotraumaShared/Content/Items/Jobgear/captaingear.xml

@@ -2,7 +2,7 @@
   <Item
     name="Captain's Cap"
     category="Equipment"
-    pickdistance="150"
+    
     tags="smallitem"
     description="A token of the Captain's unquestionable authority.">
 
@@ -18,7 +18,7 @@
   <Item
     name="Captain's Jacket"
     category="Equipment"
-    pickdistance="150"
+    
     tags="smallitem">
 
     <Sprite texture ="captainLegs.png" sourcerect="0,49,52,17" depth="0.6"/>
@@ -39,7 +39,7 @@
   <Item
     name="Captain's Trousers"
     category="Equipment"
-    pickdistance="150"
+    
     tags="smallitem">
 
     <Sprite texture ="captainLegs.png" sourcerect="0,67,51,13" depth="0.6"/>

Barotrauma/BarotraumaShared/Content/Items/Jobgear/doctorgear.xml

@@ -2,7 +2,7 @@
   <Item
     name="Health Scanner HUD"
     category="Equipment"
-    pickdistance="150"
+    
     tags="smallitem"
     description="A heads-up display that displays information of the vital signs and status of nearby humans.">
 
@@ -20,7 +20,7 @@
   <Item
     name="Doctor's Coat"
     category="Equipment"
-    pickdistance="150"
+    
     tags="smallitem">
 
     <Sprite texture ="doctorgear.png" sourcerect="75,0,53,18" depth="0.6"/>
@@ -45,7 +45,7 @@
   <Item
     name="Doctor's Trousers"
     category="Equipment"
-    pickdistance="150"
+    
     tags="smallitem">
 
     <Sprite texture ="doctorgear.png" sourcerect="76,19,51,13" depth="0.6"/>

Barotrauma/BarotraumaShared/Content/Items/Jobgear/engigear.xml

@@ -2,7 +2,7 @@
   <Item
     name="Orange Jumpsuit"
     category="Equipment"
-    pickdistance="150"
+    
     tags="smallitem"
     fireproof="true"
     description="The fire-resistant fabric offers some protection against fires. Plenty of pockets for carrying any extra gear an engineer might need.">
@@ -30,7 +30,7 @@
   <Item
     name="Blue Jumpsuit"
     category="Equipment"
-    pickdistance="150"
+    
     tags="smallitem"
     fireproof="true"
     description="The fire-resistant fabric offers some protection against fires. Plenty of pockets for carrying any extra gear a mechanic might need.">

Barotrauma/BarotraumaShared/Content/Items/Jobgear/misc.xml

@@ -2,7 +2,7 @@
   <Item
     name="Headset"
     category="Equipment"
-    pickdistance="150"
+    
     tags="smallitem"
     description="Allows remote communication between the crew.">
 
@@ -28,7 +28,7 @@
   <Item
     name="Clown Mask"
     category="Equipment"
-    pickdistance="150"
+    
     tags="smallitem"
     description="Praise the honkmother.">
 
@@ -44,7 +44,7 @@
   <Item
     name="Clown Costume"
     category="Equipment"
-    pickdistance="150"
+    
     tags="smallitem"
     description="Praise the honkmother.">
 

Barotrauma/BarotraumaShared/Content/Items/Jobgear/securitygear.xml

@@ -2,7 +2,7 @@
   <Item
     name="Body Armor"
     category="Equipment"
-    pickdistance="150"
+    
     tags="smallitem"
     description="While the body armor won't offer adequate protection against most of the inhabitants of the subsurface ocean, it can be extremely useful if there are traitors on board.">
 
@@ -20,7 +20,7 @@
   <Item
     name="Ballistic Helmet"
     category="Equipment"
-    pickdistance="150"
+    
     tags="smallitem"
     description="While the helmet won't offer adequate protection against most of the inhabitants of the subsurface ocean, it can be extremely useful if there are traitors on board.">
 
@@ -41,7 +41,7 @@
   <Item
     name="Handcuffs"
     category="Equipment"
-    pickdistance="150"
+    
     tags="smallitem" >
 
     <Sprite texture = "securitygear.png" sourcerect="0,63,32,14" depth="0.6"/>