From c0edf2aeedb0e5c115ef6287302f8abb727352fb Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Wed, 8 May 2019 23:19:17 +0200
Subject: [PATCH 01/12] Clean up NanoStyle:

1. Run code formatting.
2. Condense some rules down.
---
 Content.Client/UserInterface/NanoStyle.cs | 57 +++++++++--------------
 1 file changed, 23 insertions(+), 34 deletions(-)

diff --git a/Content.Client/UserInterface/NanoStyle.cs b/Content.Client/UserInterface/NanoStyle.cs
index d86d848b68..c173895609 100644
--- a/Content.Client/UserInterface/NanoStyle.cs
+++ b/Content.Client/UserInterface/NanoStyle.cs
@@ -21,7 +21,6 @@ namespace Content.Client.UserInterface
             var resCache = IoCManager.Resolve<IResourceCache>();
             var notoSans12 = resCache.GetFont("/Nano/NotoSans/NotoSans-Regular.ttf", 12);
             var notoSansBold16 = resCache.GetFont("/Nano/NotoSans/NotoSans-Bold.ttf", 16);
-            var animalSilence40 = resCache.GetFont("/Fonts/Animal Silence.otf", 40);
             var textureCloseButton = resCache.GetTexture("/Nano/cross.svg.png");
             var windowHeaderTex = resCache.GetTexture("/Nano/window_header.png");
             var windowHeader = new StyleBoxTexture
@@ -319,68 +318,58 @@ namespace Content.Client.UserInterface
                 new StyleRule(new SelectorElement(typeof(ProgressBar), null, null, null),
                     new[]
                     {
-                        new StyleProperty(ProgressBar.StylePropertyBackground, progressBarBackground)
-                    }),
-
-                new StyleRule(new SelectorElement(typeof(ProgressBar), null, null, null),
-                    new[]
-                    {
+                        new StyleProperty(ProgressBar.StylePropertyBackground, progressBarBackground),
                         new StyleProperty(ProgressBar.StylePropertyForeground, progressBarForeground)
                     }),
 
                 // CheckBox
-                new StyleRule(new SelectorElement(typeof(CheckBox), null, null, null), new []
+                new StyleRule(new SelectorElement(typeof(CheckBox), null, null, null), new[]
                 {
                     new StyleProperty(CheckBox.StylePropertyIcon, checkBoxTextureUnchecked),
                 }),
 
-                new StyleRule(new SelectorElement(typeof(CheckBox), null, null, Button.StylePseudoClassPressed), new []
+                new StyleRule(new SelectorElement(typeof(CheckBox), null, null, Button.StylePseudoClassPressed), new[]
                 {
                     new StyleProperty(CheckBox.StylePropertyIcon, checkBoxTextureChecked),
                 }),
 
-                new StyleRule(new SelectorElement(typeof(CheckBox), null, null, null), new []
+                new StyleRule(new SelectorElement(typeof(CheckBox), null, null, null), new[]
                 {
                     new StyleProperty(CheckBox.StylePropertyHSeparation, 3),
                 }),
 
                 // Tooltip
-                new StyleRule(new SelectorElement(typeof(Tooltip), null, null, null), new []
+                new StyleRule(new SelectorElement(typeof(Tooltip), null, null, null), new[]
                 {
                     new StyleProperty(PanelContainer.StylePropertyPanel, tooltipBox)
                 }),
 
                 // Entity tooltip
-                new StyleRule(new SelectorElement(typeof(PanelContainer), new []{ExamineSystem.StyleClassEntityTooltip}, null, null), new []
-                {
-                    new StyleProperty(PanelContainer.StylePropertyPanel, tooltipBox)
-                }),
+                new StyleRule(
+                    new SelectorElement(typeof(PanelContainer), new[] {ExamineSystem.StyleClassEntityTooltip}, null,
+                        null), new[]
+                    {
+                        new StyleProperty(PanelContainer.StylePropertyPanel, tooltipBox)
+                    }),
 
                 // ItemList
-                new StyleRule(new SelectorElement(typeof(ItemList), null, null, null), new []
+                new StyleRule(new SelectorElement(typeof(ItemList), null, null, null), new[]
                 {
-                    new StyleProperty(ItemList.StylePropertyBackground, new StyleBoxFlat { BackgroundColor = new Color(32, 32, 40)})
-                }),
-                new StyleRule(new SelectorElement(typeof(ItemList), null, null, null), new []
-                {
-                    new StyleProperty(ItemList.StylePropertyItemBackground, new StyleBoxFlat { BackgroundColor = new Color(55, 55, 68)})
-                }),
-                new StyleRule(new SelectorElement(typeof(ItemList), null, null, null), new []
-                {
-                    new StyleProperty(ItemList.StylePropertyDisabledItemBackground, new StyleBoxFlat { BackgroundColor = new Color(10, 10, 12)})
-                }),
-                new StyleRule(new SelectorElement(typeof(ItemList), null, null, null), new []
-                {
-                    new StyleProperty(ItemList.StylePropertySelectedItemBackground, new StyleBoxFlat { BackgroundColor = new Color(75, 75, 86)})
+                    new StyleProperty(ItemList.StylePropertyBackground,
+                        new StyleBoxFlat {BackgroundColor = new Color(32, 32, 40)}),
+                    new StyleProperty(ItemList.StylePropertyItemBackground,
+                        new StyleBoxFlat {BackgroundColor = new Color(55, 55, 68)}),
+                    new StyleProperty(ItemList.StylePropertyDisabledItemBackground,
+                        new StyleBoxFlat {BackgroundColor = new Color(10, 10, 12)}),
+                    new StyleProperty(ItemList.StylePropertySelectedItemBackground,
+                        new StyleBoxFlat {BackgroundColor = new Color(75, 75, 86)})
                 }),
 
                 // Tree
-                new StyleRule(new SelectorElement(typeof(Tree), null, null, null), new []
-                {
-                    new StyleProperty(Tree.StylePropertyBackground, new StyleBoxFlat { BackgroundColor = new Color(32, 32, 40)})
-                }),
-                new StyleRule(new SelectorElement(typeof(Tree), null, null, null), new []
+                new StyleRule(new SelectorElement(typeof(Tree), null, null, null), new[]
                 {
+                    new StyleProperty(Tree.StylePropertyBackground,
+                        new StyleBoxFlat {BackgroundColor = new Color(32, 32, 40)}),
                     new StyleProperty(Tree.StylePropertyItemBoxSelected, new StyleBoxFlat
                     {
                         BackgroundColor = new Color(55, 55, 68),

From fa8fbc49f503f38f56024a6e9c6011ee91519227 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Sat, 11 May 2019 16:05:28 +0200
Subject: [PATCH 02/12] Update submodule.

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index 0340cecd6d..17ebeac107 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 0340cecd6d3823db386b553aa27cb61478e7a1bb
+Subproject commit 17ebeac107d65c3b27a3f3e7dbabbbe6ed09116c

From 57bcb2a16d8a3fee64fdebe4fac5ef4642add55f Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Sat, 11 May 2019 16:05:41 +0200
Subject: [PATCH 03/12] Make content UI scaling aware.

---
 Content.Client/Chat/ChatBox.cs                |  1 -
 Content.Client/UserInterface/HandsGui.cs      | 27 ++++++++++---------
 .../Nano/checkbox_checked.svg.96dpi.png.yml   |  2 ++
 .../Nano/checkbox_unchecked.svg.96dpi.png.yml |  2 ++
 4 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 Resources/Nano/checkbox_checked.svg.96dpi.png.yml
 create mode 100644 Resources/Nano/checkbox_unchecked.svg.96dpi.png.yml

diff --git a/Content.Client/Chat/ChatBox.cs b/Content.Client/Chat/ChatBox.cs
index 2060c1e4e9..8e756d59ad 100644
--- a/Content.Client/Chat/ChatBox.cs
+++ b/Content.Client/Chat/ChatBox.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using Content.Shared.Chat;
-using Robust.Client.Console;
 using Robust.Client.Graphics.Drawing;
 using Robust.Client.Input;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/UserInterface/HandsGui.cs b/Content.Client/UserInterface/HandsGui.cs
index fd0dc3371b..779e74c744 100644
--- a/Content.Client/UserInterface/HandsGui.cs
+++ b/Content.Client/UserInterface/HandsGui.cs
@@ -36,8 +36,8 @@ namespace Content.Client.UserInterface
 
         private IEntity LeftHand;
         private IEntity RightHand;
-        private UIBox2i handL;
-        private UIBox2i handR;
+        private UIBox2i _handL;
+        private UIBox2i _handR;
 
         private SpriteView LeftSpriteView;
         private SpriteView RightSpriteView;
@@ -60,24 +60,24 @@ namespace Content.Client.UserInterface
             SetMarginsPreset(LayoutPreset.CenterBottom);
             SetAnchorPreset(LayoutPreset.CenterBottom);
 
-            handL = new UIBox2i(0, 0, BOX_SIZE, BOX_SIZE);
-            handR = handL.Translated(new Vector2i(BOX_SIZE + BOX_SPACING, 0));
+            _handL = new UIBox2i(0, 0, BOX_SIZE, BOX_SIZE);
+            _handR = _handL.Translated(new Vector2i(BOX_SIZE + BOX_SPACING, 0));
             MouseFilter = MouseFilterMode.Stop;
 
             LeftSpriteView = new SpriteView {MouseFilter = MouseFilterMode.Ignore};
             AddChild(LeftSpriteView);
-            LeftSpriteView.Size = handL.Size;
-            LeftSpriteView.Position = handL.TopLeft;
+            LeftSpriteView.Size = _handL.Size;
+            LeftSpriteView.Position = _handL.TopLeft;
 
             RightSpriteView = new SpriteView {MouseFilter = MouseFilterMode.Ignore};
             AddChild(RightSpriteView);
-            RightSpriteView.Size = handR.Size;
-            RightSpriteView.Position = handR.TopLeft;
+            RightSpriteView.Size = _handR.Size;
+            RightSpriteView.Position = _handR.TopLeft;
         }
 
         protected override Vector2 CalculateMinimumSize()
         {
-            return new Vector2(BOX_SIZE * 2 + 1, BOX_SIZE);
+            return new Vector2(BOX_SIZE * 2 + 1, BOX_SIZE) * UIScale;
         }
 
         protected override void Draw(DrawingHandleScreen handle)
@@ -87,6 +87,9 @@ namespace Content.Client.UserInterface
 
             var leftActive = hands.ActiveIndex == "left";
 
+            var handL = new UIBox2(_handL.TopLeft * UIScale, _handL.BottomRight * UIScale);
+            var handR = new UIBox2(_handR.TopLeft * UIScale, _handR.BottomRight * UIScale);
+
             handle.DrawStyleBox(handBox, leftActive ? handL : handR);
             handle.DrawStyleBox(inactiveHandBox, leftActive ? handR : handL);
         }
@@ -187,15 +190,15 @@ namespace Content.Client.UserInterface
 
         protected override bool HasPoint(Vector2 point)
         {
-            return handL.Contains((Vector2i) point) || handR.Contains((Vector2i) point);
+            return _handL.Contains((Vector2i) point) || _handR.Contains((Vector2i) point);
         }
 
         protected override void MouseDown(GUIMouseButtonEventArgs args)
         {
             base.MouseDown(args);
 
-            var leftHandContains = handL.Contains((Vector2i) args.RelativePosition);
-            var rightHandContains = handR.Contains((Vector2i) args.RelativePosition);
+            var leftHandContains = _handL.Contains((Vector2i) args.RelativePosition);
+            var rightHandContains = _handR.Contains((Vector2i) args.RelativePosition);
 
             string handIndex;
             if (leftHandContains)
diff --git a/Resources/Nano/checkbox_checked.svg.96dpi.png.yml b/Resources/Nano/checkbox_checked.svg.96dpi.png.yml
new file mode 100644
index 0000000000..5c43e23305
--- /dev/null
+++ b/Resources/Nano/checkbox_checked.svg.96dpi.png.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true
diff --git a/Resources/Nano/checkbox_unchecked.svg.96dpi.png.yml b/Resources/Nano/checkbox_unchecked.svg.96dpi.png.yml
new file mode 100644
index 0000000000..5c43e23305
--- /dev/null
+++ b/Resources/Nano/checkbox_unchecked.svg.96dpi.png.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true

From 9a1f37d47627f83089560d22b4c09a78191bbb52 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Sat, 11 May 2019 16:10:09 +0200
Subject: [PATCH 04/12] Update submodule, switch to .NET Framework 4.7.2

---
 Content.Client/Content.Client.csproj | 2 +-
 Content.Server/Content.Server.csproj | 2 +-
 Content.Shared/Content.Shared.csproj | 2 +-
 Content.Tests/Content.Tests.csproj   | 2 +-
 RobustToolbox                        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj
index 68385e7420..9740c1c11e 100644
--- a/Content.Client/Content.Client.csproj
+++ b/Content.Client/Content.Client.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Content.Client</RootNamespace>
     <AssemblyName>Content.Client</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ContentAssemblyTarget>..\RobustToolbox\bin\Client\Resources\Assemblies\</ContentAssemblyTarget>
     <LangVersion>7.2</LangVersion>
diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj
index 735f47fc61..6eb2763531 100644
--- a/Content.Server/Content.Server.csproj
+++ b/Content.Server/Content.Server.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Content.Server</RootNamespace>
     <AssemblyName>Content.Server</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ContentAssemblyTarget>..\RobustToolbox\bin\Server\Resources\Assemblies\</ContentAssemblyTarget>
     <OutputPath>..\bin\Content.Server\</OutputPath>
diff --git a/Content.Shared/Content.Shared.csproj b/Content.Shared/Content.Shared.csproj
index 94c90549c4..d0d433d44f 100644
--- a/Content.Shared/Content.Shared.csproj
+++ b/Content.Shared/Content.Shared.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Content.Shared</RootNamespace>
     <AssemblyName>Content.Shared</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <OutputPath>bin\x86\Debug\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
diff --git a/Content.Tests/Content.Tests.csproj b/Content.Tests/Content.Tests.csproj
index 24a1eb115f..81dd901b74 100644
--- a/Content.Tests/Content.Tests.csproj
+++ b/Content.Tests/Content.Tests.csproj
@@ -12,7 +12,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Content.Tests</RootNamespace>
     <AssemblyName>Content.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TestProjectType>UnitTest</TestProjectType>
     <OutputPath>..\bin\Content.Tests\</OutputPath>
diff --git a/RobustToolbox b/RobustToolbox
index 17ebeac107..f954bcb3e8 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 17ebeac107d65c3b27a3f3e7dbabbbe6ed09116c
+Subproject commit f954bcb3e882232c0ad9f4df88522f4b0230765e

From 331cfaa1c595f2ab78d604250ca01dbe66469033 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Tue, 14 May 2019 00:23:02 +0200
Subject: [PATCH 05/12] Update submodule.

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index f954bcb3e8..4d233ef6c2 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit f954bcb3e882232c0ad9f4df88522f4b0230765e
+Subproject commit 4d233ef6c2edf9d148c7862c377cbab9bae80b79

From 88c29abe5e8a8455df3dca0a5f0678a71f3f8019 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Tue, 14 May 2019 00:23:58 +0200
Subject: [PATCH 06/12] Transition lobby from tscn to C#, localization support
 for lobby.

---
 .../GameTicking/ClientGameTicker.cs           |  17 +-
 Content.Client/UserInterface/LobbyGui.cs      |  96 ++++--
 Resources/Scenes/Lobby/Lobby.tscn             | 315 ------------------
 3 files changed, 84 insertions(+), 344 deletions(-)
 delete mode 100644 Resources/Scenes/Lobby/Lobby.tscn

diff --git a/Content.Client/GameTicking/ClientGameTicker.cs b/Content.Client/GameTicking/ClientGameTicker.cs
index c0fa89cbd0..94443ebdc1 100644
--- a/Content.Client/GameTicking/ClientGameTicker.cs
+++ b/Content.Client/GameTicking/ClientGameTicker.cs
@@ -10,9 +10,11 @@ using Robust.Client.Console;
 using Robust.Client.Interfaces;
 using Robust.Client.Interfaces.Input;
 using Robust.Client.Interfaces.UserInterface;
+using Robust.Client.UserInterface;
 using Robust.Shared.Input;
 using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
+using Robust.Shared.Localization;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
@@ -27,6 +29,7 @@ namespace Content.Client.GameTicking
         [Dependency] private IBaseClient _baseClient;
         [Dependency] private IChatManager _chatManager;
         [Dependency] private IClientConsole _console;
+        [Dependency] private ILocalizationManager _localization;
 #pragma warning restore 649
 
         [ViewVariables] private bool _areWeReady;
@@ -83,11 +86,11 @@ namespace Content.Client.GameTicking
             {
                 if (difference.TotalSeconds < -5)
                 {
-                    text = "Right Now?";
+                    text = _localization.GetString("Right Now?");
                 }
                 else
                 {
-                    text = "Right Now";
+                    text = _localization.GetString("Right Now");
                 }
             }
             else
@@ -95,7 +98,7 @@ namespace Content.Client.GameTicking
                 text = $"{(int) Math.Floor(difference.TotalMinutes)}:{difference.Seconds:D2}";
             }
 
-            _lobby.StartTime.Text = "Round Starts In: " + text;
+            _lobby.StartTime.Text = _localization.GetString("Round Starts In: {0}", text);
         }
 
         private void _lobbyStatus(MsgTickerLobbyStatus message)
@@ -116,14 +119,14 @@ namespace Content.Client.GameTicking
 
             if (_gameStarted)
             {
-                _lobby.ReadyButton.Text = "Join";
+                _lobby.ReadyButton.Text = _localization.GetString("Join");
                 _lobby.ReadyButton.ToggleMode = false;
                 _lobby.ReadyButton.Pressed = false;
             }
             else
             {
                 _lobby.StartTime.Text = "";
-                _lobby.ReadyButton.Text = "Ready Up";
+                _lobby.ReadyButton.Text = _localization.GetString("Ready Up");
                 _lobby.ReadyButton.ToggleMode = true;
                 _lobby.ReadyButton.Pressed = _areWeReady;
             }
@@ -144,9 +147,11 @@ namespace Content.Client.GameTicking
 
             _tickerState = TickerState.InLobby;
 
-            _lobby = new LobbyGui();
+            _lobby = new LobbyGui(_localization);
             _userInterfaceManager.StateRoot.AddChild(_lobby);
 
+            _lobby.SetAnchorAndMarginPreset(Control.LayoutPreset.Wide, margin: 20);
+
             _chatManager.SetChatBox(_lobby.Chat);
             _lobby.Chat.DefaultChatFormat = "ooc \"{0}\"";
 
diff --git a/Content.Client/UserInterface/LobbyGui.cs b/Content.Client/UserInterface/LobbyGui.cs
index 64f6e65402..21439f80bf 100644
--- a/Content.Client/UserInterface/LobbyGui.cs
+++ b/Content.Client/UserInterface/LobbyGui.cs
@@ -1,36 +1,86 @@
 using Content.Client.Chat;
+using Robust.Client.Graphics.Drawing;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.Utility;
+using Robust.Shared.Localization;
+using Robust.Shared.Maths;
 
 namespace Content.Client.UserInterface
 {
-    public class LobbyGui : Control
+    internal sealed class LobbyGui : PanelContainer
     {
-        protected override ResourcePath ScenePath => new ResourcePath("/Scenes/Lobby/Lobby.tscn");
+        public Label ServerName { get; }
+        public Label StartTime { get; }
+        public Button ReadyButton { get; }
+        public Button ObserveButton { get; }
+        public Button LeaveButton { get; }
+        public ChatBox Chat { get; set; }
 
-        public Label ServerName => GetChild<Label>("Panel/VBoxContainer/TitleContainer/ServerName");
-        public Label StartTime => GetChild<Label>("Panel/VBoxContainer/HBoxContainer/LeftVBox/ReadyButtons/RoundStartText");
-
-        public Button ReadyButton =>
-            GetChild<Button>("Panel/VBoxContainer/HBoxContainer/LeftVBox/ReadyButtons/ReadyButton");
-
-        public Button ObserveButton =>
-            GetChild<Button>("Panel/VBoxContainer/HBoxContainer/LeftVBox/ReadyButtons/ObserveButton");
-
-        public Button LeaveButton => GetChild<Button>("Panel/VBoxContainer/TitleContainer/LeaveButton");
-
-        public ChatBox Chat { get; private set; }
-
-        protected override void Initialize()
+        public LobbyGui(ILocalizationManager localization)
         {
-            base.Initialize();
+            PanelOverride = new StyleBoxFlat { BackgroundColor = new Color(37, 37, 45)};
 
-            var chatContainer = GetChild("Panel/VBoxContainer/HBoxContainer/LeftVBox");
-            Chat = new ChatBox {ReleaseFocusOnEnter = false};
-            chatContainer.AddChild(Chat);
-            Chat.SizeFlagsVertical = SizeFlags.FillExpand;
+            var vBox = new VBoxContainer();
+            AddChild(vBox);
+
+            {
+                // Title bar.
+                var titleContainer = new HBoxContainer();
+                vBox.AddChild(titleContainer);
+
+                titleContainer.AddChild(new Label
+                {
+                    Text = localization.GetString("Lobby"),
+                    SizeFlagsHorizontal = SizeFlags.None
+                });
+
+                titleContainer.AddChild(ServerName = new Label
+                {
+                    SizeFlagsHorizontal = SizeFlags.ShrinkCenter | SizeFlags.Expand
+                });
+
+                titleContainer.AddChild(LeaveButton = new Button
+                {
+                    SizeFlagsHorizontal = SizeFlags.ShrinkEnd,
+                    Text = localization.GetString("Leave")
+                });
+            }
+
+            var hBox = new HBoxContainer {SizeFlagsVertical = SizeFlags.FillExpand};
+            vBox.AddChild(hBox);
+
+            {
+                var leftVBox = new VBoxContainer {SizeFlagsHorizontal = SizeFlags.FillExpand};
+                hBox.AddChild(leftVBox);
+
+                // Placeholder.
+                leftVBox.AddChild(new Control {SizeFlagsVertical = SizeFlags.FillExpand});
+
+                var readyButtons = new HBoxContainer();
+
+                leftVBox.AddChild(readyButtons);
+                readyButtons.AddChild(ObserveButton = new Button
+                {
+                    Text = localization.GetString("Observe")
+                });
+
+                readyButtons.AddChild(StartTime = new Label
+                {
+                    SizeFlagsHorizontal = SizeFlags.FillExpand,
+                    Align = Label.AlignMode.Right
+                });
+
+                readyButtons.AddChild(ReadyButton = new Button
+                {
+                    ToggleMode = true,
+                    Text = localization.GetString("Ready Up")
+                });
+
+                leftVBox.AddChild(Chat = new ChatBox {SizeFlagsVertical = SizeFlags.FillExpand});
+            }
+
+            // Placeholder.
+            hBox.AddChild(new Control {SizeFlagsHorizontal = SizeFlags.FillExpand});
         }
     }
 }
diff --git a/Resources/Scenes/Lobby/Lobby.tscn b/Resources/Scenes/Lobby/Lobby.tscn
deleted file mode 100644
index 7e1e8e843c..0000000000
--- a/Resources/Scenes/Lobby/Lobby.tscn
+++ /dev/null
@@ -1,315 +0,0 @@
-[gd_scene format=2]
-
-[node name="Control" type="Control" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 1.0
-anchor_bottom = 1.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-
-[node name="Panel" type="Panel" parent="." index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 1.0
-anchor_bottom = 1.0
-margin_left = 20.0
-margin_top = 20.0
-margin_right = -20.0
-margin_bottom = -20.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-
-[node name="VBoxContainer" type="VBoxContainer" parent="Panel" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 1.0
-anchor_bottom = 1.0
-margin_left = 3.0
-margin_top = 3.0
-margin_right = -3.0
-margin_bottom = -3.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 1
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-alignment = 0
-
-[node name="TitleContainer" type="MarginContainer" parent="Panel/VBoxContainer" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_right = 978.0
-margin_bottom = 20.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-custom_constants/margin_right = 0
-custom_constants/margin_top = 0
-custom_constants/margin_left = 0
-custom_constants/margin_bottom = 0
-_sections_unfolded = [ "custom_constants", "custom_styles" ]
-
-[node name="LobbyLabel" type="Label" parent="Panel/VBoxContainer/TitleContainer" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_top = 3.0
-margin_right = 43.0
-margin_bottom = 17.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 0
-size_flags_vertical = 4
-text = "LOBBY"
-percent_visible = 1.0
-lines_skipped = 0
-max_lines_visible = -1
-_sections_unfolded = [ "Size Flags" ]
-
-[node name="ServerName" type="Label" parent="Panel/VBoxContainer/TitleContainer" index="1"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_top = 3.0
-margin_right = 978.0
-margin_bottom = 17.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 3
-size_flags_vertical = 4
-text = "Space Station 14"
-align = 1
-percent_visible = 1.0
-lines_skipped = 0
-max_lines_visible = -1
-
-[node name="LeaveButton" type="Button" parent="Panel/VBoxContainer/TitleContainer" index="2"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_left = 929.0
-margin_right = 978.0
-margin_bottom = 20.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 8
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-text = "Leave"
-flat = false
-align = 1
-_sections_unfolded = [ "Size Flags" ]
-
-[node name="HBoxContainer" type="HBoxContainer" parent="Panel/VBoxContainer" index="1"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_top = 24.0
-margin_right = 978.0
-margin_bottom = 554.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 1
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 3
-alignment = 0
-
-[node name="LeftVBox" type="VBoxContainer" parent="Panel/VBoxContainer/HBoxContainer" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_right = 487.0
-margin_bottom = 530.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 1
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 3
-size_flags_vertical = 1
-alignment = 0
-
-[node name="LeftPanel" type="Container" parent="Panel/VBoxContainer/HBoxContainer/LeftVBox" index="0"]
-
-editor/display_folded = true
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_right = 487.0
-margin_bottom = 506.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 3
-
-[node name="RichTextLabel" type="RichTextLabel" parent="Panel/VBoxContainer/HBoxContainer/LeftVBox/LeftPanel" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 1.0
-anchor_bottom = 1.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = true
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-bbcode_enabled = false
-bbcode_text = ""
-visible_characters = -1
-percent_visible = 1.0
-meta_underlined = true
-tab_size = 4
-text = "Welcome to the server!
-
-Player count: 0"
-scroll_active = true
-scroll_following = false
-selection_enabled = false
-override_selected_font_color = false
-
-[node name="ReadyButtons" type="HBoxContainer" parent="Panel/VBoxContainer/HBoxContainer/LeftVBox" index="1"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_top = 510.0
-margin_right = 487.0
-margin_bottom = 530.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 1
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-alignment = 0
-
-[node name="ObserveButton" type="Button" parent="Panel/VBoxContainer/HBoxContainer/LeftVBox/ReadyButtons" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_right = 66.0
-margin_bottom = 20.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-text = "Observe"
-flat = false
-align = 1
-
-[node name="RoundStartText" type="Label" parent="Panel/VBoxContainer/HBoxContainer/LeftVBox/ReadyButtons" index="1"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_left = 70.0
-margin_top = 3.0
-margin_right = 411.0
-margin_bottom = 17.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 3
-size_flags_vertical = 4
-text = "Round Starts In:"
-align = 2
-percent_visible = 1.0
-lines_skipped = 0
-max_lines_visible = -1
-
-[node name="ReadyButton" type="Button" parent="Panel/VBoxContainer/HBoxContainer/LeftVBox/ReadyButtons" index="2"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_left = 415.0
-margin_right = 487.0
-margin_bottom = 20.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = true
-enabled_focus_mode = 2
-shortcut = null
-group = null
-text = "Ready Up"
-flat = false
-align = 1
-
-[node name="RightPanel" type="Container" parent="Panel/VBoxContainer/HBoxContainer" index="1"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_left = 491.0
-margin_right = 978.0
-margin_bottom = 530.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 3
-size_flags_vertical = 1
-
-

From 96fbde341326aa656c4c898cbcff9edd99fa8234 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Tue, 14 May 2019 01:19:25 +0200
Subject: [PATCH 07/12] Adds a UI element to act as placeholder.

---
 Content.Client/Content.Client.csproj        |   1 +
 Content.Client/UserInterface/NanoStyle.cs   |  19 ++++++++++++
 Content.Client/UserInterface/Placeholder.cs |  31 ++++++++++++++++++++
 Resources/Nano/placeholder.png              | Bin 0 -> 271 bytes
 4 files changed, 51 insertions(+)
 create mode 100644 Content.Client/UserInterface/Placeholder.cs
 create mode 100644 Resources/Nano/placeholder.png

diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj
index 9740c1c11e..0eaf694e59 100644
--- a/Content.Client/Content.Client.csproj
+++ b/Content.Client/Content.Client.csproj
@@ -124,6 +124,7 @@
     <Compile Include="GameObjects\Components\Power\PowerDebugTool.cs" />
     <Compile Include="UserInterface\LobbyGui.cs" />
     <Compile Include="UserInterface\NanoStyle.cs" />
+    <Compile Include="UserInterface\Placeholder.cs" />
     <Compile Include="Utility\ResourceCacheExtensions.cs" />
     <Compile Include="GameObjects\Components\Mobs\SpeciesVisualizer2D.cs" />
   </ItemGroup>
diff --git a/Content.Client/UserInterface/NanoStyle.cs b/Content.Client/UserInterface/NanoStyle.cs
index c173895609..ab7e904bdd 100644
--- a/Content.Client/UserInterface/NanoStyle.cs
+++ b/Content.Client/UserInterface/NanoStyle.cs
@@ -20,6 +20,7 @@ namespace Content.Client.UserInterface
         {
             var resCache = IoCManager.Resolve<IResourceCache>();
             var notoSans12 = resCache.GetFont("/Nano/NotoSans/NotoSans-Regular.ttf", 12);
+            var notoSans16 = resCache.GetFont("/Nano/NotoSans/NotoSans-Regular.ttf", 16);
             var notoSansBold16 = resCache.GetFont("/Nano/NotoSans/NotoSans-Bold.ttf", 16);
             var textureCloseButton = resCache.GetTexture("/Nano/cross.svg.png");
             var windowHeaderTex = resCache.GetTexture("/Nano/window_header.png");
@@ -140,6 +141,12 @@ namespace Content.Client.UserInterface
             tooltipBox.SetPatchMargin(StyleBox.Margin.All, 2);
             tooltipBox.SetContentMarginOverride(StyleBox.Margin.Horizontal, 5);
 
+            // Placeholder
+            var placeholderTexture = resCache.GetTexture("/Nano/placeholder.png");
+            var placeholder = new StyleBoxTexture { Texture = placeholderTexture };
+            placeholder.SetPatchMargin(StyleBox.Margin.All, 24);
+            placeholder.SetExpandMargin(StyleBox.Margin.All, -5);
+
             Stylesheet = new Stylesheet(new[]
             {
                 // Default font.
@@ -376,6 +383,18 @@ namespace Content.Client.UserInterface
                         ContentMarginLeftOverride = 4
                     })
                 }),
+
+                // Placeholder
+                new StyleRule(new SelectorElement(typeof(Placeholder), null, null, null), new []
+                {
+                    new StyleProperty(PanelContainer.StylePropertyPanel, placeholder),
+                }),
+
+                new StyleRule(new SelectorElement(typeof(Label), new []{Placeholder.StyleClassPlaceholderText}, null, null), new []
+                {
+                    new StyleProperty(Label.StylePropertyFont, notoSans16),
+                    new StyleProperty(Label.StylePropertyFontColor, new Color(103, 103, 103, 128)),
+                }),
             });
         }
     }
diff --git a/Content.Client/UserInterface/Placeholder.cs b/Content.Client/UserInterface/Placeholder.cs
new file mode 100644
index 0000000000..d6a196d6c1
--- /dev/null
+++ b/Content.Client/UserInterface/Placeholder.cs
@@ -0,0 +1,31 @@
+using Robust.Client.Interfaces.ResourceManagement;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client.UserInterface
+{
+    public sealed class Placeholder : PanelContainer
+    {
+        public const string StyleClassPlaceholderText = "PlaceholderText";
+
+        private readonly Label _label;
+
+        public string PlaceholderText
+        {
+            get => _label.Text;
+            set => _label.Text = value;
+        }
+
+        public Placeholder(IResourceCache _resourceCache)
+        {
+            _label = new Label
+            {
+                SizeFlagsHorizontal = SizeFlags.Fill,
+                SizeFlagsVertical = SizeFlags.Fill,
+                Align = Label.AlignMode.Center,
+                VAlign = Label.VAlignMode.Center
+            };
+            _label.AddStyleClass(StyleClassPlaceholderText);
+            AddChild(_label);
+        }
+    }
+}
diff --git a/Resources/Nano/placeholder.png b/Resources/Nano/placeholder.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdae339c2aab400c239fb499382fd3dc39d5d19d
GIT binary patch
literal 271
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-&H|6fVg?31We{epSZZGe6g=qZ
z;uw-~@9nHat_B4jH{V^Wk57<2d^>D{;vzRT!?(5eEe_Y^ZfDKxE<QKs(=um87SHv<
z)jMM?pNqeJ^Lp1i`M0;s1-zappEw~P-eWpBLu$g(pcEsgSRYA22L{F^Yqwr13lSHI
zn&4mhBkWV-6(*Jmzr|WR7??N|8W=t;%X|_X9_^Ciu)j5lokhTb;o|SK^Z%We25pi(
zqGqPhP$IH>S5w}~XVNQKITY&avSzX$w-S+ArMUG<(+L)tq|1L~MIT9+ZJ(uEsyemD
Q9_SecPgg&ebxsLQ097+%tpET3

literal 0
HcmV?d00001


From ad3b3c9f4f8d5a116f38d3c4a260f6dc6ba8d28d Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Tue, 14 May 2019 08:38:49 +0200
Subject: [PATCH 08/12] Add explicit placeholders to the lobby.

---
 Content.Client/GameTicking/ClientGameTicker.cs |  4 +++-
 Content.Client/UserInterface/LobbyGui.cs       | 18 +++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Content.Client/GameTicking/ClientGameTicker.cs b/Content.Client/GameTicking/ClientGameTicker.cs
index 94443ebdc1..5f8910baea 100644
--- a/Content.Client/GameTicking/ClientGameTicker.cs
+++ b/Content.Client/GameTicking/ClientGameTicker.cs
@@ -9,6 +9,7 @@ using Robust.Client;
 using Robust.Client.Console;
 using Robust.Client.Interfaces;
 using Robust.Client.Interfaces.Input;
+using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Client.Interfaces.UserInterface;
 using Robust.Client.UserInterface;
 using Robust.Shared.Input;
@@ -30,6 +31,7 @@ namespace Content.Client.GameTicking
         [Dependency] private IChatManager _chatManager;
         [Dependency] private IClientConsole _console;
         [Dependency] private ILocalizationManager _localization;
+        [Dependency] private IResourceCache _resourceCache;
 #pragma warning restore 649
 
         [ViewVariables] private bool _areWeReady;
@@ -147,7 +149,7 @@ namespace Content.Client.GameTicking
 
             _tickerState = TickerState.InLobby;
 
-            _lobby = new LobbyGui(_localization);
+            _lobby = new LobbyGui(_localization, _resourceCache);
             _userInterfaceManager.StateRoot.AddChild(_lobby);
 
             _lobby.SetAnchorAndMarginPreset(Control.LayoutPreset.Wide, margin: 20);
diff --git a/Content.Client/UserInterface/LobbyGui.cs b/Content.Client/UserInterface/LobbyGui.cs
index 21439f80bf..5d66c8ff1d 100644
--- a/Content.Client/UserInterface/LobbyGui.cs
+++ b/Content.Client/UserInterface/LobbyGui.cs
@@ -1,6 +1,6 @@
 using Content.Client.Chat;
 using Robust.Client.Graphics.Drawing;
-using Robust.Client.UserInterface;
+using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
@@ -16,7 +16,7 @@ namespace Content.Client.UserInterface
         public Button LeaveButton { get; }
         public ChatBox Chat { get; set; }
 
-        public LobbyGui(ILocalizationManager localization)
+        public LobbyGui(ILocalizationManager localization, IResourceCache resourceCache)
         {
             PanelOverride = new StyleBoxFlat { BackgroundColor = new Color(37, 37, 45)};
 
@@ -53,8 +53,11 @@ namespace Content.Client.UserInterface
                 var leftVBox = new VBoxContainer {SizeFlagsHorizontal = SizeFlags.FillExpand};
                 hBox.AddChild(leftVBox);
 
-                // Placeholder.
-                leftVBox.AddChild(new Control {SizeFlagsVertical = SizeFlags.FillExpand});
+                leftVBox.AddChild(new Placeholder(resourceCache)
+                {
+                    SizeFlagsVertical = SizeFlags.FillExpand,
+                    PlaceholderText = localization.GetString("Character UI\nPlaceholder")
+                });
 
                 var readyButtons = new HBoxContainer();
 
@@ -77,10 +80,15 @@ namespace Content.Client.UserInterface
                 });
 
                 leftVBox.AddChild(Chat = new ChatBox {SizeFlagsVertical = SizeFlags.FillExpand});
+                Chat.Input.PlaceHolder = localization.GetString("Talk!");
             }
 
             // Placeholder.
-            hBox.AddChild(new Control {SizeFlagsHorizontal = SizeFlags.FillExpand});
+            hBox.AddChild(new Placeholder(resourceCache)
+            {
+                SizeFlagsHorizontal = SizeFlags.FillExpand,
+                PlaceholderText = localization.GetString("Server Info\nPlaceholder")
+            });
         }
     }
 }

From a78a07d0c402c574914b966c9202f7d71d8344cf Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Tue, 14 May 2019 09:57:51 +0200
Subject: [PATCH 09/12] UI styling improvements.

Especially for the lobby.

CSS really paying off here.
---
 Content.Client/UserInterface/LobbyGui.cs  | 11 +++++++++--
 Content.Client/UserInterface/NanoStyle.cs | 23 +++++++++++++++++++----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/Content.Client/UserInterface/LobbyGui.cs b/Content.Client/UserInterface/LobbyGui.cs
index 5d66c8ff1d..31a6ea6a4b 100644
--- a/Content.Client/UserInterface/LobbyGui.cs
+++ b/Content.Client/UserInterface/LobbyGui.cs
@@ -19,6 +19,7 @@ namespace Content.Client.UserInterface
         public LobbyGui(ILocalizationManager localization, IResourceCache resourceCache)
         {
             PanelOverride = new StyleBoxFlat { BackgroundColor = new Color(37, 37, 45)};
+            PanelOverride.SetContentMarginOverride(StyleBox.Margin.All, 4);
 
             var vBox = new VBoxContainer();
             AddChild(vBox);
@@ -28,22 +29,26 @@ namespace Content.Client.UserInterface
                 var titleContainer = new HBoxContainer();
                 vBox.AddChild(titleContainer);
 
-                titleContainer.AddChild(new Label
+                var lobbyTitle = new Label
                 {
                     Text = localization.GetString("Lobby"),
                     SizeFlagsHorizontal = SizeFlags.None
-                });
+                };
+                lobbyTitle.AddStyleClass(NanoStyle.StyleClassLabelHeading);
+                titleContainer.AddChild(lobbyTitle);
 
                 titleContainer.AddChild(ServerName = new Label
                 {
                     SizeFlagsHorizontal = SizeFlags.ShrinkCenter | SizeFlags.Expand
                 });
+                ServerName.AddStyleClass(NanoStyle.StyleClassLabelHeading);
 
                 titleContainer.AddChild(LeaveButton = new Button
                 {
                     SizeFlagsHorizontal = SizeFlags.ShrinkEnd,
                     Text = localization.GetString("Leave")
                 });
+                LeaveButton.AddStyleClass(NanoStyle.StyleClassButtonBig);
             }
 
             var hBox = new HBoxContainer {SizeFlagsVertical = SizeFlags.FillExpand};
@@ -66,6 +71,7 @@ namespace Content.Client.UserInterface
                 {
                     Text = localization.GetString("Observe")
                 });
+                ObserveButton.AddStyleClass(NanoStyle.StyleClassButtonBig);
 
                 readyButtons.AddChild(StartTime = new Label
                 {
@@ -78,6 +84,7 @@ namespace Content.Client.UserInterface
                     ToggleMode = true,
                     Text = localization.GetString("Ready Up")
                 });
+                ReadyButton.AddStyleClass(NanoStyle.StyleClassButtonBig);
 
                 leftVBox.AddChild(Chat = new ChatBox {SizeFlagsVertical = SizeFlags.FillExpand});
                 Chat.Input.PlaceHolder = localization.GetString("Talk!");
diff --git a/Content.Client/UserInterface/NanoStyle.cs b/Content.Client/UserInterface/NanoStyle.cs
index ab7e904bdd..0583109070 100644
--- a/Content.Client/UserInterface/NanoStyle.cs
+++ b/Content.Client/UserInterface/NanoStyle.cs
@@ -12,6 +12,8 @@ namespace Content.Client.UserInterface
 {
     public sealed class NanoStyle
     {
+        public const string StyleClassLabelHeading = "LabelHeading";
+        public const string StyleClassButtonBig = "ButtonBig";
         private static readonly Color NanoGold = Color.FromHex("#A88B5E");
 
         public Stylesheet Stylesheet { get; }
@@ -44,7 +46,7 @@ namespace Content.Client.UserInterface
                 Texture = buttonNormalTex,
             };
             buttonNormal.SetPatchMargin(StyleBox.Margin.All, 2);
-            buttonNormal.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4);
+            buttonNormal.SetContentMarginOverride(StyleBox.Margin.Horizontal, 8);
 
             var buttonHoverTex = resCache.GetTexture("/Nano/button_hover.png");
             var buttonHover = new StyleBoxTexture
@@ -52,7 +54,7 @@ namespace Content.Client.UserInterface
                 Texture = buttonHoverTex,
             };
             buttonHover.SetPatchMargin(StyleBox.Margin.All, 2);
-            buttonHover.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4);
+            buttonHover.SetContentMarginOverride(StyleBox.Margin.Horizontal, 8);
 
             var buttonPressedTex = resCache.GetTexture("/Nano/button_pressed.png");
             var buttonPressed = new StyleBoxTexture
@@ -60,7 +62,7 @@ namespace Content.Client.UserInterface
                 Texture = buttonPressedTex,
             };
             buttonPressed.SetPatchMargin(StyleBox.Margin.All, 2);
-            buttonPressed.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4);
+            buttonPressed.SetContentMarginOverride(StyleBox.Margin.Horizontal, 8);
 
             var buttonDisabledTex = resCache.GetTexture("/Nano/button_disabled.png");
             var buttonDisabled = new StyleBoxTexture
@@ -68,7 +70,7 @@ namespace Content.Client.UserInterface
                 Texture = buttonDisabledTex,
             };
             buttonDisabled.SetPatchMargin(StyleBox.Margin.All, 2);
-            buttonDisabled.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4);
+            buttonDisabled.SetContentMarginOverride(StyleBox.Margin.Horizontal, 8);
 
             var lineEditTex = resCache.GetTexture("/Nano/lineedit.png");
             var lineEdit = new StyleBoxTexture
@@ -395,6 +397,19 @@ namespace Content.Client.UserInterface
                     new StyleProperty(Label.StylePropertyFont, notoSans16),
                     new StyleProperty(Label.StylePropertyFontColor, new Color(103, 103, 103, 128)),
                 }),
+
+                // Big Label
+                new StyleRule(new SelectorElement(typeof(Label), new []{StyleClassLabelHeading}, null, null), new []
+                {
+                    new StyleProperty(Label.StylePropertyFont, notoSansBold16),
+                    new StyleProperty(Label.StylePropertyFontColor, NanoGold),
+                } ),
+
+                // Big Button
+                new StyleRule(new SelectorElement(typeof(Button), new []{StyleClassButtonBig}, null, null), new []
+                {
+                    new StyleProperty("font", notoSans16)
+                }),
             });
         }
     }

From cbca48ebbb830dbbc7a052fcfe5d061303c0a4e4 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Tue, 14 May 2019 12:54:47 +0200
Subject: [PATCH 10/12] Add online player list to lobby UI.

---
 .../GameTicking/ClientGameTicker.cs           | 18 +++++++++++++
 Content.Client/UserInterface/LobbyGui.cs      | 27 ++++++++++++++-----
 Content.Client/UserInterface/NanoStyle.cs     | 16 ++++++++---
 3 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/Content.Client/GameTicking/ClientGameTicker.cs b/Content.Client/GameTicking/ClientGameTicker.cs
index 5f8910baea..e92e565fcc 100644
--- a/Content.Client/GameTicking/ClientGameTicker.cs
+++ b/Content.Client/GameTicking/ClientGameTicker.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using Content.Client.Chat;
 using Content.Client.Interfaces;
 using Content.Client.Interfaces.Chat;
@@ -11,6 +12,7 @@ using Robust.Client.Interfaces;
 using Robust.Client.Interfaces.Input;
 using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Client.Interfaces.UserInterface;
+using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Shared.Input;
 using Robust.Shared.Interfaces.Network;
@@ -32,6 +34,7 @@ namespace Content.Client.GameTicking
         [Dependency] private IClientConsole _console;
         [Dependency] private ILocalizationManager _localization;
         [Dependency] private IResourceCache _resourceCache;
+        [Dependency] private IPlayerManager _playerManager;
 #pragma warning restore 649
 
         [ViewVariables] private bool _areWeReady;
@@ -51,10 +54,25 @@ namespace Content.Client.GameTicking
             _netManager.RegisterNetMessage<MsgTickerLobbyStatus>(nameof(MsgTickerLobbyStatus), _lobbyStatus);
 
             _baseClient.RunLevelChanged += BaseClientOnRunLevelChanged;
+            _playerManager.PlayerListUpdated += PlayerManagerOnPlayerListUpdated;
 
             _initialized = true;
         }
 
+        private void PlayerManagerOnPlayerListUpdated(object sender, EventArgs e)
+        {
+            if (_lobby == null)
+            {
+                return;
+            }
+
+            _lobby.OnlinePlayerItemList.Clear();
+            foreach (var session in _playerManager.Sessions.OrderBy(s => s.Name))
+            {
+                _lobby.OnlinePlayerItemList.AddItem(session.Name);
+            }
+        }
+
         private void BaseClientOnRunLevelChanged(object sender, RunLevelChangedEventArgs e)
         {
             if (e.NewLevel != ClientRunLevel.Initialize)
diff --git a/Content.Client/UserInterface/LobbyGui.cs b/Content.Client/UserInterface/LobbyGui.cs
index 31a6ea6a4b..1e0890398b 100644
--- a/Content.Client/UserInterface/LobbyGui.cs
+++ b/Content.Client/UserInterface/LobbyGui.cs
@@ -14,11 +14,12 @@ namespace Content.Client.UserInterface
         public Button ReadyButton { get; }
         public Button ObserveButton { get; }
         public Button LeaveButton { get; }
-        public ChatBox Chat { get; set; }
+        public ChatBox Chat { get; }
+        public ItemList OnlinePlayerItemList { get; }
 
         public LobbyGui(ILocalizationManager localization, IResourceCache resourceCache)
         {
-            PanelOverride = new StyleBoxFlat { BackgroundColor = new Color(37, 37, 45)};
+            PanelOverride = new StyleBoxFlat {BackgroundColor = new Color(37, 37, 45)};
             PanelOverride.SetContentMarginOverride(StyleBox.Margin.All, 4);
 
             var vBox = new VBoxContainer();
@@ -90,12 +91,24 @@ namespace Content.Client.UserInterface
                 Chat.Input.PlaceHolder = localization.GetString("Talk!");
             }
 
-            // Placeholder.
-            hBox.AddChild(new Placeholder(resourceCache)
             {
-                SizeFlagsHorizontal = SizeFlags.FillExpand,
-                PlaceholderText = localization.GetString("Server Info\nPlaceholder")
-            });
+                var rightVBox = new VBoxContainer {SizeFlagsHorizontal = SizeFlags.FillExpand};
+                hBox.AddChild(rightVBox);
+                rightVBox.AddChild(new Label
+                {
+                    Text = localization.GetString("Online Players:")
+                });
+                rightVBox.AddChild(OnlinePlayerItemList = new ItemList
+                {
+                    SizeFlagsVertical = SizeFlags.FillExpand,
+                    //SelectMode = ItemList.ItemListSelectMode.None
+                });
+                rightVBox.AddChild(new Placeholder(resourceCache)
+                {
+                    SizeFlagsVertical = SizeFlags.FillExpand,
+                    PlaceholderText = localization.GetString("Server Info\nPlaceholder")
+                });
+            }
         }
     }
 }
diff --git a/Content.Client/UserInterface/NanoStyle.cs b/Content.Client/UserInterface/NanoStyle.cs
index 0583109070..77f5b76f2f 100644
--- a/Content.Client/UserInterface/NanoStyle.cs
+++ b/Content.Client/UserInterface/NanoStyle.cs
@@ -149,6 +149,16 @@ namespace Content.Client.UserInterface
             placeholder.SetPatchMargin(StyleBox.Margin.All, 24);
             placeholder.SetExpandMargin(StyleBox.Margin.All, -5);
 
+            var itemListBackgroundSelected = new StyleBoxFlat {BackgroundColor = new Color(75, 75, 86)};
+            itemListBackgroundSelected.SetContentMarginOverride(StyleBox.Margin.Vertical, 2);
+            itemListBackgroundSelected.SetContentMarginOverride(StyleBox.Margin.Horizontal, 4);
+            var itemListItemBackgroundDisabled = new StyleBoxFlat {BackgroundColor = new Color(10, 10, 12)};
+            itemListItemBackgroundDisabled.SetContentMarginOverride(StyleBox.Margin.Vertical, 2);
+            itemListItemBackgroundDisabled.SetContentMarginOverride(StyleBox.Margin.Horizontal, 4);
+            var itemListItemBackground = new StyleBoxFlat {BackgroundColor = new Color(55, 55, 68)};
+            itemListItemBackground.SetContentMarginOverride(StyleBox.Margin.Vertical, 2);
+            itemListItemBackground.SetContentMarginOverride(StyleBox.Margin.Horizontal, 4);
+
             Stylesheet = new Stylesheet(new[]
             {
                 // Default font.
@@ -367,11 +377,11 @@ namespace Content.Client.UserInterface
                     new StyleProperty(ItemList.StylePropertyBackground,
                         new StyleBoxFlat {BackgroundColor = new Color(32, 32, 40)}),
                     new StyleProperty(ItemList.StylePropertyItemBackground,
-                        new StyleBoxFlat {BackgroundColor = new Color(55, 55, 68)}),
+                        itemListItemBackground),
                     new StyleProperty(ItemList.StylePropertyDisabledItemBackground,
-                        new StyleBoxFlat {BackgroundColor = new Color(10, 10, 12)}),
+                        itemListItemBackgroundDisabled),
                     new StyleProperty(ItemList.StylePropertySelectedItemBackground,
-                        new StyleBoxFlat {BackgroundColor = new Color(75, 75, 86)})
+                        itemListBackgroundSelected)
                 }),
 
                 // Tree

From 304b4d8542909bed23c9ccb4f1f7495809e26304 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Tue, 14 May 2019 12:56:09 +0200
Subject: [PATCH 11/12] Update submodule

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index 4d233ef6c2..bb7288d26a 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 4d233ef6c2edf9d148c7862c377cbab9bae80b79
+Subproject commit bb7288d26ab45198ea43e134cb3935ae6a7932a6

From e68a5c8402d4b003469f18bf0c70e74400a4e143 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Tue, 14 May 2019 15:19:41 +0200
Subject: [PATCH 12/12] Move Escape Menu to Content.

---
 Content.Client/Content.Client.csproj       |   2 +
 Content.Client/EntryPoint.cs               |  12 +-
 Content.Client/EscapeMenuOwner.cs          |  88 +++++++++++++++
 Content.Client/UserInterface/EscapeMenu.cs | 121 +++++++++++++++++++++
 RobustToolbox                              |   2 +-
 5 files changed, 219 insertions(+), 6 deletions(-)
 create mode 100644 Content.Client/EscapeMenuOwner.cs
 create mode 100644 Content.Client/UserInterface/EscapeMenu.cs

diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj
index 0eaf694e59..71024b6d7d 100644
--- a/Content.Client/Content.Client.csproj
+++ b/Content.Client/Content.Client.csproj
@@ -75,6 +75,7 @@
     <Compile Include="Chat\ChatManager.cs" />
     <Compile Include="Commands\DebugCommands.cs" />
     <Compile Include="EntryPoint.cs" />
+    <Compile Include="EscapeMenuOwner.cs" />
     <Compile Include="GameObjects\Components\Actor\CharacterInterface.cs" />
     <Compile Include="GameObjects\Components\DamageableComponent.cs" />
     <Compile Include="GameObjects\Components\Doors\AirlockVisualizer2D.cs" />
@@ -120,6 +121,7 @@
     <Compile Include="Interfaces\GameObjects\Components\Items\IHandsComponent.cs" />
     <Compile Include="Research\LatheMenu.cs" />
     <Compile Include="Research\LatheQueueMenu.cs" />
+    <Compile Include="UserInterface\EscapeMenu.cs" />
     <Compile Include="UserInterface\HandsGui.cs" />
     <Compile Include="GameObjects\Components\Power\PowerDebugTool.cs" />
     <Compile Include="UserInterface\LobbyGui.cs" />
diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint.cs
index 2ac904e533..aeae753655 100644
--- a/Content.Client/EntryPoint.cs
+++ b/Content.Client/EntryPoint.cs
@@ -12,14 +12,12 @@ using Content.Client.Interfaces;
 using Content.Client.Interfaces.GameObjects;
 using Content.Client.Interfaces.Parallax;
 using Content.Client.Parallax;
-using Content.Shared.GameObjects.Components.Weapons.Ranged;
 using Content.Shared.Interfaces;
 using Robust.Client;
 using Robust.Client.Interfaces;
 using Robust.Client.Interfaces.Graphics.Overlays;
 using Robust.Client.Interfaces.Input;
 using Robust.Client.Player;
-using Robust.Client.Utility;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
@@ -31,14 +29,14 @@ using Content.Client.GameObjects.Components.Mobs;
 using Content.Client.GameObjects.Components.Research;
 using Content.Client.GameObjects.Components.Sound;
 using Content.Client.Interfaces.Chat;
-using Content.Client.Research;
 using Content.Client.UserInterface;
 using Content.Shared.GameObjects.Components.Markers;
 using Content.Shared.GameObjects.Components.Materials;
 using Content.Shared.GameObjects.Components.Mobs;
 using Content.Shared.GameObjects.Components.Research;
+using Robust.Client.Interfaces.State;
 using Robust.Client.Interfaces.UserInterface;
-using Robust.Shared.Log;
+using Robust.Client.State.States;
 
 namespace Content.Client
 {
@@ -46,6 +44,7 @@ namespace Content.Client
     {
 #pragma warning disable 649
         [Dependency] private readonly IPlayerManager _playerManager;
+        [Dependency] private readonly IEscapeMenuOwner _escapeMenuOwner;
 #pragma warning restore 649
 
         public override void Init()
@@ -139,6 +138,7 @@ namespace Content.Client
             IoCManager.Register<IClientGameTicker, ClientGameTicker>();
             IoCManager.Register<IParallaxManager, ParallaxManager>();
             IoCManager.Register<IChatManager, ChatManager>();
+            IoCManager.Register<IEscapeMenuOwner, EscapeMenuOwner>();
             IoCManager.BuildGraph();
 
             IoCManager.Resolve<IParallaxManager>().LoadParallax();
@@ -146,11 +146,13 @@ namespace Content.Client
 
             var stylesheet = new NanoStyle();
 
+            IoCManager.Resolve<IUserInterfaceManager>().Stylesheet = stylesheet.Stylesheet;
             IoCManager.Resolve<IUserInterfaceManager>().Stylesheet = stylesheet.Stylesheet;
 
             IoCManager.InjectDependencies(this);
-        }
 
+            _escapeMenuOwner.Initialize();
+        }
         /// <summary>
         /// Subscribe events to the player manager after the player manager is set up
         /// </summary>
diff --git a/Content.Client/EscapeMenuOwner.cs b/Content.Client/EscapeMenuOwner.cs
new file mode 100644
index 0000000000..667026cd53
--- /dev/null
+++ b/Content.Client/EscapeMenuOwner.cs
@@ -0,0 +1,88 @@
+using Content.Client.UserInterface;
+using Robust.Client.Console;
+using Robust.Client.Interfaces.Graphics;
+using Robust.Client.Interfaces.Input;
+using Robust.Client.Interfaces.Placement;
+using Robust.Client.Interfaces.ResourceManagement;
+using Robust.Client.Interfaces.State;
+using Robust.Client.State.States;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Shared.Input;
+using Robust.Shared.Interfaces.Configuration;
+using Robust.Shared.Interfaces.Map;
+using Robust.Shared.IoC;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client
+{
+    internal sealed class EscapeMenuOwner : IEscapeMenuOwner
+    {
+#pragma warning disable 649
+        [Dependency] private readonly IStateManager _stateManager;
+        [Dependency] private readonly IDisplayManager _displayManager;
+        [Dependency] private readonly IClientConsole _clientConsole;
+        [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager;
+        [Dependency] private readonly IPlacementManager _placementManager;
+        [Dependency] private readonly IPrototypeManager _prototypeManager;
+        [Dependency] private readonly IResourceCache _resourceCache;
+        [Dependency] private readonly IConfigurationManager _configurationManager;
+        [Dependency] private readonly IInputManager _inputManager;
+#pragma warning restore 649
+
+        private EscapeMenu _escapeMenu;
+
+        public void Initialize()
+        {
+            _stateManager.OnStateChanged += StateManagerOnOnStateChanged;
+        }
+
+        private void StateManagerOnOnStateChanged(StateChangedEventArgs obj)
+        {
+            if (obj.NewState is GameScreen)
+            {
+                // Switched TO GameScreen.
+                _escapeMenu = new EscapeMenu(_displayManager, _clientConsole, _tileDefinitionManager, _placementManager,
+                    _prototypeManager, _resourceCache, _configurationManager)
+                {
+                    Visible = false
+                };
+
+                _escapeMenu.AddToScreen();
+
+                var escapeMenuCommand = InputCmdHandler.FromDelegate(session =>
+                {
+                    if (_escapeMenu.Visible)
+                    {
+                        if (_escapeMenu.IsAtFront())
+                        {
+                            _escapeMenu.Visible = false;
+                        }
+                        else
+                        {
+                            _escapeMenu.MoveToFront();
+                        }
+                    }
+                    else
+                    {
+                        _escapeMenu.OpenCentered();
+                    }
+                });
+
+                _inputManager.SetInputCommand(EngineKeyFunctions.EscapeMenu, escapeMenuCommand);
+            }
+            else if (obj.OldState is GameScreen)
+            {
+                // Switched FROM GameScreen.
+                _escapeMenu.Dispose();
+                _escapeMenu = null;
+
+                _inputManager.SetInputCommand(EngineKeyFunctions.EscapeMenu, null);
+            }
+        }
+    }
+
+    public interface IEscapeMenuOwner
+    {
+        void Initialize();
+    }
+}
diff --git a/Content.Client/UserInterface/EscapeMenu.cs b/Content.Client/UserInterface/EscapeMenu.cs
new file mode 100644
index 0000000000..324d9590da
--- /dev/null
+++ b/Content.Client/UserInterface/EscapeMenu.cs
@@ -0,0 +1,121 @@
+using Robust.Client.Console;
+using Robust.Client.Interfaces.Graphics;
+using Robust.Client.Interfaces.Placement;
+using Robust.Client.Interfaces.ResourceManagement;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Shared.Interfaces.Configuration;
+using Robust.Shared.Interfaces.Map;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.UserInterface
+{
+    internal sealed class EscapeMenu : SS14Window
+    {
+        private readonly IClientConsole _console;
+        private readonly ITileDefinitionManager __tileDefinitionManager;
+        private readonly IPlacementManager _placementManager;
+        private readonly IPrototypeManager _prototypeManager;
+        private readonly IResourceCache _resourceCache;
+        private readonly IDisplayManager _displayManager;
+        private readonly IConfigurationManager _configSystem;
+
+        private BaseButton QuitButton;
+        private BaseButton OptionsButton;
+        private BaseButton SpawnEntitiesButton;
+        private BaseButton SpawnTilesButton;
+        private OptionsMenu optionsMenu;
+
+        public EscapeMenu(IDisplayManager displayManager,
+            IClientConsole console,
+            ITileDefinitionManager tileDefinitionManager,
+            IPlacementManager placementManager,
+            IPrototypeManager prototypeManager,
+            IResourceCache resourceCache,
+            IConfigurationManager configSystem) : base(displayManager)
+        {
+            _configSystem = configSystem;
+            _displayManager = displayManager;
+            _console = console;
+            __tileDefinitionManager = tileDefinitionManager;
+            _placementManager = placementManager;
+            _prototypeManager = prototypeManager;
+            _resourceCache = resourceCache;
+
+            PerformLayout();
+        }
+
+        private void PerformLayout()
+        {
+            optionsMenu = new OptionsMenu(_displayManager, _configSystem)
+            {
+                Visible = false
+            };
+            optionsMenu.AddToScreen();
+
+            Resizable = false;
+            HideOnClose = true;
+
+            Title = "Menu";
+
+            var vBox = new VBoxContainer {SeparationOverride = 2};
+            Contents.AddChild(vBox);
+
+            SpawnEntitiesButton = new Button {Text = "Spawn Entities"};
+            SpawnEntitiesButton.OnPressed += OnSpawnEntitiesButtonClicked;
+            vBox.AddChild(SpawnEntitiesButton);
+
+            SpawnTilesButton = new Button {Text = "Spawn Tiles"};
+            SpawnTilesButton.OnPressed += OnSpawnTilesButtonClicked;
+            vBox.AddChild(SpawnTilesButton);
+
+            // Add a spacer.
+            vBox.AddChild(new Control { CustomMinimumSize = (0, 5)});
+
+            OptionsButton = new Button {Text = "Options"};
+            OptionsButton.OnPressed += OnOptionsButtonClicked;
+            vBox.AddChild(OptionsButton);
+
+            QuitButton = new Button {Text = "Quit"};
+            QuitButton.OnPressed += OnQuitButtonClicked;
+            vBox.AddChild(QuitButton);
+
+            Size = CombinedMinimumSize;
+        }
+
+        private void OnQuitButtonClicked(BaseButton.ButtonEventArgs args)
+        {
+            _console.ProcessCommand("disconnect");
+            Dispose();
+        }
+
+        private void OnOptionsButtonClicked(BaseButton.ButtonEventArgs args)
+        {
+            optionsMenu.OpenCentered();
+        }
+
+        private void OnSpawnEntitiesButtonClicked(BaseButton.ButtonEventArgs args)
+        {
+            var window = new EntitySpawnWindow(_displayManager, _placementManager, _prototypeManager, _resourceCache);
+            window.AddToScreen();
+            window.OpenToLeft();
+        }
+
+        private void OnSpawnTilesButtonClicked(BaseButton.ButtonEventArgs args)
+        {
+            var window = new TileSpawnWindow(__tileDefinitionManager, _placementManager, _displayManager, _resourceCache);
+            window.AddToScreen();
+            window.OpenToLeft();
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+            if (disposing)
+            {
+                optionsMenu.Dispose();
+            }
+        }
+    }
+}
diff --git a/RobustToolbox b/RobustToolbox
index bb7288d26a..3bad55a705 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit bb7288d26ab45198ea43e134cb3935ae6a7932a6
+Subproject commit 3bad55a705b000e691bdcf50e54948f59fcc51bc