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/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.">