Attachable items aren't automatically attached when loading a sub in edit screen, bunch of new item sprites, Aegir Mark II, client reconnect bugfixes

Subsurface/Source/Screens/EditMapScreen.cs

@@ -120,6 +120,7 @@ namespace Subsurface
                 {
                     GUIImage img = new GUIImage(new Rectangle(0, 0, 40, 40), ep.sprite, Alignment.Left, frame);
                     img.Scale = Math.Min(Math.Min(40.0f / img.SourceRect.Width, 40.0f / img.SourceRect.Height), 1.0f);
+                    img.Color = ep.SpriteColor;
                 }
             }
         }

Subsurface/Source/Screens/LobbyScreen.cs

@@ -11,25 +11,25 @@ namespace Subsurface
     {
         enum PanelTab { Crew = 0, Map = 1, CurrentLocation = 2, Store = 3 }
 
-        GUIFrame leftPanel;
-        GUIFrame[] rightPanel;
+        private GUIFrame leftPanel;
+        private GUIFrame[] rightPanel;
 
-        GUIButton startButton;
+        private GUIButton startButton;
 
-        int selectedRightPanel;
+        private int selectedRightPanel;
 
-        GUIListBox characterList;
-        GUIListBox hireList;
+        private GUIListBox characterList;
+        private GUIListBox hireList;
 
-        GUIListBox selectedItemList, itemList;
+        private GUIListBox selectedItemList, itemList;
 
-        SinglePlayerMode gameMode;
+        private SinglePlayerMode gameMode;
 
-        GUIFrame previewFrame;
+        private GUIFrame previewFrame;
 
-        GUIButton buyButton;
+        private GUIButton buyButton;
 
-        Level selectedLevel;
+        private Level selectedLevel;
 
         float mapZoom = 3.0f;
 
@@ -271,6 +271,7 @@ namespace Subsurface
             if (ep.sprite != null)
             {
                 GUIImage img = new GUIImage(new Rectangle(0, 0, 40, 40), ep.sprite, Alignment.Left, frame);
+                img.Color = ep.SpriteColor;
                 img.Scale = Math.Min(Math.Min(40.0f / img.SourceRect.Width, 40.0f / img.SourceRect.Height), 1.0f);
             }
         }
@@ -373,8 +374,25 @@ namespace Subsurface
 
         public bool SelectRightPanel(GUIButton button, object selection)
         {
-            try { selectedRightPanel = (int)selection; }
+            try 
+            { 
+                selectedRightPanel =  (int)selection;                
+            }
             catch { return false; }
+
+
+            if (button != null)
+            {
+                button.Selected = true;
+                foreach (GUIComponent child in leftPanel.children)
+                {
+                    GUIButton otherButton = child as GUIButton;
+                    if (otherButton == null || otherButton == button) continue;
+
+                    otherButton.Selected = false;
+                }
+            }
+
             return true;
         }
         

Subsurface/Source/Screens/MainMenuScreen.cs

@@ -157,7 +157,8 @@ namespace Subsurface
         {
             base.Select();
 
-            selectedTab = 0;
+            SelectTab(null, 0);
+            //selectedTab = 0;
         }
         
         public bool SelectTab(GUIButton button, object obj)

Subsurface/Source/Screens/NetLobbyScreen.cs

@@ -421,7 +421,6 @@ namespace Subsurface
             return true;
         }
 
-
         public void AddPlayer(Client client)
         {
             GUITextBlock textBlock = new GUITextBlock(
@@ -433,6 +432,17 @@ namespace Subsurface
             textBlock.UserData = client;          
         }
 
+        public void RemovePlayer(int clientID)
+        {
+            GUIComponent child = playerList.children.Find(c =>
+                {
+                    Client client = c.UserData as Client;
+                    return (client.ID == clientID);
+                });
+
+            if (child != null) playerList.RemoveChild(child);
+        }
+
         public void RemovePlayer(Client client)
         {
             if (client == null) return;