diff --git a/Content.Client/Chat/SpeechBubble.cs b/Content.Client/Chat/SpeechBubble.cs index a2376955496..581010b8d23 100644 --- a/Content.Client/Chat/SpeechBubble.cs +++ b/Content.Client/Chat/SpeechBubble.cs @@ -5,7 +5,6 @@ using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.GameObjects; using Robust.Shared.Maths; -using Robust.Shared.Timers; using Robust.Shared.Timing; namespace Content.Client.Chat diff --git a/Content.Client/Command/CommunicationsConsoleMenu.cs b/Content.Client/Command/CommunicationsConsoleMenu.cs index aa1f24cf6e1..565f3ca6700 100644 --- a/Content.Client/Command/CommunicationsConsoleMenu.cs +++ b/Content.Client/Command/CommunicationsConsoleMenu.cs @@ -6,7 +6,7 @@ using Robust.Client.UserInterface.CustomControls; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; -using Timer = Robust.Shared.Timers.Timer; +using Timer = Robust.Shared.Timing.Timer; namespace Content.Client.Command { diff --git a/Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs b/Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs index 65ca72c02b2..a32f06bd62b 100644 --- a/Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using Content.Shared.AI; @@ -10,7 +10,7 @@ using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Prototypes; using Robust.Shared.Random; -using Robust.Shared.Timers; +using Robust.Shared.Timing; namespace Content.Client.GameObjects.EntitySystems.AI { diff --git a/Content.Client/GameObjects/EntitySystems/VerbSystem.cs b/Content.Client/GameObjects/EntitySystems/VerbSystem.cs index d1fc7be2f6f..25ce6ae03d5 100644 --- a/Content.Client/GameObjects/EntitySystems/VerbSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/VerbSystem.cs @@ -30,7 +30,7 @@ using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Timing; using Robust.Shared.Utility; -using Timer = Robust.Shared.Timers.Timer; +using Timer = Robust.Shared.Timing.Timer; namespace Content.Client.GameObjects.EntitySystems { diff --git a/Content.Client/Instruments/InstrumentMenu.xaml.cs b/Content.Client/Instruments/InstrumentMenu.xaml.cs index 8ed12b91906..c31fea68740 100644 --- a/Content.Client/Instruments/InstrumentMenu.xaml.cs +++ b/Content.Client/Instruments/InstrumentMenu.xaml.cs @@ -17,7 +17,6 @@ using Robust.Shared.Input; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; -using Robust.Shared.Timers; using Robust.Shared.Timing; using Range = Robust.Client.UserInterface.Controls.Range; diff --git a/Content.IntegrationTests/ContentIntegrationTest.cs b/Content.IntegrationTests/ContentIntegrationTest.cs index db86308cd8b..a34661d615b 100644 --- a/Content.IntegrationTests/ContentIntegrationTest.cs +++ b/Content.IntegrationTests/ContentIntegrationTest.cs @@ -7,11 +7,11 @@ using Content.Server.Interfaces.GameTicking; using Content.Shared; using NUnit.Framework; using Robust.Server.Maps; -using Robust.Server.Timing; using Robust.Shared.ContentPack; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Network; +using Robust.Shared.Timing; using Robust.UnitTesting; namespace Content.IntegrationTests diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs index 305a5b7ffb8..eaf805b4697 100644 --- a/Content.IntegrationTests/Tests/EntityTest.cs +++ b/Content.IntegrationTests/Tests/EntityTest.cs @@ -1,14 +1,14 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Content.Shared.Utility; using NUnit.Framework; -using Robust.Server.Timing; using Robust.Shared.GameObjects; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Prototypes; +using Robust.Shared.Timing; namespace Content.IntegrationTests.Tests { diff --git a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs index 078755aa57b..70487fd7af6 100644 --- a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs +++ b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs @@ -1,10 +1,9 @@ -using System; +using System; using System.Threading.Tasks; using Content.Server.GameObjects.Components.Fluids; using Content.Shared.Chemistry; using Content.Shared.Utility; using NUnit.Framework; -using Robust.Server.Timing; using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Timing; diff --git a/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs b/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs index b9cfb8e30b1..9bf40017c06 100644 --- a/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs +++ b/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs @@ -1,11 +1,11 @@ -using System.IO; +using System.IO; using System.Linq; using System.Threading.Tasks; using NUnit.Framework; using Robust.Server.Maps; -using Robust.Server.Timing; using Robust.Shared.ContentPack; using Robust.Shared.Map; +using Robust.Shared.Timing; using Robust.Shared.Utility; namespace Content.IntegrationTests.Tests diff --git a/Content.Server/Commands/GameTicking/MappingCommand.cs b/Content.Server/Commands/GameTicking/MappingCommand.cs index 99233838ea9..7999680b4db 100644 --- a/Content.Server/Commands/GameTicking/MappingCommand.cs +++ b/Content.Server/Commands/GameTicking/MappingCommand.cs @@ -4,11 +4,11 @@ using System.Linq; using Content.Server.Administration; using Content.Shared.Administration; using Robust.Server.Player; -using Robust.Server.Timing; using Robust.Shared.Console; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Timing; using Robust.Shared.Utility; namespace Content.Server.Commands.GameTicking diff --git a/Content.Server/Commands/MakeSentientCommand.cs b/Content.Server/Commands/MakeSentientCommand.cs index 888d93049ca..115369baf31 100644 --- a/Content.Server/Commands/MakeSentientCommand.cs +++ b/Content.Server/Commands/MakeSentientCommand.cs @@ -8,7 +8,7 @@ using Content.Shared.GameObjects.Components.Mobs.Speech; using Robust.Shared.Console; using Robust.Shared.GameObjects; using Robust.Shared.IoC; -using Timer = Robust.Shared.Timers.Timer; +using Timer = Robust.Shared.Timing.Timer; namespace Content.Server.Commands { diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs index fa6f82876ed..ba5751297e9 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs @@ -29,7 +29,7 @@ using Robust.Shared.Log; using Robust.Shared.Serialization; using Robust.Shared.Timing; using Robust.Shared.ViewVariables; -using Timer = Robust.Shared.Timers.Timer; +using Timer = Robust.Shared.Timing.Timer; namespace Content.Server.GameObjects.Components.Disposal { diff --git a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs b/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs index a54dcc93351..b75158b618f 100644 --- a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs +++ b/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs @@ -27,7 +27,7 @@ using Robust.Shared.Physics; using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using Timer = Robust.Shared.Timers.Timer; +using Timer = Robust.Shared.Timing.Timer; namespace Content.Server.GameObjects.Components.Doors { diff --git a/Content.Server/GameObjects/Components/Mobs/MindComponent.cs b/Content.Server/GameObjects/Components/Mobs/MindComponent.cs index da955ac9923..2f572b6a8d7 100644 --- a/Content.Server/GameObjects/Components/Mobs/MindComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/MindComponent.cs @@ -10,7 +10,7 @@ using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; using Robust.Shared.Serialization; -using Robust.Shared.Timers; +using Robust.Shared.Timing; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorControlBoxComponent.cs b/Content.Server/GameObjects/Components/PA/ParticleAcceleratorControlBoxComponent.cs index 75c3a9163c1..0a057149829 100644 --- a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorControlBoxComponent.cs +++ b/Content.Server/GameObjects/Components/PA/ParticleAcceleratorControlBoxComponent.cs @@ -20,7 +20,7 @@ using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; using static Content.Shared.GameObjects.Components.SharedWiresComponent; -using Timer = Robust.Shared.Timers.Timer; +using Timer = Robust.Shared.Timing.Timer; namespace Content.Server.GameObjects.Components.PA { diff --git a/Content.Server/GameObjects/Components/PA/ParticleProjectileComponent.cs b/Content.Server/GameObjects/Components/PA/ParticleProjectileComponent.cs index 77d3707ecfa..2fb3bc8bdf6 100644 --- a/Content.Server/GameObjects/Components/PA/ParticleProjectileComponent.cs +++ b/Content.Server/GameObjects/Components/PA/ParticleProjectileComponent.cs @@ -6,7 +6,7 @@ using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Log; using Robust.Shared.Maths; -using Robust.Shared.Timers; +using Robust.Shared.Timing; namespace Content.Server.GameObjects.Components.PA { diff --git a/Content.Server/GameObjects/Components/Singularity/ContainmentFieldConnection.cs b/Content.Server/GameObjects/Components/Singularity/ContainmentFieldConnection.cs index 515d101eca2..7ad9ec1d53a 100644 --- a/Content.Server/GameObjects/Components/Singularity/ContainmentFieldConnection.cs +++ b/Content.Server/GameObjects/Components/Singularity/ContainmentFieldConnection.cs @@ -6,7 +6,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Maths; -using Timer = Robust.Shared.Timers.Timer; +using Timer = Robust.Shared.Timing.Timer; namespace Content.Server.GameObjects.Components.Singularity { diff --git a/Content.Server/GameObjects/Components/Singularity/EmitterComponent.cs b/Content.Server/GameObjects/Components/Singularity/EmitterComponent.cs index c4a60933ed3..d86662d49b2 100644 --- a/Content.Server/GameObjects/Components/Singularity/EmitterComponent.cs +++ b/Content.Server/GameObjects/Components/Singularity/EmitterComponent.cs @@ -19,7 +19,7 @@ using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; -using Timer = Robust.Shared.Timers.Timer; +using Timer = Robust.Shared.Timing.Timer; #nullable enable diff --git a/Content.Server/GameObjects/Components/Singularity/SingularityComponent.cs b/Content.Server/GameObjects/Components/Singularity/SingularityComponent.cs index bc6f5b8f061..d8c32dc2e36 100644 --- a/Content.Server/GameObjects/Components/Singularity/SingularityComponent.cs +++ b/Content.Server/GameObjects/Components/Singularity/SingularityComponent.cs @@ -15,7 +15,7 @@ using Robust.Shared.Maths; using Robust.Shared.Map; using Robust.Shared.Physics; using Robust.Shared.Random; -using Robust.Shared.Timers; +using Robust.Shared.Timing; namespace Content.Server.GameObjects.Components.Singularity { diff --git a/Content.Server/GameObjects/EntitySystems/AI/Steering/AiSteeringSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/Steering/AiSteeringSystem.cs index 5a3793fc233..d2de9d5fffe 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Steering/AiSteeringSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Steering/AiSteeringSystem.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; @@ -9,11 +9,11 @@ using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders; using Content.Server.GameObjects.EntitySystems.JobQueues; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Utility; -using Robust.Server.Timing; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Timing; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/EntitySystems/ApcNetSystem.cs b/Content.Server/GameObjects/EntitySystems/ApcNetSystem.cs index fe21ca61933..cc775139f2d 100644 --- a/Content.Server/GameObjects/EntitySystems/ApcNetSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ApcNetSystem.cs @@ -1,11 +1,10 @@ #nullable enable using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; using JetBrains.Annotations; -using Robust.Server.Timing; using Robust.Shared.GameObjects; using Robust.Shared.IoC; -using Robust.Shared.Map; using System.Collections.Generic; +using Robust.Shared.Timing; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs b/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs index bb2e6e67251..be3755f3340 100644 --- a/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System; using System.Collections.Generic; using System.Linq; @@ -11,13 +11,13 @@ using Content.Shared.GameObjects.EntitySystems.Atmos; using Content.Shared.Maps; using JetBrains.Annotations; using Robust.Server.GameObjects; -using Robust.Server.Timing; using Robust.Shared.Configuration; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Prototypes; +using Robust.Shared.Timing; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs b/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs index da8d0d3309f..f290f9f4df2 100644 --- a/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs @@ -23,8 +23,7 @@ using Robust.Shared.Maths; using Robust.Shared.Players; using Robust.Shared.Prototypes; using Robust.Shared.Random; -using Robust.Shared.Timers; - +using Robust.Shared.Timing; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/RoundEndSystem.cs b/Content.Server/GameObjects/EntitySystems/RoundEndSystem.cs index 840db1f010f..4333b9f6d0a 100644 --- a/Content.Server/GameObjects/EntitySystems/RoundEndSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/RoundEndSystem.cs @@ -8,7 +8,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Timing; -using Timer = Robust.Shared.Timers.Timer; +using Timer = Robust.Shared.Timing.Timer; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/TriggerSystem.cs b/Content.Server/GameObjects/EntitySystems/TriggerSystem.cs index fd4eeede5c8..768121fd403 100644 --- a/Content.Server/GameObjects/EntitySystems/TriggerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/TriggerSystem.cs @@ -2,7 +2,7 @@ using System.Linq; using JetBrains.Annotations; using Robust.Shared.GameObjects; -using Robust.Shared.Timers; +using Robust.Shared.Timing; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameTicking/GameRules/RuleDeathMatch.cs b/Content.Server/GameTicking/GameRules/RuleDeathMatch.cs index d71cac99ebb..8332041a745 100644 --- a/Content.Server/GameTicking/GameRules/RuleDeathMatch.cs +++ b/Content.Server/GameTicking/GameRules/RuleDeathMatch.cs @@ -11,7 +11,7 @@ using Robust.Shared.Enums; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; -using Timer = Robust.Shared.Timers.Timer; +using Timer = Robust.Shared.Timing.Timer; namespace Content.Server.GameTicking.GameRules { diff --git a/Content.Server/GameTicking/GameRules/RuleInactivityTimeRestart.cs b/Content.Server/GameTicking/GameRules/RuleInactivityTimeRestart.cs index e46378645df..b7a0e810229 100644 --- a/Content.Server/GameTicking/GameRules/RuleInactivityTimeRestart.cs +++ b/Content.Server/GameTicking/GameRules/RuleInactivityTimeRestart.cs @@ -6,7 +6,7 @@ using Content.Server.Interfaces.GameTicking; using Robust.Server.Player; using Robust.Shared.IoC; using Robust.Shared.Localization; -using Timer = Robust.Shared.Timers.Timer; +using Timer = Robust.Shared.Timing.Timer; namespace Content.Server.GameTicking.GameRules { diff --git a/Content.Server/GameTicking/GameRules/RuleMaxTimeRestart.cs b/Content.Server/GameTicking/GameRules/RuleMaxTimeRestart.cs index e09444a7c37..bb0be79ea87 100644 --- a/Content.Server/GameTicking/GameRules/RuleMaxTimeRestart.cs +++ b/Content.Server/GameTicking/GameRules/RuleMaxTimeRestart.cs @@ -4,7 +4,7 @@ using Content.Server.Interfaces.Chat; using Content.Server.Interfaces.GameTicking; using Robust.Shared.IoC; using Robust.Shared.Localization; -using Timer = Robust.Shared.Timers.Timer; +using Timer = Robust.Shared.Timing.Timer; namespace Content.Server.GameTicking.GameRules { diff --git a/Content.Server/GameTicking/GameRules/RuleSuspicion.cs b/Content.Server/GameTicking/GameRules/RuleSuspicion.cs index 3ba9d1433bc..1da4163b8ef 100644 --- a/Content.Server/GameTicking/GameRules/RuleSuspicion.cs +++ b/Content.Server/GameTicking/GameRules/RuleSuspicion.cs @@ -17,7 +17,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Timing; -using Timer = Robust.Shared.Timers.Timer; +using Timer = Robust.Shared.Timing.Timer; namespace Content.Server.GameTicking.GameRules { diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs index 25fc426ef42..4ac1fdd2ba9 100644 --- a/Content.Server/GameTicking/GameTicker.cs +++ b/Content.Server/GameTicking/GameTicker.cs @@ -49,7 +49,7 @@ using Robust.Shared.Timing; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; -using Timer = Robust.Shared.Timers.Timer; +using Timer = Robust.Shared.Timing.Timer; namespace Content.Server.GameTicking { diff --git a/Content.Server/GameTicking/GameTickerBase.cs b/Content.Server/GameTicking/GameTickerBase.cs index 2a83a6f17e1..56eea0343b4 100644 --- a/Content.Server/GameTicking/GameTickerBase.cs +++ b/Content.Server/GameTicking/GameTickerBase.cs @@ -3,7 +3,7 @@ using Content.Shared.GameTicking; using Robust.Server.Player; using Robust.Shared.Enums; using Robust.Shared.IoC; -using Robust.Shared.Timers; +using Robust.Shared.Timing; #nullable enable diff --git a/Content.Server/StationEvents/PowerGridCheck.cs b/Content.Server/StationEvents/PowerGridCheck.cs index 45d8218a959..b067c804460 100644 --- a/Content.Server/StationEvents/PowerGridCheck.cs +++ b/Content.Server/StationEvents/PowerGridCheck.cs @@ -8,7 +8,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Random; -using Timer = Robust.Shared.Timers.Timer; +using Timer = Robust.Shared.Timing.Timer; namespace Content.Server.StationEvents { diff --git a/Content.Server/StationEvents/RadiationStorm.cs b/Content.Server/StationEvents/RadiationStorm.cs index 47b2a66d8b9..c1b24c13fdf 100644 --- a/Content.Server/StationEvents/RadiationStorm.cs +++ b/Content.Server/StationEvents/RadiationStorm.cs @@ -1,14 +1,14 @@ -#nullable enable +#nullable enable using JetBrains.Annotations; using Content.Server.GameObjects.Components.StationEvents; using Content.Server.Interfaces.GameTicking; using Content.Shared.Utility; -using Robust.Server.Timing; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; using Robust.Shared.Random; +using Robust.Shared.Timing; namespace Content.Server.StationEvents { diff --git a/RobustToolbox b/RobustToolbox index 3ef4ac74524..e0cdcd228e4 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 3ef4ac74524a2532cb2ba62820db9abf16076e66 +Subproject commit e0cdcd228e4773b9c737cc9c09737c08d13d248d