diff --git a/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs b/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs
index 6abe1145a7..31265c593a 100644
--- a/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs
+++ b/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs
@@ -75,7 +75,8 @@ namespace Content.Client.GameObjects.Components.IconSmoothing
             serializer.DataFieldCached(ref _mode, "mode", IconSmoothingMode.Corners);
         }
 
-        public override void Startup()
+        /// <inheritdoc />
+        protected override void Startup()
         {
             base.Startup();
 
@@ -196,7 +197,8 @@ namespace Content.Client.GameObjects.Components.IconSmoothing
             Sprite.LayerSetState(CornerLayers.NW, $"{StateBase}{(int) cornerNW}");
         }
 
-        public override void Shutdown()
+        /// <inheritdoc />
+        protected override void Shutdown()
         {
             SnapGrid.OnPositionChanged -= SnapGridOnPositionChanged;
             Owner.EntityManager.RaiseEvent(Owner, new IconSmoothDirtyEvent(_lastPosition, SnapGrid.Offset, Mode));
diff --git a/Content.Client/GameObjects/Components/LowWallComponent.cs b/Content.Client/GameObjects/Components/LowWallComponent.cs
index c183beb568..02f541a09f 100644
--- a/Content.Client/GameObjects/Components/LowWallComponent.cs
+++ b/Content.Client/GameObjects/Components/LowWallComponent.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Content.Client.GameObjects.Components.IconSmoothing;
 using Robust.Shared.GameObjects;
@@ -26,7 +26,8 @@ namespace Content.Client.GameObjects.Components
         public CornerFill LastCornerSW { get; private set; }
         public CornerFill LastCornerNW { get; private set; }
 
-        public override void Startup()
+        /// <inheritdoc />
+        protected override void Startup()
         {
             base.Startup();
 
diff --git a/Content.Client/GameObjects/Components/SubFloorHideComponent.cs b/Content.Client/GameObjects/Components/SubFloorHideComponent.cs
index b5cabd00dd..7ff9c67333 100644
--- a/Content.Client/GameObjects/Components/SubFloorHideComponent.cs
+++ b/Content.Client/GameObjects/Components/SubFloorHideComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Maps;
+using Content.Shared.Maps;
 using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components.Transform;
@@ -24,7 +24,8 @@ namespace Content.Client.GameObjects.Components
             _snapGridComponent = Owner.GetComponent<SnapGridComponent>();
         }
 
-        public override void Startup()
+        /// <inheritdoc />
+        protected override void Startup()
         {
             base.Startup();
 
@@ -32,7 +33,8 @@ namespace Content.Client.GameObjects.Components
             Owner.EntityManager.RaiseEvent(Owner, new SubFloorHideDirtyEvent());
         }
 
-        public override void Shutdown()
+        /// <inheritdoc />
+        protected override void Shutdown()
         {
             base.Shutdown();
 
diff --git a/Content.Client/GameObjects/Components/WindowComponent.cs b/Content.Client/GameObjects/Components/WindowComponent.cs
index f4ae19448f..387493d3a6 100644
--- a/Content.Client/GameObjects/Components/WindowComponent.cs
+++ b/Content.Client/GameObjects/Components/WindowComponent.cs
@@ -1,4 +1,4 @@
-using Content.Client.GameObjects.EntitySystems;
+using Content.Client.GameObjects.EntitySystems;
 using Robust.Client.GameObjects;
 using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.GameObjects;
@@ -25,7 +25,8 @@ namespace Content.Client.GameObjects.Components
             _snapGrid = Owner.GetComponent<SnapGridComponent>();
         }
 
-        public override void Startup()
+        /// <inheritdoc />
+        protected override void Startup()
         {
             base.Startup();
 
@@ -43,7 +44,8 @@ namespace Content.Client.GameObjects.Components
             _sprite.LayerSetDirOffset(CornerLayers.SW, SpriteComponent.DirectionOffset.Clockwise);
         }
 
-        public override void Shutdown()
+        /// <inheritdoc />
+        protected override void Shutdown()
         {
             _snapGrid.OnPositionChanged -= SnapGridOnPositionChanged;
 
diff --git a/Content.Server/GameObjects/Components/Power/PowerDevice.cs b/Content.Server/GameObjects/Components/Power/PowerDevice.cs
index 075d58d3ee..53f8cf9afe 100644
--- a/Content.Server/GameObjects/Components/Power/PowerDevice.cs
+++ b/Content.Server/GameObjects/Components/Power/PowerDevice.cs
@@ -21,7 +21,7 @@ namespace Content.Server.GameObjects.Components.Power
     {
         public override string Name => "PowerDevice";
 
-        public override void Startup()
+        protected override void Startup()
         {
             base.Startup();
             if (_drawType != DrawTypes.Node)
@@ -161,7 +161,8 @@ namespace Content.Server.GameObjects.Components.Power
             }
         }
 
-        public override void Shutdown()
+        /// <inheritdoc />
+        protected override void Shutdown()
         {
             if (Owner.TryGetComponent(out PowerNodeComponent node))
             {
diff --git a/Content.Server/GameObjects/Components/Power/PowerProviderComponent.cs b/Content.Server/GameObjects/Components/Power/PowerProviderComponent.cs
index e2c9d1131d..4771570b5c 100644
--- a/Content.Server/GameObjects/Components/Power/PowerProviderComponent.cs
+++ b/Content.Server/GameObjects/Components/Power/PowerProviderComponent.cs
@@ -97,7 +97,8 @@ namespace Content.Server.GameObjects.Components.Power
             Load = 0;
         }
 
-        public override void Shutdown()
+        /// <inheritdoc />
+        protected override void Shutdown()
         {
             base.Shutdown();
 
diff --git a/Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs b/Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs
index ee74335ad7..44edca4b83 100644
--- a/Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs
+++ b/Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.GameObjects.Components.Research;
 using Robust.Server.GameObjects.Components.UserInterface;
 using Robust.Server.Interfaces.GameObjects;
@@ -99,7 +99,8 @@ namespace Content.Server.GameObjects.Components.Research
             }
         }
 
-        public override void Shutdown()
+        /// <inheritdoc />
+        protected override void Shutdown()
         {
             base.Shutdown();
             UnregisterFromServer();
diff --git a/Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs b/Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs
index 7c0faf5e22..a196f1a331 100644
--- a/Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs
+++ b/Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs
@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.InteropServices.WindowsRuntime;
 using Content.Server.GameObjects.EntitySystems;
@@ -71,7 +71,8 @@ namespace Content.Server.GameObjects.Components.Research
             Database = Owner.GetComponent<TechnologyDatabaseComponent>();
         }
 
-        public override void Shutdown()
+        /// <inheritdoc />
+        protected override void Shutdown()
         {
             base.Shutdown();
             IoCManager.Resolve<IEntitySystemManager>()?.GetEntitySystem<ResearchSystem>()?.UnregisterServer(this);
diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/AmmoBoxComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/AmmoBoxComponent.cs
index a44420adf9..a4657564c4 100644
--- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/AmmoBoxComponent.cs
+++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/AmmoBoxComponent.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Content.Server.GameObjects.EntitySystems;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
@@ -65,7 +65,8 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile
             _appearance = Owner.GetComponent<AppearanceComponent>();
         }
 
-        public override void Startup()
+        /// <inheritdoc />
+        protected override void Startup()
         {
             base.Startup();
 
diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs
index a8ddb953c8..51afdb4862 100644
--- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs
+++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.GameObjects.Components.Weapons.Ranged;
@@ -58,7 +58,8 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile
             _appearance = Owner.GetComponent<AppearanceComponent>();
         }
 
-        public override void Startup()
+        /// <inheritdoc />
+        protected override void Startup()
         {
             base.Startup();
 
diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs
index 9453e57b4f..ff79ae70b5 100644
--- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs
+++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs
@@ -84,7 +84,8 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile
             _appearance = Owner.GetComponent<AppearanceComponent>();
         }
 
-        public override void Startup()
+        /// <inheritdoc />
+        protected override void Startup()
         {
             base.Startup();
 
diff --git a/Content.Shared/GameObjects/Components/Chemistry/SolutionComponent.cs b/Content.Shared/GameObjects/Components/Chemistry/SolutionComponent.cs
index 5ec42b038f..5453fee8f9 100644
--- a/Content.Shared/GameObjects/Components/Chemistry/SolutionComponent.cs
+++ b/Content.Shared/GameObjects/Components/Chemistry/SolutionComponent.cs
@@ -71,14 +71,16 @@ namespace Content.Shared.GameObjects.Components.Chemistry
             serializer.DataField(ref _capabilities, "caps", SolutionCaps.None);
         }
 
-        public override void Startup()
+        /// <inheritdoc />
+        protected override void Startup()
         {
             base.Startup();
 
             RecalculateColor();
         }
 
-        public override void Shutdown()
+        /// <inheritdoc />
+        protected override void Shutdown()
         {
             base.Shutdown();
 
diff --git a/RobustToolbox b/RobustToolbox
index 81641f49dc..55a50ff7ba 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 81641f49dc9951124d13aadb43c4c3f4d34c320e
+Subproject commit 55a50ff7ba27dcbfa55722979dd189a9d2faf344