Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix namespaces and optimize imports (#1651)

Browse Source 
* Fix namespaces and optimize imports

* Cleanup fixes

* Merge conflict fixes

* Merge conflict fixes

* Merge conflict fixes
This commit is contained in:
DrSmugleaf
2020-08-13 14:40:27 +02:00
committed by GitHub
parent 05a76d55f7
commit 4a8ed41e3a
500 changed files with 1044 additions and 1557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
using System.Collections.Generic;
using Robust.Server.Interfaces.Player;
using Content.Shared.Preferences;
using Robust.Server.Interfaces.Player;
namespace Content.Server.GameTicking
{

6
Content.Server/GameTicking/GamePresets/PresetSuspicion.cs
View File

@@ -1,21 +1,17 @@
using Content.Server.GameTicking.GameRules;
using Content.Server.Interfaces;
using Content.Server.Interfaces.Chat;
using Content.Server.Interfaces.GameTicking;
using Content.Server.Mobs.Roles;
using Content.Server.Players;
using Content.Shared.Antags;
using Robust.Server.Interfaces.Player;
using Robust.Shared.Interfaces.Random;
using Robust.Shared.IoC;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using System;
using System.Collections.Generic;
using System.Linq;
using Content.Shared.Roles;
using Robust.Shared.Log;
using System.Threading.Tasks;
using Content.Shared.Preferences;
using Robust.Shared.Maths;

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

@@ -1,6 +1,6 @@
using System;
using System.Threading;
using Content.Server.GameObjects;
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.Interfaces.Chat;
using Content.Server.Interfaces.GameTicking;
using Robust.Server.Interfaces.Player;

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

@@ -1,21 +1,14 @@
using System;
using System.Linq;
using System.Threading;
using Content.Server.GameObjects;
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.Components.Observer;
using Content.Server.Interfaces.Chat;
using Content.Server.Interfaces.GameTicking;
using Content.Server.Mobs.Roles;
using Content.Server.Players;
using NFluidsynth;
using Robust.Server.Interfaces.Player;
using Robust.Server.Player;
using Robust.Shared.Enums;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Logger = Robust.Shared.Log.Logger;
using Timer = Robust.Shared.Timers.Timer;
namespace Content.Server.GameTicking.GameRules

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

@@ -2,8 +2,8 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using Content.Shared.Jobs;
using Content.Shared.Preferences;
using Content.Shared.Roles;
using Robust.Server.Interfaces.Player;
using Robust.Shared.Localization;
using Robust.Shared.Random;

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

@@ -3,15 +3,14 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Content.Server.GameObjects;
using Content.Server.GameObjects.Components;
using Content.Server.GameObjects.Components.Access;
using Content.Server.GameObjects.Components.GUI;
using Content.Server.GameObjects.Components.Items.Storage;
using Content.Server.GameObjects.Components.Markers;
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.Components.Observer;
using Content.Server.GameObjects.Components.PDA;
using Content.Server.Interfaces.GameObjects.Components.Interaction;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.GameObjects.EntitySystems.AI.Pathfinding;
using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible;
using Content.Server.GameTicking.GamePresets;
@@ -24,8 +23,8 @@ using Content.Server.Players;
using Content.Shared;
using Content.Shared.Chat;
using Content.Shared.GameObjects.Components.PDA;
using Content.Shared.Jobs;
using Content.Shared.Preferences;
using Content.Shared.Roles;
using Prometheus;
using Robust.Server.Interfaces;
using Robust.Server.Interfaces.Maps;

8
Content.Server/GameTicking/GameTickerCommands.cs
View File

@@ -1,12 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Content.Server.BodySystem;
using Content.Server.Health.BodySystem;
using Content.Server.Health.BodySystem.BodyPart;
using Content.Server.Interfaces.GameTicking;
using Content.Server.Players;
using Content.Shared.BodySystem;
using Content.Shared.Jobs;
using Content.Shared.Health.BodySystem;
using Content.Shared.Health.BodySystem.BodyPart;
using Content.Shared.Maps;
using Content.Shared.Roles;
using Robust.Server.Interfaces.Console;
using Robust.Server.Interfaces.Player;
using Robust.Shared.GameObjects.Components.Transform;