From ece6e0a833b257dbfcf9bc72898055a8dde5b078 Mon Sep 17 00:00:00 2001
From: Acruid <shatter66@gmail.com>
Date: Sun, 22 Dec 2019 04:23:38 -0800
Subject: [PATCH] Map & Grid Entities (#493)

* Client & Server load with new scene hierarchy.

* Engine Update.
---
 .../GameObjects/Components/SubFloorHideComponent.cs           | 3 +++
 .../GameObjects/Components/Power/PowerNodeComponent.cs        | 4 ++--
 .../GameObjects/Components/Power/PowerTransferComponent.cs    | 4 ++--
 RobustToolbox                                                 | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Content.Client/GameObjects/Components/SubFloorHideComponent.cs b/Content.Client/GameObjects/Components/SubFloorHideComponent.cs
index c99f90ae27..a9b2aa3424 100644
--- a/Content.Client/GameObjects/Components/SubFloorHideComponent.cs
+++ b/Content.Client/GameObjects/Components/SubFloorHideComponent.cs
@@ -40,6 +40,9 @@ namespace Content.Client.GameObjects.Components
         {
             base.Shutdown();
 
+            if(Owner.Transform.Running == false)
+                return;
+
             _snapGridComponent.OnPositionChanged -= SnapGridOnPositionChanged;
             Owner.EntityManager.EventBus.RaiseEvent(Owner, new SubFloorHideDirtyEvent());
         }
diff --git a/Content.Server/GameObjects/Components/Power/PowerNodeComponent.cs b/Content.Server/GameObjects/Components/Power/PowerNodeComponent.cs
index 88f0c11209..c629a82aa0 100644
--- a/Content.Server/GameObjects/Components/Power/PowerNodeComponent.cs
+++ b/Content.Server/GameObjects/Components/Power/PowerNodeComponent.cs
@@ -37,9 +37,9 @@ namespace Content.Server.GameObjects.Components.Power
         /// </summary>
         public event EventHandler<PowernetEventArgs> OnPowernetRegenerate;
 
-        public override void Initialize()
+        protected override void Startup()
         {
-            base.Initialize();
+            base.Startup();
 
             TryCreatePowernetConnection();
         }
diff --git a/Content.Server/GameObjects/Components/Power/PowerTransferComponent.cs b/Content.Server/GameObjects/Components/Power/PowerTransferComponent.cs
index 5211df3475..8eaae33d1a 100644
--- a/Content.Server/GameObjects/Components/Power/PowerTransferComponent.cs
+++ b/Content.Server/GameObjects/Components/Power/PowerTransferComponent.cs
@@ -27,9 +27,9 @@ namespace Content.Server.GameObjects.Components.Power
         [ViewVariables]
         public bool Regenerating { get; set; } = false;
 
-        public override void Initialize()
+        protected override void Startup()
         {
-            base.Initialize();
+            base.Startup();
 
             if (Parent == null)
             {
diff --git a/RobustToolbox b/RobustToolbox
index df34ce025a..f5c0dba194 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit df34ce025a05a854af4eb5bf5bf64655e6697254
+Subproject commit f5c0dba194b05c76dd18b9b7d9000154b60a24fd