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/Weapons/depthcharge.xml

@@ -6,7 +6,7 @@
     focusonselected="true"
     offsetonselected="700"
     linkable="true"
-    pickdistance="150">
+    >
 
     <Sprite texture ="railgunetc.png" depth="0.01" sourcerect="64,180,47,76"/>
 
@@ -24,7 +24,7 @@
     name="Depth Charge Loader"
     category="Machine"
     linkable="true"
-    pickdistance="150">
+    >
 
     <Sprite texture="railgunetc.png" depth="0.8" sourcerect="0,160,61,96"/>
 
@@ -37,7 +37,7 @@
   <Item
     name="Depth Charge Shell"
     category="Misc"
-    pickdistance="150"
+    
     price="200">
 
     <Deconstruct time="10">
@@ -65,7 +65,7 @@
   <Item
     name="Nuclear Depth Charge"
     category="Misc"
-    pickdistance="150"
+    
     price="500">
 
     <Deconstruct time="20">

Barotrauma/BarotraumaShared/Content/Items/Weapons/explosives.xml

@@ -4,7 +4,7 @@
     name="C-4 Block"
     category="Equipment"
     Tags="smallitem,explosive"
-    pickdistance="150"
+    
     price="100">
 
     <Sprite texture="weapons.png"  depth="0.8" sourcerect="112,0,16,7"/>
@@ -22,7 +22,7 @@
     name="Compound N"
     category="Equipment"
     Tags="smallitem,explosive"
-    pickdistance="150">
+    >
 
     <Sprite texture="weapons.png"  depth="0.8" sourcerect="112,0,16,7"/>
 
@@ -40,7 +40,7 @@
     name="Volatile Compound N"
     category="Equipment"
     Tags="smallitem,explosive"
-    pickdistance="150">
+    >
 
     <Sprite texture="weapons.png"  depth="0.8" sourcerect="112,0,16,7"/>
 
@@ -60,7 +60,7 @@
     description="A compound made of C-4 and incendium."
     category="Equipment"
     Tags="smallitem,explosive"
-    pickdistance="150">
+    >
 
     <Sprite texture="weapons.png"  depth="0.8" sourcerect="112,0,16,7"/>
 
@@ -80,7 +80,7 @@
     description="A device that detonates any contained explosive when receiving a signal."
     category="Equipment"
     Tags="smallitem"
-    pickdistance="150"
+    
     price="50">
 
     <Sprite texture="weapons.png"  depth="0.8" sourcerect="112,7,16,9"/>
@@ -109,7 +109,7 @@
     description="A highly unstable liquid that may explode when subjected to heat or physical shock."
     spritecolor="1.0,1.0,1.0,1.0"
     Tags="smallitem,chem,medical"
-    pickdistance="150"
+    
     impacttolerance="4">
 
     <Sprite texture ="Content/Items/Medical/med.png" sourcerect="24,16,8,16" depth="0.6"/>

Barotrauma/BarotraumaShared/Content/Items/Weapons/railgun.xml

@@ -5,7 +5,7 @@
     focusonselected="true"
     offsetonselected="700"
     linkable="true"
-    pickdistance="150">
+    >
 
     <Sprite texture ="railgunbase.png" depth = "0.01"/>
 
@@ -30,7 +30,7 @@
     category="Machine"
     type="Controller"
     linkable="true"
-    pickdistance="150">
+    >
 
     <Sprite texture ="railgunetc.png" depth="0.8" sourcerect="182,0,61,97"/>
     
@@ -53,7 +53,7 @@
     name="Railgun Loader"
     category="Machine"
     linkable="true"
-    pickdistance="150">
+    >
 
     <Sprite texture ="railgunetc.png" depth="0.8" sourcerect="0,0,177,128"/>
 
@@ -67,7 +67,7 @@
   <Item
     name="Railgun Shell"
     category="Misc"
-    pickdistance="200"
+    
     price="200">
 
     <Deconstruct time="10">
@@ -98,7 +98,7 @@
   <Item
     name="Nuclear Shell"
     category="Misc"
-    pickdistance="200"
+    
     price="500">
 
     <Deconstruct time="10">

Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml

@@ -4,7 +4,7 @@
   <Item
     name="Spear"
     category="Equipment"
-    pickdistance="200"
+    
     pickthroughwalls="true"
     price="50">
 
@@ -25,7 +25,7 @@
   <Item
     name="Harpoon Gun"
     category="Equipment"
-    pickdistance="200"
+    
     price="500"
     tags="weapon">
 
@@ -57,7 +57,7 @@
   <Item
     name="Stun Grenade"
     category="Equipment"
-    pickdistance="200"
+    
     price="200"
     tags="smallitem,weapon">
 
@@ -75,7 +75,7 @@
   <Item
     name="Incendium Grenade"
     category="Equipment"
-    pickdistance="200"
+    
     tags="smallitem,weapon">
 
     <Sprite texture="weapons.png" sourcerect="98,0,11,24" depth="0.55"/>
@@ -94,7 +94,7 @@
     name="Stun Baton"
     category="Equipment"
     Tags="smallitem,weapon"
-    pickdistance="150"
+    
     price="100"
     description="If verbal orders are insufficient, a high-voltage shock from a Stun Baton may be enough to beat an unruly crew member into submission.">
 
@@ -129,7 +129,7 @@
   <Item
     name="Battery Cell"
     category="Equipment,Electrical"
-    pickdistance="150"
+    
     tags="smallitem,loadable"
     price="50"
     description="Used as a power source for various handheld devices. Most submarines have several stationary backup batteries with recharge docks for battery cells.">
@@ -150,7 +150,7 @@
   <Item
     name="Fulgurium Battery Cell"
     category="Equipment,Electrical"
-    pickdistance="150"
+    
     tags="smallitem,loadable"
     description="A battery cell contructed of the rare and poorly understood compound Fulgurium.">
 
@@ -170,7 +170,7 @@
   <Item
     name="Bike Horn"
     category="Equipment"
-    pickdistance="200"
+    
     tags="weapon,smallitem"
     description="HONK">