diff --git a/Content.Client/Construction/ConstructionSystem.cs b/Content.Client/Construction/ConstructionSystem.cs index 6dfb70317a..b92c75492b 100644 --- a/Content.Client/Construction/ConstructionSystem.cs +++ b/Content.Client/Construction/ConstructionSystem.cs @@ -52,9 +52,6 @@ namespace Content.Client.Construction { base.Shutdown(); - UnsubscribeLocalEvent(); - UnsubscribeNetworkEvent(); - CommandBinds.Unregister(); } diff --git a/Content.Client/DoAfter/DoAfterSystem.cs b/Content.Client/DoAfter/DoAfterSystem.cs index 4cb7684163..ab747fe1ef 100644 --- a/Content.Client/DoAfter/DoAfterSystem.cs +++ b/Content.Client/DoAfter/DoAfterSystem.cs @@ -39,12 +39,6 @@ namespace Content.Client.DoAfter SubscribeLocalEvent(HandlePlayerAttached); } - public override void Shutdown() - { - base.Shutdown(); - UnsubscribeLocalEvent(); - } - private void HandlePlayerAttached(PlayerAttachSysMessage message) { _attachedEntity = message.AttachedEntity; diff --git a/Content.Client/HealthOverlay/HealthOverlaySystem.cs b/Content.Client/HealthOverlay/HealthOverlaySystem.cs index 5f1c6eec53..5dd348934f 100644 --- a/Content.Client/HealthOverlay/HealthOverlaySystem.cs +++ b/Content.Client/HealthOverlay/HealthOverlaySystem.cs @@ -47,13 +47,6 @@ namespace Content.Client.HealthOverlay SubscribeLocalEvent(HandlePlayerAttached); } - public override void Shutdown() - { - base.Shutdown(); - - UnsubscribeLocalEvent(); - } - public void Reset() { foreach (var gui in _guis.Values) diff --git a/Content.Client/IconSmoothing/IconSmoothSystem.cs b/Content.Client/IconSmoothing/IconSmoothSystem.cs index dc0ed68ac9..2ba9f59c71 100644 --- a/Content.Client/IconSmoothing/IconSmoothSystem.cs +++ b/Content.Client/IconSmoothing/IconSmoothSystem.cs @@ -29,16 +29,6 @@ namespace Content.Client.IconSmoothing SubscribeLocalEvent(HandleSnapGridMove); } - - public override void Shutdown() - { - base.Shutdown(); - - UnsubscribeLocalEvent(); - - UnsubscribeLocalEvent(HandleSnapGridMove); - } - public override void FrameUpdate(float frameTime) { base.FrameUpdate(frameTime); diff --git a/Content.Client/Pulling/PullingSystem.cs b/Content.Client/Pulling/PullingSystem.cs index feeb73ad61..04135bb062 100644 --- a/Content.Client/Pulling/PullingSystem.cs +++ b/Content.Client/Pulling/PullingSystem.cs @@ -16,13 +16,5 @@ namespace Content.Client.Pulling SubscribeLocalEvent(OnPullableMove); SubscribeLocalEvent(OnPullableStopMove); } - - public override void Shutdown() - { - base.Shutdown(); - - UnsubscribeLocalEvent(OnPullableMove); - UnsubscribeLocalEvent(OnPullableStopMove); - } } } diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs index 9873144815..b1ffda0971 100644 --- a/Content.Client/Verbs/VerbSystem.cs +++ b/Content.Client/Verbs/VerbSystem.cs @@ -63,9 +63,6 @@ namespace Content.Client.Verbs { base.Shutdown(); - UnsubscribeNetworkEvent(); - UnsubscribeNetworkEvent(); - UnsubscribeLocalEvent(); _contextMenuPresenter?.Dispose(); CommandBinds.Unregister(); diff --git a/Content.Client/Window/WindowSystem.cs b/Content.Client/Window/WindowSystem.cs index 5b39d486c1..51fef139b5 100644 --- a/Content.Client/Window/WindowSystem.cs +++ b/Content.Client/Window/WindowSystem.cs @@ -17,14 +17,6 @@ namespace Content.Client.Window SubscribeLocalEvent(HandleSnapGridMove); } - public override void Shutdown() - { - base.Shutdown(); - - UnsubscribeLocalEvent(); - UnsubscribeLocalEvent(HandleSnapGridMove); - } - private void HandleDirtyEvent(WindowSmoothDirtyEvent ev) { if (ev.Sender.HasComponent()) diff --git a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs index 20b452d731..0b30b9601e 100644 --- a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs +++ b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs @@ -455,13 +455,6 @@ namespace Content.IntegrationTests.Tests.Networking SubscribeLocalEvent(HandleMessage); } - public override void Shutdown() - { - base.Shutdown(); - UnsubscribeNetworkEvent(); - UnsubscribeLocalEvent(); - } - private void HandleMessage(SetFooMessage message, EntitySessionEventArgs args) { var entity = EntityManager.GetEntity(message.Uid); diff --git a/Content.Server/AI/EntitySystems/AiSystem.cs b/Content.Server/AI/EntitySystems/AiSystem.cs index e6f55087ef..d6ff8acf9a 100644 --- a/Content.Server/AI/EntitySystems/AiSystem.cs +++ b/Content.Server/AI/EntitySystems/AiSystem.cs @@ -42,13 +42,6 @@ namespace Content.Server.AI.EntitySystems SubscribeLocalEvent(MobStateChanged); } - public override void Shutdown() - { - base.Shutdown(); - UnsubscribeLocalEvent(); - UnsubscribeLocalEvent(); - } - /// public override void Update(float frameTime) { diff --git a/Content.Server/AI/Pathfinding/Accessible/AiReachableSystem.cs b/Content.Server/AI/Pathfinding/Accessible/AiReachableSystem.cs index 18b3f803c4..7b39db4ea0 100644 --- a/Content.Server/AI/Pathfinding/Accessible/AiReachableSystem.cs +++ b/Content.Server/AI/Pathfinding/Accessible/AiReachableSystem.cs @@ -99,10 +99,6 @@ namespace Content.Server.AI.Pathfinding.Accessible _queuedCacheDeletions.Clear(); _mapManager.OnGridRemoved -= GridRemoved; - - UnsubscribeLocalEvent(); - UnsubscribeNetworkEvent(); - UnsubscribeNetworkEvent(); } private void GridRemoved(MapId mapId, GridId gridId) diff --git a/Content.Server/AI/Pathfinding/PathfindingSystem.cs b/Content.Server/AI/Pathfinding/PathfindingSystem.cs index 3d825bb402..91c189a069 100644 --- a/Content.Server/AI/Pathfinding/PathfindingSystem.cs +++ b/Content.Server/AI/Pathfinding/PathfindingSystem.cs @@ -215,9 +215,6 @@ namespace Content.Server.AI.Pathfinding public override void Shutdown() { base.Shutdown(); - UnsubscribeLocalEvent(); - UnsubscribeLocalEvent(); - UnsubscribeLocalEvent(); _mapManager.OnGridRemoved -= HandleGridRemoval; _mapManager.GridChanged -= QueueGridChange; diff --git a/Content.Server/Body/Surgery/Components/SurgeryToolSystem.cs b/Content.Server/Body/Surgery/Components/SurgeryToolSystem.cs index 4620591c75..3a8ef51665 100644 --- a/Content.Server/Body/Surgery/Components/SurgeryToolSystem.cs +++ b/Content.Server/Body/Surgery/Components/SurgeryToolSystem.cs @@ -21,14 +21,6 @@ namespace Content.Server.Body.Surgery.Components SubscribeLocalEvent(OnSurgeryWindowClose); } - public override void Shutdown() - { - base.Shutdown(); - - UnsubscribeLocalEvent(); - UnsubscribeLocalEvent(); - } - public void Reset() { _openSurgeryUIs.Clear(); diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs index e04a7f877e..774d00f585 100644 --- a/Content.Server/Cloning/CloningSystem.cs +++ b/Content.Server/Cloning/CloningSystem.cs @@ -33,14 +33,6 @@ namespace Content.Server.Cloning SubscribeLocalEvent(HandleMindAdded); } - public override void Shutdown() - { - base.Shutdown(); - - UnsubscribeLocalEvent(HandleActivate); - UnsubscribeLocalEvent(HandleMindAdded); - } - internal void TransferMindToClone(Mind.Mind mind) { if (!ClonesWaitingForMind.TryGetValue(mind, out var entityUid) || diff --git a/Content.Server/Disposal/Mailing/DisposalMailingUnitSystem.cs b/Content.Server/Disposal/Mailing/DisposalMailingUnitSystem.cs index 40ef380c51..3156ec1ef4 100644 --- a/Content.Server/Disposal/Mailing/DisposalMailingUnitSystem.cs +++ b/Content.Server/Disposal/Mailing/DisposalMailingUnitSystem.cs @@ -11,13 +11,6 @@ namespace Content.Server.Disposal.Mailing SubscribeLocalEvent(BodyTypeChanged); } - public override void Shutdown() - { - base.Shutdown(); - - UnsubscribeLocalEvent(); - } - private static void BodyTypeChanged( EntityUid uid, DisposalMailingUnitComponent component, diff --git a/Content.Server/Disposal/Tube/DisposalTubeSystem.cs b/Content.Server/Disposal/Tube/DisposalTubeSystem.cs index caba2e4569..8cae9e5b9e 100644 --- a/Content.Server/Disposal/Tube/DisposalTubeSystem.cs +++ b/Content.Server/Disposal/Tube/DisposalTubeSystem.cs @@ -12,13 +12,6 @@ namespace Content.Server.Disposal.Tube SubscribeLocalEvent(BodyTypeChanged); } - public override void Shutdown() - { - base.Shutdown(); - - UnsubscribeLocalEvent(); - } - private static void BodyTypeChanged( EntityUid uid, DisposalTubeComponent component, diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs index 05eab4a226..c60b6ad165 100644 --- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs +++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs @@ -12,13 +12,6 @@ namespace Content.Server.Disposal.Unit.EntitySystems SubscribeLocalEvent(BodyTypeChanged); } - public override void Shutdown() - { - base.Shutdown(); - - UnsubscribeLocalEvent(); - } - private static void BodyTypeChanged( EntityUid uid, DisposalUnitComponent component, diff --git a/Content.Server/Engineering/EntitySystems/DisassembleOnActivateSystem.cs b/Content.Server/Engineering/EntitySystems/DisassembleOnActivateSystem.cs index 2b5ecdc642..b123077e94 100644 --- a/Content.Server/Engineering/EntitySystems/DisassembleOnActivateSystem.cs +++ b/Content.Server/Engineering/EntitySystems/DisassembleOnActivateSystem.cs @@ -19,13 +19,6 @@ namespace Content.Server.Engineering.EntitySystems SubscribeLocalEvent(HandleActivateInWorld); } - public override void Shutdown() - { - base.Shutdown(); - - UnsubscribeLocalEvent(HandleActivateInWorld); - } - private async void HandleActivateInWorld(EntityUid uid, DisassembleOnActivateComponent component, ActivateInWorldEvent args) { if (string.IsNullOrEmpty(component.Prototype)) diff --git a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs index a59a2521cb..1ccb603416 100644 --- a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs +++ b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs @@ -25,13 +25,6 @@ namespace Content.Server.Engineering.EntitySystems SubscribeLocalEvent(HandleAfterInteract); } - public override void Shutdown() - { - base.Shutdown(); - - UnsubscribeLocalEvent(HandleAfterInteract); - } - private async void HandleAfterInteract(EntityUid uid, SpawnAfterInteractComponent component, AfterInteractEvent args) { if (string.IsNullOrEmpty(component.Prototype)) diff --git a/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs b/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs index faf8734fd5..d71f75d8cc 100644 --- a/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs @@ -120,9 +120,6 @@ namespace Content.Server.GameObjects.EntitySystems base.Shutdown(); _mapManager.MapCreated -= OnMapCreated; - - UnsubscribeLocalEvent(); - UnsubscribeLocalEvent(HandleSnapGridMove); } private void RotateEvent(RotateEvent ev) diff --git a/Content.Server/GameObjects/EntitySystems/GasCanisterSystem.cs b/Content.Server/GameObjects/EntitySystems/GasCanisterSystem.cs index e1d030ae97..0377d14510 100644 --- a/Content.Server/GameObjects/EntitySystems/GasCanisterSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/GasCanisterSystem.cs @@ -14,13 +14,6 @@ namespace Content.Server.GameObjects.EntitySystems SubscribeLocalEvent(OnBodyTypeChanged); } - public override void Shutdown() - { - base.Shutdown(); - - UnsubscribeLocalEvent(); - } - private static void OnBodyTypeChanged( EntityUid uid, GasCanisterComponent component, diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs index 5ca66270f5..8e070aa771 100644 --- a/Content.Server/Ghost/GhostSystem.cs +++ b/Content.Server/Ghost/GhostSystem.cs @@ -16,14 +16,6 @@ namespace Content.Server.Ghost SubscribeLocalEvent(OnMindUnvisitedMessage); } - public override void Shutdown() - { - base.Shutdown(); - - UnsubscribeLocalEvent(OnMindRemovedMessage); - UnsubscribeLocalEvent(OnMindUnvisitedMessage); - } - private void OnMindRemovedMessage(EntityUid uid, GhostComponent component, MindRemovedMessage args) { DeleteEntity(uid); diff --git a/Content.Server/Ghost/Roles/GhostRoleSystem.cs b/Content.Server/Ghost/Roles/GhostRoleSystem.cs index 141f675a37..fb878ae83b 100644 --- a/Content.Server/Ghost/Roles/GhostRoleSystem.cs +++ b/Content.Server/Ghost/Roles/GhostRoleSystem.cs @@ -36,13 +36,6 @@ namespace Content.Server.Ghost.Roles SubscribeLocalEvent(OnPlayerAttached); } - public override void Shutdown() - { - base.Shutdown(); - - UnsubscribeLocalEvent(); - } - private uint GetNextRoleIdentifier() { return unchecked(_nextRoleIdentifier++); diff --git a/Content.Server/Gravity/EntitySystems/WeightlessSystem.cs b/Content.Server/Gravity/EntitySystems/WeightlessSystem.cs index c7e0711b12..9f601434ff 100644 --- a/Content.Server/Gravity/EntitySystems/WeightlessSystem.cs +++ b/Content.Server/Gravity/EntitySystems/WeightlessSystem.cs @@ -26,14 +26,6 @@ namespace Content.Server.Gravity.EntitySystems SubscribeLocalEvent(EntParentChanged); } - public override void Shutdown() - { - base.Shutdown(); - - UnsubscribeLocalEvent(); - UnsubscribeLocalEvent(); - } - public void Reset() { _alerts.Clear(); diff --git a/Content.Server/Light/EntitySystems/HandHeldLightSystem.cs b/Content.Server/Light/EntitySystems/HandHeldLightSystem.cs index 3b83b10947..e1b16e2688 100644 --- a/Content.Server/Light/EntitySystems/HandHeldLightSystem.cs +++ b/Content.Server/Light/EntitySystems/HandHeldLightSystem.cs @@ -24,8 +24,6 @@ namespace Content.Server.Light.EntitySystems { base.Shutdown(); _activeLights.Clear(); - UnsubscribeLocalEvent(); - UnsubscribeLocalEvent(); } private void HandleActivate(ActivateHandheldLightMessage message) diff --git a/Content.Server/Light/EntitySystems/LightReplacerSystem.cs b/Content.Server/Light/EntitySystems/LightReplacerSystem.cs index 505f3c8170..d707e9c162 100644 --- a/Content.Server/Light/EntitySystems/LightReplacerSystem.cs +++ b/Content.Server/Light/EntitySystems/LightReplacerSystem.cs @@ -19,14 +19,6 @@ namespace Content.Server.Light.EntitySystems SubscribeLocalEvent(HandleAfterInteract); } - public override void Shutdown() - { - base.Shutdown(); - - UnsubscribeLocalEvent(HandleInteract); - UnsubscribeLocalEvent(HandleAfterInteract); - } - private void HandleAfterInteract(EntityUid uid, LightReplacerComponent component, AfterInteractEvent eventArgs) { // standard interaction checks diff --git a/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs b/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs index eba0b020c2..4cfb26181f 100644 --- a/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs +++ b/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs @@ -15,15 +15,6 @@ namespace Content.Server.NodeContainer.EntitySystems SubscribeLocalEvent(OnRotateEvent); } - public override void Shutdown() - { - base.Shutdown(); - - - UnsubscribeLocalEvent(OnBodyTypeChanged); - UnsubscribeLocalEvent(OnRotateEvent); - } - private void OnBodyTypeChanged(EntityUid uid, NodeContainerComponent component, PhysicsBodyTypeChangedEvent args) { component.AnchorUpdate(); diff --git a/Content.Server/ParticleAccelerator/ParticleAcceleratorPartSystem.cs b/Content.Server/ParticleAccelerator/ParticleAcceleratorPartSystem.cs index ae61276bf1..10f386d959 100644 --- a/Content.Server/ParticleAccelerator/ParticleAcceleratorPartSystem.cs +++ b/Content.Server/ParticleAccelerator/ParticleAcceleratorPartSystem.cs @@ -16,13 +16,6 @@ namespace Content.Server.ParticleAccelerator SubscribeLocalEvent(BodyTypeChanged); } - public override void Shutdown() - { - base.Shutdown(); - - UnsubscribeLocalEvent(); - } - private static void BodyTypeChanged( EntityUid uid, ParticleAcceleratorPartComponent component, diff --git a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs index e755c4c9db..54ed7847de 100644 --- a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs +++ b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs @@ -12,13 +12,6 @@ namespace Content.Server.Power.EntitySystems SubscribeLocalEvent(BodyTypeChanged); } - public override void Shutdown() - { - base.Shutdown(); - - UnsubscribeLocalEvent(); - } - private static void BodyTypeChanged( EntityUid uid, PowerReceiverComponent component, diff --git a/Content.Server/Pulling/PullingSystem.cs b/Content.Server/Pulling/PullingSystem.cs index 4b29e234d3..e616e69d9c 100644 --- a/Content.Server/Pulling/PullingSystem.cs +++ b/Content.Server/Pulling/PullingSystem.cs @@ -16,13 +16,5 @@ namespace Content.Server.Pulling SubscribeLocalEvent(OnPullableMove); SubscribeLocalEvent(OnPullableStopMove); } - - public override void Shutdown() - { - base.Shutdown(); - - UnsubscribeLocalEvent(OnPullableMove); - UnsubscribeLocalEvent(OnPullableStopMove); - } } } diff --git a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs index 9ba63fa179..89660d7548 100644 --- a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs +++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs @@ -12,13 +12,6 @@ namespace Content.Server.Singularity.EntitySystems SubscribeLocalEvent(BodyTypeChanged); } - public override void Shutdown() - { - base.Shutdown(); - - UnsubscribeLocalEvent(); - } - private static void BodyTypeChanged( EntityUid uid, ContainmentFieldGeneratorComponent component, diff --git a/Content.Server/Storage/StorageSystem.cs b/Content.Server/Storage/StorageSystem.cs index b31f43c6ca..e0df9d95aa 100644 --- a/Content.Server/Storage/StorageSystem.cs +++ b/Content.Server/Storage/StorageSystem.cs @@ -22,14 +22,6 @@ namespace Content.Server.Storage SubscribeLocalEvent(HandleEntityInsertedIntoContainer); } - public override void Shutdown() - { - base.Shutdown(); - - UnsubscribeLocalEvent(); - UnsubscribeLocalEvent(); - } - /// public override void Update(float frameTime) {