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/lights.xml

@@ -6,7 +6,7 @@
     name="Lamp"
     category="Electrical"
     Tags="smallitem"
-    pickdistance="150">
+    >
 
     <Sprite texture="lamp.png" sourcerect="0,0,16,32" depth="0.8"/>
 
@@ -26,7 +26,7 @@
     name="Emergency Light"
     category="Electrical"
     Tags="smallitem"
-    pickdistance="150">
+    >
 
     <Sprite texture="lamp.png" sourcerect="0,48,48,16" depth="0.8"/>