Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

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

@@ -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
{

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

@@ -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
{

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

@@ -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
{

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

@@ -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
{

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

@@ -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
{

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

@@ -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