Merge remote-tracking branch 'refs/remotes/barotrauma/master'

Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/GUI/GUI.cs
	Subsurface/Source/GameMain.cs
	Subsurface/Source/GameSettings.cs
	Subsurface/Source/Items/CharacterInventory.cs
	Subsurface/Source/Items/Components/ItemComponent.cs
	Subsurface/Source/Items/Components/Machines/Pump.cs
	Subsurface/Source/Items/Components/Machines/Radar.cs
	Subsurface/Source/Items/Components/Machines/Steering.cs
	Subsurface/Source/Items/Components/Power/PowerContainer.cs
	Subsurface/Source/Items/Inventory.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Items/ItemSpawner.cs
	Subsurface/Source/Map/Levels/WaterRenderer.cs
	Subsurface/Source/Map/LinkedSubmarine.cs
	Subsurface/Source/Map/Map/Map.cs
	Subsurface/Source/Map/Structure.cs
	Subsurface/Source/Map/Submarine.cs
	Subsurface/Source/Map/WayPoint.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Physics/PhysicsBody.cs
	Subsurface/Source/Screens/GameScreen.cs

Subsurface/Source/Items/Components/Door.cs

@@ -56,10 +56,15 @@ namespace Barotrauma.Items.Components
             get
             {
                 if (linkedGap != null) return linkedGap;
+
                 foreach (MapEntity e in item.linkedTo)
                 {
-                    linkedGap = e as Gap;                    
-                    if (linkedGap != null) return linkedGap;
+                    linkedGap = e as Gap;
+                    if (linkedGap != null)
+                    {
+                        linkedGap.PassAmbientLight = window != Rectangle.Empty;
+                        return linkedGap;
+                    }
                 }
                 Rectangle rect = item.Rect;
                 if (isHorizontal)
@@ -75,6 +80,7 @@ namespace Barotrauma.Items.Components
 
                 linkedGap = new Gap(rect, Item.Submarine);
                 linkedGap.Submarine = item.Submarine;
+                linkedGap.PassAmbientLight = window != Rectangle.Empty;
                 linkedGap.Open = openState;
                 item.linkedTo.Add(linkedGap);
                 return linkedGap;
@@ -95,6 +101,11 @@ namespace Barotrauma.Items.Components
             }
         }
 
+        public Rectangle WindowRect
+        {
+            get { return window; }
+        }
+
         [Editable, HasDefaultValue(false, true)]
         public bool IsOpen
         {