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/Electricity/poweritems.xml

@@ -4,7 +4,7 @@
     name="Junction Box"
     category="Electrical"
     linkable="true"
-    pickdistance="150"
+    
     description="Serves as a hub for power distribution and relaying signals between devices.">
     
     <Sprite texture="junctionbox.png" depth="0.8" canflipx="false"/>
@@ -40,7 +40,7 @@
     name="Battery"
     category="Electrical"
     linkable="true"
-    pickdistance="150"
+    
     description="Generally used for storing backup power in case of a reactor failure.">
 
     <Sprite texture ="battery.png" depth="0.8"/>
@@ -68,7 +68,7 @@
     name="Supercapacitor"
     category="Electrical"
     linkable="true"
-    pickdistance="150"
+    
     description="Can deliver charge much faster than batteries.">
 
     <Sprite texture ="supercapacitor.png" depth="0.8"/>