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/Reactor/reactor.xml

@@ -55,7 +55,7 @@
   <Item
     name="Fuel Rod"
     Tags="smallitem"
-    pickdistance="150"
+    
     price="200">
 
     <Deconstruct time="10">
@@ -73,7 +73,7 @@
   <Item
     name="Incendium Fuel Rod"
     Tags="smallitem"
-    pickdistance="150"
+    
     spritecolor="0.5,0.0,0.0,1.0">
 
     <Deconstruct time="10">
@@ -92,7 +92,7 @@
   <Item
     name="Heat Absorber"
     Tags="smallitem"
-    pickdistance="150">
+    >
 
     <Sprite texture ="heatabsorber.png"/>