tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PauseManager moved to Shared (#3288)

Browse Source 
* Namespace changes for moving IPauseManager to shared.

* Namespace changes for moving ITimerManager from Timers to Timing.

* Rebase Fixes.

* Update engine submodule to v0.3.8
This commit is contained in:
Acruid
2021-02-18 20:45:45 -08:00
committed by GitHub
parent c996021b5d
commit d1b5a31397
34 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Client/Chat/SpeechBubble.cs
View File

@@ -5,7 +5,6 @@ using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Timers;
using Robust.Shared.Timing; using Robust.Shared.Timing;
namespace Content.Client.Chat namespace Content.Client.Chat

2
Content.Client/Command/CommunicationsConsoleMenu.cs
View File

@@ -6,7 +6,7 @@ using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Timer = Robust.Shared.Timers.Timer; using Timer = Robust.Shared.Timing.Timer;
namespace Content.Client.Command namespace Content.Client.Command
{ {

4
Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Content.Shared.AI; using Content.Shared.AI;
@@ -10,7 +10,7 @@ using Robust.Shared.Map;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Random; using Robust.Shared.Random;
using Robust.Shared.Timers; using Robust.Shared.Timing;
namespace Content.Client.GameObjects.EntitySystems.AI namespace Content.Client.GameObjects.EntitySystems.AI
{ {

2
Content.Client/GameObjects/EntitySystems/VerbSystem.cs
View File

@@ -30,7 +30,7 @@ using Robust.Shared.Map;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Timing; using Robust.Shared.Timing;
using Robust.Shared.Utility; using Robust.Shared.Utility;
using Timer = Robust.Shared.Timers.Timer; using Timer = Robust.Shared.Timing.Timer;
namespace Content.Client.GameObjects.EntitySystems namespace Content.Client.GameObjects.EntitySystems
{ {

1
Content.Client/Instruments/InstrumentMenu.xaml.cs
View File

@@ -17,7 +17,6 @@ using Robust.Shared.Input;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Timers;
using Robust.Shared.Timing; using Robust.Shared.Timing;
using Range = Robust.Client.UserInterface.Controls.Range; using Range = Robust.Client.UserInterface.Controls.Range;

2
Content.IntegrationTests/ContentIntegrationTest.cs
View File

@@ -7,11 +7,11 @@ using Content.Server.Interfaces.GameTicking;
using Content.Shared; using Content.Shared;
using NUnit.Framework; using NUnit.Framework;
using Robust.Server.Maps; using Robust.Server.Maps;
using Robust.Server.Timing;
using Robust.Shared.ContentPack; using Robust.Shared.ContentPack;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Network; using Robust.Shared.Network;
using Robust.Shared.Timing;
using Robust.UnitTesting; using Robust.UnitTesting;
namespace Content.IntegrationTests namespace Content.IntegrationTests

4
Content.IntegrationTests/Tests/EntityTest.cs
View File

@@ -1,14 +1,14 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Content.Shared.Utility; using Content.Shared.Utility;
using NUnit.Framework; using NUnit.Framework;
using Robust.Server.Timing;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Log; using Robust.Shared.Log;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
namespace Content.IntegrationTests.Tests namespace Content.IntegrationTests.Tests
{ {

3
Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
View File

@@ -1,10 +1,9 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using Content.Server.GameObjects.Components.Fluids; using Content.Server.GameObjects.Components.Fluids;
using Content.Shared.Chemistry; using Content.Shared.Chemistry;
using Content.Shared.Utility; using Content.Shared.Utility;
using NUnit.Framework; using NUnit.Framework;
using Robust.Server.Timing;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Timing; using Robust.Shared.Timing;

4
Content.IntegrationTests/Tests/SaveLoadSaveTest.cs
View File

@@ -1,11 +1,11 @@
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using NUnit.Framework; using NUnit.Framework;
using Robust.Server.Maps; using Robust.Server.Maps;
using Robust.Server.Timing;
using Robust.Shared.ContentPack; using Robust.Shared.ContentPack;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Timing;
using Robust.Shared.Utility; using Robust.Shared.Utility;
namespace Content.IntegrationTests.Tests namespace Content.IntegrationTests.Tests

2
Content.Server/Commands/GameTicking/MappingCommand.cs
View File

@@ -4,11 +4,11 @@ using System.Linq;
using Content.Server.Administration; using Content.Server.Administration;
using Content.Shared.Administration; using Content.Shared.Administration;
using Robust.Server.Player; using Robust.Server.Player;
using Robust.Server.Timing;
using Robust.Shared.Console; using Robust.Shared.Console;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Timing;
using Robust.Shared.Utility; using Robust.Shared.Utility;
namespace Content.Server.Commands.GameTicking namespace Content.Server.Commands.GameTicking

2
Content.Server/Commands/MakeSentientCommand.cs
View File

@@ -8,7 +8,7 @@ using Content.Shared.GameObjects.Components.Mobs.Speech;
using Robust.Shared.Console; using Robust.Shared.Console;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Timer = Robust.Shared.Timers.Timer; using Timer = Robust.Shared.Timing.Timer;
namespace Content.Server.Commands namespace Content.Server.Commands
{ {

2
Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs
View File

@@ -29,7 +29,7 @@ using Robust.Shared.Log;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Robust.Shared.Timing; using Robust.Shared.Timing;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using Timer = Robust.Shared.Timers.Timer; using Timer = Robust.Shared.Timing.Timer;
namespace Content.Server.GameObjects.Components.Disposal namespace Content.Server.GameObjects.Components.Disposal
{ {

2
Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs
View File

@@ -27,7 +27,7 @@ using Robust.Shared.Physics;
using Robust.Shared.Players; using Robust.Shared.Players;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using Timer = Robust.Shared.Timers.Timer; using Timer = Robust.Shared.Timing.Timer;
namespace Content.Server.GameObjects.Components.Doors namespace Content.Server.GameObjects.Components.Doors
{ {

2
Content.Server/GameObjects/Components/Mobs/MindComponent.cs
View File

@@ -10,7 +10,7 @@ using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Robust.Shared.Timers; using Robust.Shared.Timing;
using Robust.Shared.Utility; using Robust.Shared.Utility;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;

2
Content.Server/GameObjects/Components/PA/ParticleAcceleratorControlBoxComponent.cs
View File

@@ -20,7 +20,7 @@ using Robust.Shared.Serialization;
using Robust.Shared.Utility; using Robust.Shared.Utility;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using static Content.Shared.GameObjects.Components.SharedWiresComponent; 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 namespace Content.Server.GameObjects.Components.PA
{ {

2
Content.Server/GameObjects/Components/PA/ParticleProjectileComponent.cs
View File

@@ -6,7 +6,7 @@ using Robust.Server.GameObjects;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Log; using Robust.Shared.Log;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Timers; using Robust.Shared.Timing;
namespace Content.Server.GameObjects.Components.PA namespace Content.Server.GameObjects.Components.PA
{ {

2
Content.Server/GameObjects/Components/Singularity/ContainmentFieldConnection.cs
View File

@@ -6,7 +6,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Log; using Robust.Shared.Log;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Timer = Robust.Shared.Timers.Timer; using Timer = Robust.Shared.Timing.Timer;
namespace Content.Server.GameObjects.Components.Singularity namespace Content.Server.GameObjects.Components.Singularity
{ {

2
Content.Server/GameObjects/Components/Singularity/EmitterComponent.cs
View File

@@ -19,7 +19,7 @@ using Robust.Shared.Random;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Robust.Shared.Utility; using Robust.Shared.Utility;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using Timer = Robust.Shared.Timers.Timer; using Timer = Robust.Shared.Timing.Timer;
#nullable enable #nullable enable

2
Content.Server/GameObjects/Components/Singularity/SingularityComponent.cs
View File

@@ -15,7 +15,7 @@ using Robust.Shared.Maths;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Physics; using Robust.Shared.Physics;
using Robust.Shared.Random; using Robust.Shared.Random;
using Robust.Shared.Timers; using Robust.Shared.Timing;
namespace Content.Server.GameObjects.Components.Singularity namespace Content.Server.GameObjects.Components.Singularity
{ {

4
Content.Server/GameObjects/EntitySystems/AI/Steering/AiSteeringSystem.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@@ -9,11 +9,11 @@ using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders;
using Content.Server.GameObjects.EntitySystems.JobQueues; using Content.Server.GameObjects.EntitySystems.JobQueues;
using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
using Content.Shared.Utility; using Content.Shared.Utility;
using Robust.Server.Timing;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Timing;
using Robust.Shared.Utility; using Robust.Shared.Utility;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;

3
Content.Server/GameObjects/EntitySystems/ApcNetSystem.cs
View File

@@ -1,11 +1,10 @@
#nullable enable #nullable enable
using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Server.Timing;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Map;
using System.Collections.Generic; using System.Collections.Generic;
using Robust.Shared.Timing;
namespace Content.Server.GameObjects.EntitySystems namespace Content.Server.GameObjects.EntitySystems
{ {

4
Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs
View File

@@ -1,4 +1,4 @@
#nullable enable #nullable enable
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@@ -11,13 +11,13 @@ using Content.Shared.GameObjects.EntitySystems.Atmos;
using Content.Shared.Maps; using Content.Shared.Maps;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Server.Timing;
using Robust.Shared.Configuration; using Robust.Shared.Configuration;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
namespace Content.Server.GameObjects.EntitySystems namespace Content.Server.GameObjects.EntitySystems
{ {

3
Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs
View File

@@ -23,8 +23,7 @@ using Robust.Shared.Maths;
using Robust.Shared.Players; using Robust.Shared.Players;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Random; using Robust.Shared.Random;
using Robust.Shared.Timers; using Robust.Shared.Timing;
namespace Content.Server.GameObjects.EntitySystems namespace Content.Server.GameObjects.EntitySystems
{ {

2
Content.Server/GameObjects/EntitySystems/RoundEndSystem.cs
View File

@@ -8,7 +8,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Robust.Shared.Timing; using Robust.Shared.Timing;
using Timer = Robust.Shared.Timers.Timer; using Timer = Robust.Shared.Timing.Timer;
namespace Content.Server.GameObjects.EntitySystems namespace Content.Server.GameObjects.EntitySystems
{ {

2
Content.Server/GameObjects/EntitySystems/TriggerSystem.cs
View File

@@ -2,7 +2,7 @@
using System.Linq; using System.Linq;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Timers; using Robust.Shared.Timing;
namespace Content.Server.GameObjects.EntitySystems namespace Content.Server.GameObjects.EntitySystems
{ {

2
Content.Server/GameTicking/GameRules/RuleDeathMatch.cs
View File

@@ -11,7 +11,7 @@ using Robust.Shared.Enums;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Timer = Robust.Shared.Timers.Timer; using Timer = Robust.Shared.Timing.Timer;
namespace Content.Server.GameTicking.GameRules namespace Content.Server.GameTicking.GameRules
{ {

2
Content.Server/GameTicking/GameRules/RuleInactivityTimeRestart.cs
View File

@@ -6,7 +6,7 @@ using Content.Server.Interfaces.GameTicking;
using Robust.Server.Player; using Robust.Server.Player;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Timer = Robust.Shared.Timers.Timer; using Timer = Robust.Shared.Timing.Timer;
namespace Content.Server.GameTicking.GameRules namespace Content.Server.GameTicking.GameRules
{ {

2
Content.Server/GameTicking/GameRules/RuleMaxTimeRestart.cs
View File

@@ -4,7 +4,7 @@ using Content.Server.Interfaces.Chat;
using Content.Server.Interfaces.GameTicking; using Content.Server.Interfaces.GameTicking;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Timer = Robust.Shared.Timers.Timer; using Timer = Robust.Shared.Timing.Timer;
namespace Content.Server.GameTicking.GameRules namespace Content.Server.GameTicking.GameRules
{ {

2
Content.Server/GameTicking/GameRules/RuleSuspicion.cs
View File

@@ -17,7 +17,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Robust.Shared.Timing; using Robust.Shared.Timing;
using Timer = Robust.Shared.Timers.Timer; using Timer = Robust.Shared.Timing.Timer;
namespace Content.Server.GameTicking.GameRules namespace Content.Server.GameTicking.GameRules
{ {

2
Content.Server/GameTicking/GameTicker.cs
View File

@@ -49,7 +49,7 @@ using Robust.Shared.Timing;
using Robust.Shared.Utility; using Robust.Shared.Utility;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
using Timer = Robust.Shared.Timers.Timer; using Timer = Robust.Shared.Timing.Timer;
namespace Content.Server.GameTicking namespace Content.Server.GameTicking
{ {

2
Content.Server/GameTicking/GameTickerBase.cs
View File

@@ -3,7 +3,7 @@ using Content.Shared.GameTicking;
using Robust.Server.Player; using Robust.Server.Player;
using Robust.Shared.Enums; using Robust.Shared.Enums;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Timers; using Robust.Shared.Timing;
#nullable enable #nullable enable

2
Content.Server/StationEvents/PowerGridCheck.cs
View File

@@ -8,7 +8,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Robust.Shared.Random; using Robust.Shared.Random;
using Timer = Robust.Shared.Timers.Timer; using Timer = Robust.Shared.Timing.Timer;
namespace Content.Server.StationEvents namespace Content.Server.StationEvents
{ {

4
Content.Server/StationEvents/RadiationStorm.cs
View File

@@ -1,14 +1,14 @@
#nullable enable #nullable enable
using JetBrains.Annotations; using JetBrains.Annotations;
using Content.Server.GameObjects.Components.StationEvents; using Content.Server.GameObjects.Components.StationEvents;
using Content.Server.Interfaces.GameTicking; using Content.Server.Interfaces.GameTicking;
using Content.Shared.Utility; using Content.Shared.Utility;
using Robust.Server.Timing;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Random; using Robust.Shared.Random;
using Robust.Shared.Timing;
namespace Content.Server.StationEvents namespace Content.Server.StationEvents
{ {

2
RobustToolbox

Submodule RobustToolbox updated: 3ef4ac7452...e0cdcd228e