From 818ee83440937c178854e45b4890601cc30fa246 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Thu, 16 May 2019 14:28:34 +0200
Subject: [PATCH] Remove IDisplayManager dependency from SS14Window, content
 changes.

---
 Content.Client/EscapeMenuOwner.cs          |  5 +----
 Content.Client/UserInterface/EscapeMenu.cs | 13 +++++--------
 RobustToolbox                              |  2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/Content.Client/EscapeMenuOwner.cs b/Content.Client/EscapeMenuOwner.cs
index 667026cd53..d9e41b1c20 100644
--- a/Content.Client/EscapeMenuOwner.cs
+++ b/Content.Client/EscapeMenuOwner.cs
@@ -1,12 +1,10 @@
 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;
@@ -19,7 +17,6 @@ namespace Content.Client
     {
 #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;
@@ -41,7 +38,7 @@ namespace Content.Client
             if (obj.NewState is GameScreen)
             {
                 // Switched TO GameScreen.
-                _escapeMenu = new EscapeMenu(_displayManager, _clientConsole, _tileDefinitionManager, _placementManager,
+                _escapeMenu = new EscapeMenu(_clientConsole, _tileDefinitionManager, _placementManager,
                     _prototypeManager, _resourceCache, _configurationManager)
                 {
                     Visible = false
diff --git a/Content.Client/UserInterface/EscapeMenu.cs b/Content.Client/UserInterface/EscapeMenu.cs
index 324d9590da..a13bae00e5 100644
--- a/Content.Client/UserInterface/EscapeMenu.cs
+++ b/Content.Client/UserInterface/EscapeMenu.cs
@@ -18,7 +18,6 @@ namespace Content.Client.UserInterface
         private readonly IPlacementManager _placementManager;
         private readonly IPrototypeManager _prototypeManager;
         private readonly IResourceCache _resourceCache;
-        private readonly IDisplayManager _displayManager;
         private readonly IConfigurationManager _configSystem;
 
         private BaseButton QuitButton;
@@ -27,16 +26,14 @@ namespace Content.Client.UserInterface
         private BaseButton SpawnTilesButton;
         private OptionsMenu optionsMenu;
 
-        public EscapeMenu(IDisplayManager displayManager,
-            IClientConsole console,
+        public EscapeMenu(IClientConsole console,
             ITileDefinitionManager tileDefinitionManager,
             IPlacementManager placementManager,
             IPrototypeManager prototypeManager,
             IResourceCache resourceCache,
-            IConfigurationManager configSystem) : base(displayManager)
+            IConfigurationManager configSystem)
         {
             _configSystem = configSystem;
-            _displayManager = displayManager;
             _console = console;
             __tileDefinitionManager = tileDefinitionManager;
             _placementManager = placementManager;
@@ -48,7 +45,7 @@ namespace Content.Client.UserInterface
 
         private void PerformLayout()
         {
-            optionsMenu = new OptionsMenu(_displayManager, _configSystem)
+            optionsMenu = new OptionsMenu(_configSystem)
             {
                 Visible = false
             };
@@ -97,14 +94,14 @@ namespace Content.Client.UserInterface
 
         private void OnSpawnEntitiesButtonClicked(BaseButton.ButtonEventArgs args)
         {
-            var window = new EntitySpawnWindow(_displayManager, _placementManager, _prototypeManager, _resourceCache);
+            var window = new EntitySpawnWindow(_placementManager, _prototypeManager, _resourceCache);
             window.AddToScreen();
             window.OpenToLeft();
         }
 
         private void OnSpawnTilesButtonClicked(BaseButton.ButtonEventArgs args)
         {
-            var window = new TileSpawnWindow(__tileDefinitionManager, _placementManager, _displayManager, _resourceCache);
+            var window = new TileSpawnWindow(__tileDefinitionManager, _placementManager, _resourceCache);
             window.AddToScreen();
             window.OpenToLeft();
         }
diff --git a/RobustToolbox b/RobustToolbox
index 3bad55a705..10440648bc 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 3bad55a705b000e691bdcf50e54948f59fcc51bc
+Subproject commit 10440648bc1225cecb5eb09ec2c45d0ec18423c9