tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

3
Content.Benchmarks/ComponentManagerGetAllComponents.cs
View File

@@ -1,5 +1,4 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Attributes;
using Moq; using Moq;
using Robust.Shared.Exceptions; using Robust.Shared.Exceptions;

14
Content.Client/Atmos/GasTileOverlay.cs
View File

@@ -1,25 +1,13 @@
using System; using Content.Client.GameObjects.EntitySystems;
using System.Collections.Generic;
using System.Linq;
using Content.Client.GameObjects.EntitySystems;
using Content.Client.Utility;
using JetBrains.Annotations;
using Robust.Client.Graphics;
using Robust.Client.Graphics.ClientEye; using Robust.Client.Graphics.ClientEye;
using Robust.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using Robust.Client.Graphics.Overlays; using Robust.Client.Graphics.Overlays;
using Robust.Client.Interfaces.Graphics; using Robust.Client.Interfaces.Graphics;
using Robust.Client.Interfaces.Graphics.ClientEye; using Robust.Client.Interfaces.Graphics.ClientEye;
using Robust.Client.Interfaces.ResourceManagement;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Map;
using Robust.Shared.Interfaces.Resources;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Map;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
namespace Content.Client.Atmos namespace Content.Client.Atmos
{ {

3
Content.Client/Chat/ChatBox.cs
View File

@@ -1,5 +1,4 @@
using System.Collections.Generic; using Content.Shared.Chat;
using Content.Shared.Chat;
using Robust.Client.Console; using Robust.Client.Console;
using Robust.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;

2
Content.Client/ClientContentIoC.cs
View File

@@ -8,9 +8,7 @@ using Content.Client.Sandbox;
using Content.Client.UserInterface; using Content.Client.UserInterface;
using Content.Client.UserInterface.Stylesheets; using Content.Client.UserInterface.Stylesheets;
using Content.Client.Utility; using Content.Client.Utility;
using Content.Shared.Chemistry;
using Content.Shared.Interfaces; using Content.Shared.Interfaces;
using Content.Shared.Interfaces.Chemistry;
using Robust.Shared.IoC; using Robust.Shared.IoC;
namespace Content.Client namespace Content.Client

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

@@ -5,7 +5,6 @@ using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Robust.Shared.Log;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Timer = Robust.Shared.Timers.Timer; using Timer = Robust.Shared.Timers.Timer;

3
Content.Client/Commands/DebugAiCommand.cs
View File

@@ -1,10 +1,7 @@
using Content.Client.GameObjects.EntitySystems.AI; using Content.Client.GameObjects.EntitySystems.AI;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Client.Interfaces.Console; using Robust.Client.Interfaces.Console;
using Robust.Client.Player;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
namespace Content.Client.Commands namespace Content.Client.Commands
{ {

5
Content.Client/Commands/DebugCommands.cs
View File

@@ -1,15 +1,12 @@
using Content.Client.GameObjects.Components; using Content.Client.GameObjects.Components;
using Content.Client.GameObjects.EntitySystems; using Content.Client.GameObjects.EntitySystems;
using Content.Client.Interfaces; using Content.Client.Interfaces;
using Content.Shared.GameObjects.Components.Markers; using Content.Shared.GameObjects;
using Robust.Client.Console.Commands;
using Robust.Client.Interfaces.Console; using Robust.Client.Interfaces.Console;
using Robust.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using DrawDepth = Content.Shared.GameObjects.DrawDepth;
namespace Content.Client.Commands namespace Content.Client.Commands
{ {

2
Content.Client/Commands/DebugPathfindingCommand.cs
View File

@@ -2,8 +2,6 @@ using Content.Client.GameObjects.EntitySystems.AI;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Client.Interfaces.Console; using Robust.Client.Interfaces.Console;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
namespace Content.Client.Commands namespace Content.Client.Commands
{ {

2
Content.Client/EntryPoint.cs
View File

@@ -12,6 +12,8 @@ using Content.Client.UserInterface.Stylesheets;
using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.Components;
using Content.Shared.GameObjects.Components.Cargo; using Content.Shared.GameObjects.Components.Cargo;
using Content.Shared.GameObjects.Components.Chemistry; using Content.Shared.GameObjects.Components.Chemistry;
using Content.Shared.GameObjects.Components.Chemistry.ChemMaster;
using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser;
using Content.Shared.GameObjects.Components.Gravity; using Content.Shared.GameObjects.Components.Gravity;
using Content.Shared.GameObjects.Components.Markers; using Content.Shared.GameObjects.Components.Markers;
using Content.Shared.GameObjects.Components.Research; using Content.Shared.GameObjects.Components.Research;

1
Content.Client/GameObjects/Components/Actor/CharacterInterface.cs
View File

@@ -9,7 +9,6 @@ using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC; using Robust.Shared.IoC;
namespace Content.Client.GameObjects.Components.Actor namespace Content.Client.GameObjects.Components.Actor

3
Content.Client/GameObjects/Components/Atmos/GasAnalyzerBoundUserInterface.cs
View File

@@ -1,8 +1,5 @@
using Robust.Client.GameObjects.Components.UserInterface; using Robust.Client.GameObjects.Components.UserInterface;
using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.GameObjects.Components.UserInterface;
using System;
using System.Collections.Generic;
using System.Text;
using static Content.Shared.GameObjects.Components.SharedGasAnalyzerComponent; using static Content.Shared.GameObjects.Components.SharedGasAnalyzerComponent;
namespace Content.Client.GameObjects.Components.Atmos namespace Content.Client.GameObjects.Components.Atmos

7
Content.Client/GameObjects/Components/Atmos/GasAnalyzerComponent.cs
View File

@@ -1,6 +1,6 @@
using Content.Client.UserInterface.Stylesheets; using System;
using Content.Client.UserInterface.Stylesheets;
using Content.Client.Utility; using Content.Client.Utility;
using Content.Shared.GameObjects;
using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.Components;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
@@ -8,9 +8,6 @@ using Robust.Shared.GameObjects;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Robust.Shared.Timing; using Robust.Shared.Timing;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using System;
using System.Collections.Generic;
using System.Text;
namespace Content.Client.GameObjects.Components.Atmos namespace Content.Client.GameObjects.Components.Atmos
{ {

10
Content.Client/GameObjects/Components/Atmos/GasAnalyzerMenu.cs
View File

@@ -1,19 +1,11 @@
using System; using Content.Client.UserInterface.Stylesheets;
using Content.Client.Animations;
using Content.Client.GameObjects.EntitySystems;
using Content.Client.UserInterface.Stylesheets;
using Content.Client.Utility; using Content.Client.Utility;
using Content.Shared.GameObjects.Components;
using Content.Shared.Utility; using Content.Shared.Utility;
using Robust.Client.Animations;
using Robust.Client.Graphics;
using Robust.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.Animations;
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;

6
Content.Client/GameObjects/Components/Cargo/CargoOrderDatabaseComponent.cs
View File

@@ -1,8 +1,8 @@
using Content.Shared.GameObjects.Components.Cargo; using System;
using System.Collections.Generic;
using Content.Shared.GameObjects.Components.Cargo;
using Content.Shared.Prototypes.Cargo; using Content.Shared.Prototypes.Cargo;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using System;
using System.Collections.Generic;
namespace Content.Client.GameObjects.Components.Cargo namespace Content.Client.GameObjects.Components.Cargo
{ {

4
Content.Client/GameObjects/Components/Cargo/GalacticMarketComponent.cs
View File

@@ -1,9 +1,9 @@
using Content.Shared.GameObjects.Components.Cargo; using System;
using Content.Shared.GameObjects.Components.Cargo;
using Content.Shared.Prototypes.Cargo; using Content.Shared.Prototypes.Cargo;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using System;
namespace Content.Client.GameObjects.Components.Cargo namespace Content.Client.GameObjects.Components.Cargo
{ {

7
Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterBoundUserInterface.cs
View File

@@ -1,13 +1,12 @@
#nullable enable #nullable enable
using Content.Client.GameObjects.Components.Chemistry.ChemMaster; using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser;
using Content.Shared.GameObjects.Components.Chemistry;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Client.GameObjects.Components.UserInterface; using Robust.Client.GameObjects.Components.UserInterface;
using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using static Content.Shared.GameObjects.Components.Chemistry.SharedChemMasterComponent; using static Content.Shared.GameObjects.Components.Chemistry.ChemMaster.SharedChemMasterComponent;
namespace Content.Client.GameObjects.Components.Chemistry namespace Content.Client.GameObjects.Components.Chemistry.ChemMaster
{ {
/// <summary> /// <summary>
/// Initializes a <see cref="ChemMasterWindow"/> and updates it when new server messages are received. /// Initializes a <see cref="ChemMasterWindow"/> and updates it when new server messages are received.

7
Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterWindow.cs
View File

@@ -1,10 +1,8 @@
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using Content.Client.UserInterface;
using Content.Client.UserInterface.Stylesheets; using Content.Client.UserInterface.Stylesheets;
using Content.Shared.Chemistry; using Content.Shared.Chemistry;
using Content.Shared.GameObjects.Components.Chemistry; using Content.Shared.GameObjects.Components.Chemistry.ChemMaster;
using Robust.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
@@ -12,10 +10,9 @@ using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Robust.Shared.Log;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using static Content.Shared.GameObjects.Components.Chemistry.SharedChemMasterComponent; using static Content.Shared.GameObjects.Components.Chemistry.ChemMaster.SharedChemMasterComponent;
namespace Content.Client.GameObjects.Components.Chemistry.ChemMaster namespace Content.Client.GameObjects.Components.Chemistry.ChemMaster
{ {

7
Content.Client/GameObjects/Components/Chemistry/InjectorComponent.cs
View File

@@ -1,14 +1,13 @@
using Content.Client.UserInterface; using Content.Client.UserInterface.Stylesheets;
using Content.Client.UserInterface.Stylesheets;
using Content.Client.Utility; using Content.Client.Utility;
using Robust.Shared.Timing; using Content.Shared.Chemistry;
using Content.Shared.GameObjects.Components.Chemistry; using Content.Shared.GameObjects.Components.Chemistry;
using Robust.Client.UserInterface; 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.Localization; using Robust.Shared.Localization;
using Robust.Shared.Timing;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using Content.Shared.Chemistry;
namespace Content.Client.GameObjects.Components.Chemistry namespace Content.Client.GameObjects.Components.Chemistry
{ {

6
Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs
View File

@@ -1,15 +1,15 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Content.Shared.GameObjects.Components.Chemistry; using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Client.GameObjects.Components.UserInterface; using Robust.Client.GameObjects.Components.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using static Content.Shared.GameObjects.Components.Chemistry.SharedReagentDispenserComponent; using static Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser.SharedReagentDispenserComponent;
namespace Content.Client.GameObjects.Components.Chemistry namespace Content.Client.GameObjects.Components.Chemistry.ReagentDispenser
{ {
/// <summary> /// <summary>
/// Initializes a <see cref="ReagentDispenserWindow"/> and updates it when new server messages are received. /// Initializes a <see cref="ReagentDispenserWindow"/> and updates it when new server messages are received.

7
Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs
View File

@@ -1,8 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using Content.Client.UserInterface;
using Content.Client.UserInterface.Stylesheets; using Content.Client.UserInterface.Stylesheets;
using Content.Shared.Chemistry; using Content.Shared.Chemistry;
using Content.Shared.GameObjects.Components.Chemistry; using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser;
using Robust.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
@@ -12,9 +11,9 @@ using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using static Content.Shared.GameObjects.Components.Chemistry.SharedReagentDispenserComponent; using static Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser.SharedReagentDispenserComponent;
namespace Content.Client.GameObjects.Components.Chemistry namespace Content.Client.GameObjects.Components.Chemistry.ReagentDispenser
{ {
/// <summary> /// <summary>
/// Client-side UI used to control a <see cref="SharedReagentDispenserComponent"/> /// Client-side UI used to control a <see cref="SharedReagentDispenserComponent"/>

4
Content.Client/GameObjects/Components/DamageableComponent.cs
View File

@@ -1,8 +1,8 @@
using System.Collections.Generic; using System.Collections.Generic;
using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Damage;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
namespace Content.Client.GameObjects namespace Content.Client.GameObjects.Components
{ {
/// <summary> /// <summary>
/// Fuck I really hate doing this /// Fuck I really hate doing this

1
Content.Client/GameObjects/Components/Disposal/DisposalUnitBoundUserInterface.cs
View File

@@ -2,7 +2,6 @@
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Client.GameObjects.Components.UserInterface; using Robust.Client.GameObjects.Components.UserInterface;
using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.Localization;
using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalUnitComponent; using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalUnitComponent;
namespace Content.Client.GameObjects.Components.Disposal namespace Content.Client.GameObjects.Components.Disposal

3
Content.Client/GameObjects/Components/Disposal/DisposalUnitWindow.cs
View File

@@ -1,5 +1,4 @@
using System.Runtime.CompilerServices; using Content.Shared.GameObjects.Components.Disposal;
using Content.Shared.GameObjects.Components.Disposal;
using Robust.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;

1
Content.Client/GameObjects/Components/Gravity/GravityGeneratorBoundUserInterface.cs
View File

@@ -1,4 +1,3 @@
using System;
using Content.Shared.GameObjects.Components.Gravity; using Content.Shared.GameObjects.Components.Gravity;
using Robust.Client.GameObjects.Components.UserInterface; using Robust.Client.GameObjects.Components.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;

6
Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs
View File

@@ -1,7 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Content.Client.GameObjects.Components.Clothing; using Content.Client.GameObjects.Components.Clothing;
using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Inventory;
using Content.Shared.Preferences.Appearance; using Content.Shared.Preferences.Appearance;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
@@ -10,9 +10,9 @@ using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
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 static Content.Shared.GameObjects.SharedInventoryComponent.ClientInventoryMessage; using static Content.Shared.GameObjects.Components.Inventory.SharedInventoryComponent.ClientInventoryMessage;
namespace Content.Client.GameObjects namespace Content.Client.GameObjects.Components.HUD.Inventory
{ {
/// <summary> /// <summary>
/// A character UI which shows items the user has equipped within his inventory /// A character UI which shows items the user has equipped within his inventory

8
Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs
View File

@@ -1,4 +1,6 @@
using Content.Client.Utility; using System.Collections.Generic;
using Content.Client.UserInterface;
using Content.Client.Utility;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
@@ -9,10 +11,8 @@ using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
using Content.Client.UserInterface;
using System.Collections.Generic;
namespace Content.Client.GameObjects namespace Content.Client.GameObjects.Components.HUD.Inventory
{ {
// Dynamically instantiated by ClientInventoryComponent. // Dynamically instantiated by ClientInventoryComponent.
[UsedImplicitly] [UsedImplicitly]

2
Content.Client/GameObjects/Components/HUD/Inventory/InventoryInterfaceController.cs
View File

@@ -8,7 +8,7 @@ using Robust.Shared.Input;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
namespace Content.Client.GameObjects namespace Content.Client.GameObjects.Components.HUD.Inventory
{ {
public abstract class InventoryInterfaceController : IDisposable public abstract class InventoryInterfaceController : IDisposable
{ {

1
Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs
View File

@@ -1,6 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using Content.Client.GameObjects.EntitySystems; using Content.Client.GameObjects.EntitySystems;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;

6
Content.Client/GameObjects/Components/Instruments/InstrumentComponent.cs
View File

@@ -4,16 +4,16 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using Content.Shared.GameObjects.Components.Instruments; using Content.Shared.GameObjects.Components.Instruments;
using Content.Shared.Physics; using Content.Shared.Physics;
using Robust.Shared.GameObjects;
using Robust.Client.Audio.Midi; using Robust.Client.Audio.Midi;
using Robust.Shared.Audio.Midi;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using Robust.Shared.Interfaces.Timing; using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Players; using Robust.Shared.Players;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Robust.Shared.Timers;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using MidiEvent = Robust.Shared.Audio.Midi.MidiEvent;
using Timer = Robust.Shared.Timers.Timer;
namespace Content.Client.GameObjects.Components.Instruments namespace Content.Client.GameObjects.Components.Instruments
{ {

4
Content.Client/GameObjects/Components/Interactable/MultiToolComponent.cs
View File

@@ -1,12 +1,10 @@
using System; using Content.Client.UserInterface.Stylesheets;
using Content.Client.UserInterface.Stylesheets;
using Content.Client.Utility; using Content.Client.Utility;
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
using Content.Shared.GameObjects.Components.Interactable; using Content.Shared.GameObjects.Components.Interactable;
using Robust.Client.UserInterface; 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.Localization;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Robust.Shared.Timing; using Robust.Shared.Timing;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;

2
Content.Client/GameObjects/Components/Items/ItemStatusComponent.cs
View File

@@ -1,6 +1,6 @@
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
namespace Content.Client.GameObjects namespace Content.Client.GameObjects.Components.Items
{ {
[RegisterComponent] [RegisterComponent]
public class ItemStatusComponent : Component public class ItemStatusComponent : Component

17
Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs
View File

@@ -1,21 +1,20 @@
using System; using System;
using Robust.Client.GameObjects.Components.UserInterface;
using Content.Shared.Kitchen;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.IoC;
using Robust.Shared.Prototypes;
using Content.Shared.Chemistry;
using Robust.Shared.GameObjects;
using System.Collections.Generic; using System.Collections.Generic;
using Robust.Shared.Interfaces.GameObjects; using Content.Shared.Chemistry;
using Content.Shared.Kitchen;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Client.GameObjects.Components.UserInterface;
using Robust.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
namespace Content.Client.GameObjects.Components.Kitchen namespace Content.Client.GameObjects.Components.Kitchen
{ {

1
Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs
View File

@@ -7,7 +7,6 @@ using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Shared.Audio; using Robust.Shared.Audio;
using Robust.Shared.Log; using Robust.Shared.Log;
namespace Content.Client.GameObjects.Components.Kitchen namespace Content.Client.GameObjects.Components.Kitchen
{ {
public sealed class MicrowaveVisualizer : AppearanceVisualizer public sealed class MicrowaveVisualizer : AppearanceVisualizer

1
Content.Client/GameObjects/Components/MagicMirrorBoundUserInterface.cs
View File

@@ -1,6 +1,5 @@
using System; using System;
using System.Linq; using System.Linq;
using Content.Client.UserInterface;
using Content.Client.UserInterface.Stylesheets; using Content.Client.UserInterface.Stylesheets;
using Content.Shared.Preferences.Appearance; using Content.Shared.Preferences.Appearance;
using JetBrains.Annotations; using JetBrains.Annotations;

1
Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs
View File

@@ -2,7 +2,6 @@
using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using Robust.Shared.Log; using Robust.Shared.Log;
using Robust.Shared.Maths; using Robust.Shared.Maths;

3
Content.Client/GameObjects/Components/Mobs/ClientOverlayEffectsComponent.cs
View File

@@ -1,13 +1,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection;
using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.Interfaces; using Content.Shared.Interfaces;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Client.Graphics.Overlays; using Robust.Client.Graphics.Overlays;
using Robust.Client.Interfaces.Graphics.Overlays; using Robust.Client.Interfaces.Graphics.Overlays;
using Robust.Client.Player;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
@@ -15,7 +13,6 @@ using Robust.Shared.Interfaces.Reflection;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Log; using Robust.Shared.Log;
using Robust.Shared.Players; using Robust.Shared.Players;
using Robust.Shared.Utility;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
namespace Content.Client.GameObjects.Components.Mobs namespace Content.Client.GameObjects.Components.Mobs

5
Content.Client/GameObjects/Components/Mobs/CombatModeComponent.cs
View File

@@ -1,13 +1,10 @@
using System; using Content.Client.UserInterface;
using Content.Client.UserInterface;
using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Client.Player; using Robust.Client.Player;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Players;
namespace Content.Client.GameObjects.Components.Mobs namespace Content.Client.GameObjects.Components.Mobs
{ {

3
Content.Client/GameObjects/Components/Mobs/DamageStateVisualizer.cs
View File

@@ -1,12 +1,11 @@
using System.Collections.Generic; using System.Collections.Generic;
using Content.Shared.GameObjects;
using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.Utility; using Robust.Shared.Utility;
using YamlDotNet.RepresentationModel; using YamlDotNet.RepresentationModel;
using DrawDepth = Content.Shared.GameObjects.DrawDepth;
namespace Content.Client.GameObjects.Components.Mobs namespace Content.Client.GameObjects.Components.Mobs
{ {

1
Content.Client/GameObjects/Components/Observer/GhostComponent.cs
View File

@@ -4,7 +4,6 @@ using Robust.Client.GameObjects;
using Robust.Client.Player; using Robust.Client.Player;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;

2
Content.Client/GameObjects/Components/Paper/PaperBoundUserInterface.cs
View File

@@ -3,7 +3,7 @@ using Robust.Client.GameObjects.Components.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.GameObjects.Components.UserInterface;
namespace Content.Client.GameObjects.Components namespace Content.Client.GameObjects.Components.Paper
{ {
public class PaperBoundUserInterface : BoundUserInterface public class PaperBoundUserInterface : BoundUserInterface
{ {

2
Content.Client/GameObjects/Components/Paper/PaperWindow.cs
View File

@@ -4,7 +4,7 @@ using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Utility; using Robust.Shared.Utility;
namespace Content.Client.GameObjects.Components namespace Content.Client.GameObjects.Components.Paper
{ {
public class PaperWindow : SS14Window public class PaperWindow : SS14Window
{ {

1
Content.Client/GameObjects/Components/Pointing/RoguePointingArrowVisualizer.cs
View File

@@ -1,5 +1,4 @@
using System; using System;
using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.GameObjects.Components.Pointing; using Content.Shared.GameObjects.Components.Pointing;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Client.Animations; using Robust.Client.Animations;

1
Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs
View File

@@ -1,5 +1,4 @@
using System; using System;
using Content.Client.UserInterface;
using Content.Client.UserInterface.Stylesheets; using Content.Client.UserInterface.Stylesheets;
using Content.Shared.GameObjects.Components.Power; using Content.Shared.GameObjects.Components.Power;
using Robust.Client.GameObjects.Components.UserInterface; using Robust.Client.GameObjects.Components.UserInterface;

2
Content.Client/GameObjects/Components/Power/SolarControlConsoleBoundUserInterface.cs
View File

@@ -1,6 +1,4 @@
using System; using System;
using Content.Client.UserInterface;
using Content.Client.UserInterface.Stylesheets;
using Content.Shared.GameObjects.Components.Power; using Content.Shared.GameObjects.Components.Power;
using Robust.Client.GameObjects.Components.UserInterface; using Robust.Client.GameObjects.Components.UserInterface;
using Robust.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;

1
Content.Client/GameObjects/Components/RadiatingLightComponent.cs
View File

@@ -4,7 +4,6 @@ using Robust.Client.GameObjects;
using Robust.Client.GameObjects.Components.Animations; using Robust.Client.GameObjects.Components.Animations;
using Robust.Shared.Animations; using Robust.Shared.Animations;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Maths;
namespace Content.Client.GameObjects.Components namespace Content.Client.GameObjects.Components
{ {

2
Content.Client/GameObjects/Components/Sound/LoopingSoundComponent.cs
View File

@@ -4,14 +4,12 @@ using Content.Shared.Physics;
using Robust.Client.GameObjects.EntitySystems; using Robust.Client.GameObjects.EntitySystems;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using Robust.Shared.Interfaces.Random; using Robust.Shared.Interfaces.Random;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Players; using Robust.Shared.Players;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Robust.Shared.Timers; using Robust.Shared.Timers;
using Robust.Shared.Utility;
namespace Content.Client.GameObjects.Components.Sound namespace Content.Client.GameObjects.Components.Sound
{ {

4
Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
View File

@@ -1,14 +1,14 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Content.Client.GameObjects.Components.Items; using Content.Client.GameObjects.Components.Items;
using Content.Shared.GameObjects.Components.Storage;
using Content.Client.Interfaces.GameObjects.Components.Interaction; using Content.Client.Interfaces.GameObjects.Components.Interaction;
using Content.Shared.GameObjects.Components.Storage;
using Robust.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using Robust.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Client.Player;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.CustomControls;
using Robust.Client.Player;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;

4
Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer.cs
View File

@@ -1,5 +1,5 @@
using System; using System;
using Content.Shared.GameObjects.Components.Triggers; using Content.Shared.GameObjects.Components.Trigger;
using Robust.Client.Animations; using Robust.Client.Animations;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Client.GameObjects.Components.Animations; using Robust.Client.GameObjects.Components.Animations;
@@ -8,7 +8,7 @@ using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Utility; using Robust.Shared.Utility;
using YamlDotNet.RepresentationModel; using YamlDotNet.RepresentationModel;
namespace Content.Client.GameObjects.Components.Doors namespace Content.Client.GameObjects.Components.Trigger
{ {
public class TimerTriggerVisualizer : AppearanceVisualizer public class TimerTriggerVisualizer : AppearanceVisualizer
{ {

1
Content.Client/GameObjects/Components/Wires/WiresMenu.cs
View File

@@ -5,7 +5,6 @@ using Content.Client.UserInterface.Stylesheets;
using Content.Client.Utility; using Content.Client.Utility;
using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.Components;
using Robust.Client.Animations; using Robust.Client.Animations;
using Robust.Client.Graphics;
using Robust.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;

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

@@ -1,11 +1,9 @@
using Content.Client.GameObjects.Components.Actor; using Content.Client.GameObjects.Components.Actor;
using Content.Client.UserInterface; using Content.Client.UserInterface;
using Content.Shared.Input; using Content.Shared.Input;
using Robust.Client.GameObjects.EntitySystems;
using Robust.Client.Player; using Robust.Client.Player;
using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Input;
using Robust.Shared.Input.Binding; using Robust.Shared.Input.Binding;
using Robust.Shared.IoC; using Robust.Shared.IoC;

3
Content.Client/GameObjects/EntitySystems/ClientInventorySystem.cs
View File

@@ -1,10 +1,9 @@
using Content.Client.GameObjects.Components.HUD.Inventory;
using Content.Client.UserInterface; using Content.Client.UserInterface;
using Content.Shared.Input; using Content.Shared.Input;
using Robust.Client.GameObjects.EntitySystems;
using Robust.Client.Player; using Robust.Client.Player;
using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Input;
using Robust.Shared.Input.Binding; using Robust.Shared.Input.Binding;
using Robust.Shared.IoC; using Robust.Shared.IoC;

9
Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs
View File

@@ -1,25 +1,16 @@
using Content.Client.GameObjects.Components.Mobs; using Content.Client.GameObjects.Components.Mobs;
using Content.Client.UserInterface; using Content.Client.UserInterface;
using Content.Client.Utility;
using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.GameObjects.EntitySystemMessages; using Content.Shared.GameObjects.EntitySystemMessages;
using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.Input; using Content.Shared.Input;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Client.GameObjects.EntitySystems;
using Robust.Client.Graphics.Drawing;
using Robust.Client.Graphics.Overlays;
using Robust.Client.Interfaces.Graphics.Overlays;
using Robust.Client.Interfaces.Input;
using Robust.Client.Player; using Robust.Client.Player;
using Robust.Shared.Input;
using Robust.Shared.Input.Binding; using Robust.Shared.Input.Binding;
using Robust.Shared.Interfaces.Timing; using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Players; using Robust.Shared.Players;
using static Content.Client.StaticIoC;
namespace Content.Client.GameObjects.EntitySystems namespace Content.Client.GameObjects.EntitySystems
{ {

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

@@ -3,6 +3,7 @@ using Content.Client.Construction;
using Content.Client.GameObjects.Components.Construction; using Content.Client.GameObjects.Components.Construction;
using Content.Client.UserInterface; using Content.Client.UserInterface;
using Content.Shared.Construction; using Content.Shared.Construction;
using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.Input; using Content.Shared.Input;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
@@ -21,7 +22,7 @@ namespace Content.Client.GameObjects.EntitySystems
/// The client-side implementation of the construction system, which is used for constructing entities in game. /// The client-side implementation of the construction system, which is used for constructing entities in game.
/// </summary> /// </summary>
[UsedImplicitly] [UsedImplicitly]
public class ConstructionSystem : Shared.GameObjects.EntitySystems.SharedConstructionSystem public class ConstructionSystem : SharedConstructionSystem
{ {
#pragma warning disable 649 #pragma warning disable 649
[Dependency] private readonly IGameHud _gameHud; [Dependency] private readonly IGameHud _gameHud;

4
Content.Client/GameObjects/EntitySystems/DragDropSystem.cs
View File

@@ -95,8 +95,8 @@ namespace Content.Client.GameObjects.EntitySystems
_dropTargetInRangeShader = _prototypeManager.Index<ShaderPrototype>(ShaderDropTargetInRange).Instance(); _dropTargetInRangeShader = _prototypeManager.Index<ShaderPrototype>(ShaderDropTargetInRange).Instance();
_dropTargetOutOfRangeShader = _prototypeManager.Index<ShaderPrototype>(ShaderDropTargetOutOfRange).Instance(); _dropTargetOutOfRangeShader = _prototypeManager.Index<ShaderPrototype>(ShaderDropTargetOutOfRange).Instance();
_interactionSystem = EntitySystem.Get<SharedInteractionSystem>(); _interactionSystem = Get<SharedInteractionSystem>();
_inputSystem = EntitySystem.Get<InputSystem>(); _inputSystem = Get<InputSystem>();
// needs to fire on mouseup and mousedown so we can detect a drag / drop // needs to fire on mouseup and mousedown so we can detect a drag / drop
CommandBinds.Builder CommandBinds.Builder
.Bind(EngineKeyFunctions.Use, new PointerInputCmdHandler(OnUse, false)) .Bind(EngineKeyFunctions.Use, new PointerInputCmdHandler(OnUse, false))

4
Content.Client/GameObjects/EntitySystems/ExamineSystem.cs
View File

@@ -5,7 +5,6 @@ using Content.Shared.GameObjects.EntitySystemMessages;
using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.Input; using Content.Shared.Input;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Client.GameObjects.EntitySystems;
using Robust.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Client.Interfaces.Input; using Robust.Client.Interfaces.Input;
using Robust.Client.Interfaces.UserInterface; using Robust.Client.Interfaces.UserInterface;
@@ -13,7 +12,6 @@ using Robust.Client.Player;
using Robust.Client.UserInterface; 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.Input;
using Robust.Shared.Input.Binding; using Robust.Shared.Input.Binding;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
@@ -109,7 +107,7 @@ namespace Content.Client.GameObjects.EntitySystems
FormattedMessage message; FormattedMessage message;
if (entity.Uid.IsClientSide()) if (entity.Uid.IsClientSide())
{ {
message = ExamineSystem.GetExamineText(entity, _playerManager.LocalPlayer.ControlledEntity); message = GetExamineText(entity, _playerManager.LocalPlayer.ControlledEntity);
} }
else else
{ {

6
Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
View File

@@ -1,22 +1,16 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using Content.Client.Atmos;
using Content.Client.Utility;
using Content.Shared.Atmos; using Content.Shared.Atmos;
using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Client.Graphics; using Robust.Client.Graphics;
using Robust.Client.Interfaces.Graphics.Overlays;
using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.ResourceManagement; using Robust.Client.ResourceManagement;
using Robust.Client.Utility; using Robust.Client.Utility;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using Robust.Shared.Utility; using Robust.Shared.Utility;
namespace Content.Client.GameObjects.EntitySystems namespace Content.Client.GameObjects.EntitySystems

1
Content.Client/GameObjects/EntitySystems/MoverSystem.cs
View File

@@ -1,7 +1,6 @@
#nullable enable #nullable enable
using Content.Shared.GameObjects.Components.Movement; using Content.Shared.GameObjects.Components.Movement;
using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.Physics;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Client.Physics; using Robust.Client.Physics;
using Robust.Client.Player; using Robust.Client.Player;

1
Content.Client/GameObjects/EntitySystems/StatusEffectsSystem.cs
View File

@@ -1,5 +1,4 @@
using Content.Client.GameObjects.Components.Mobs; using Content.Client.GameObjects.Components.Mobs;
using Content.Shared.GameObjects.Components.Mobs;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.Timing; using Robust.Shared.Interfaces.Timing;

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

@@ -6,8 +6,8 @@ using System.Threading;
using Content.Client.State; using Content.Client.State;
using Content.Client.UserInterface; using Content.Client.UserInterface;
using Content.Client.Utility; using Content.Client.Utility;
using Content.Shared.GameObjects;
using Content.Shared.GameObjects.EntitySystemMessages; using Content.Shared.GameObjects.EntitySystemMessages;
using Content.Shared.GameObjects.Verbs;
using Content.Shared.Input; using Content.Shared.Input;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Client.GameObjects.EntitySystems; using Robust.Client.GameObjects.EntitySystems;

2
Content.Client/GlobalVerbs/ExamineVerb.cs
View File

@@ -1,5 +1,5 @@
using Content.Client.GameObjects.EntitySystems; using Content.Client.GameObjects.EntitySystems;
using Content.Shared.GameObjects; using Content.Shared.GameObjects.Verbs;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Localization; using Robust.Shared.Localization;

2
Content.Client/GlobalVerbs/ViewVariablesVerb.cs
View File

@@ -1,4 +1,4 @@
using Content.Shared.GameObjects; using Content.Shared.GameObjects.Verbs;
using Robust.Client.Console; using Robust.Client.Console;
using Robust.Client.ViewVariables; using Robust.Client.ViewVariables;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;

6
Content.Client/Graphics/Overlays/FlashOverlay.cs
View File

@@ -1,20 +1,16 @@
using System.Net.Mime; using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.Interfaces; using Content.Shared.Interfaces;
using Robust.Client.Graphics; using Robust.Client.Graphics;
using Robust.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using Robust.Client.Graphics.Overlays; using Robust.Client.Graphics.Overlays;
using Robust.Client.Graphics.Shaders; using Robust.Client.Graphics.Shaders;
using Robust.Client.Interfaces.Graphics; using Robust.Client.Interfaces.Graphics;
using Robust.Client.Interfaces.Graphics.ClientEye;
using Robust.Shared.Interfaces.Timing; using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
using SixLabors.ImageSharp; using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.PixelFormats;
using Color = Robust.Shared.Maths.Color;
namespace Content.Client.Graphics.Overlays namespace Content.Client.Graphics.Overlays
{ {

10
Content.Client/Health/BodySystem/BodyScanner/BodyScannerBoundUserInterface.cs
View File

@@ -1,12 +1,10 @@
using Content.Client.UserInterface; using System.Collections.Generic;
using Content.Shared.BodySystem; using Content.Shared.Health.BodySystem.BodyScanner;
using Robust.Client.GameObjects.Components.UserInterface; using Robust.Client.GameObjects.Components.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using System.Collections.Generic;
namespace Content.Client.BodySystem namespace Content.Client.Health.BodySystem.BodyScanner
{ {
public class BodyScannerBoundUserInterface : BoundUserInterface public class BodyScannerBoundUserInterface : BoundUserInterface
{ {
@@ -40,7 +38,7 @@ namespace Content.Client.BodySystem
_template = scannerState.Template; _template = scannerState.Template;
_parts = scannerState.Parts; _parts = scannerState.Parts;
_display.UpdateDisplay(_template, _parts); _display.UpdateDisplay(_template, _parts);
} }

18
Content.Client/Health/BodySystem/BodyScanner/BodyScannerDisplay.cs
View File

@@ -1,20 +1,14 @@
using Content.Client.BodySystem; using System.Collections.Generic;
using Content.Shared.BodySystem; using System.Globalization;
using Robust.Client.Graphics.Drawing; using Content.Shared.Health.BodySystem.BodyScanner;
using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.CustomControls;
using Robust.Client.Utility;
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.Utility;
using System;
using System.Collections.Generic;
using System.Globalization;
using static Robust.Client.UserInterface.Controls.ItemList; using static Robust.Client.UserInterface.Controls.ItemList;
namespace Content.Client.UserInterface namespace Content.Client.Health.BodySystem.BodyScanner
{ {
public sealed class BodyScannerDisplay : SS14Window public sealed class BodyScannerDisplay : SS14Window
{ {
@@ -33,7 +27,7 @@ namespace Content.Client.UserInterface
private BodyScannerTemplateData _template; private BodyScannerTemplateData _template;
private Dictionary<string, BodyScannerBodyPartData> _parts; private Dictionary<string, BodyScannerBodyPartData> _parts;
private List<string> _slots; private List<string> _slots;
private BodyScannerBodyPartData _currentBodyPart; private BodyScannerBodyPartData _currentBodyPart;
@@ -100,7 +94,7 @@ namespace Content.Client.UserInterface
public void UpdateDisplay(BodyScannerTemplateData template, Dictionary<string, BodyScannerBodyPartData> parts) public void UpdateDisplay(BodyScannerTemplateData template, Dictionary<string, BodyScannerBodyPartData> parts)
{ {
_template = template; _template = template;
_parts = parts; _parts = parts;
_slots = new List<string>(); _slots = new List<string>();
BodyPartList.Clear(); BodyPartList.Clear();

11
Content.Client/Health/BodySystem/Surgery/GenericSurgeryBoundUserInterface.cs
View File

@@ -1,15 +1,8 @@
using System; using Content.Shared.Health.BodySystem.Surgery;
using System.Collections.Generic;
using Robust.Client.GameObjects.Components.UserInterface; using Robust.Client.GameObjects.Components.UserInterface;
using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.IoC;
using Robust.Shared.Prototypes;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.Players;
using Content.Shared.BodySystem;
namespace Content.Client.BodySystem namespace Content.Client.Health.BodySystem.Surgery
{ {
//TODO : Make window close if target or surgery tool gets too far away from user. //TODO : Make window close if target or surgery tool gets too far away from user.

11
Content.Client/Health/BodySystem/Surgery/GenericSurgeryWindow.cs
View File

@@ -1,14 +1,13 @@
using Robust.Client.UserInterface; using System;
using System.Collections.Generic;
using System.Globalization;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Text;
namespace Content.Client.BodySystem namespace Content.Client.Health.BodySystem.Surgery
{ {
public class GenericSurgeryWindow : SS14Window public class GenericSurgeryWindow : SS14Window
{ {

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

@@ -1,4 +1,3 @@
using System.Threading.Tasks;
using Content.Client.GameObjects.Components.Instruments; using Content.Client.GameObjects.Components.Instruments;
using Content.Client.UserInterface.Stylesheets; using Content.Client.UserInterface.Stylesheets;
using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems;

2
Content.Client/Jobs/ClownSpecial.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.Jobs; using Content.Shared.Roles;
using JetBrains.Annotations; using JetBrains.Annotations;
namespace Content.Client.Jobs namespace Content.Client.Jobs

1
Content.Client/Parallax/ParallaxGenerator.cs
View File

@@ -9,7 +9,6 @@ using Robust.Shared.Maths;
using Robust.Shared.Noise; using Robust.Shared.Noise;
using Robust.Shared.Random; using Robust.Shared.Random;
using SixLabors.ImageSharp; using SixLabors.ImageSharp;
using SixLabors.ImageSharp.Advanced;
using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.PixelFormats;
using Color = Robust.Shared.Maths.Color; using Color = Robust.Shared.Maths.Color;

1
Content.Client/Sandbox/SandboxManager.cs
View File

@@ -7,7 +7,6 @@ using Robust.Client.Interfaces.Placement;
using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.Input;
using Robust.Shared.Input.Binding; using Robust.Shared.Input.Binding;
using Robust.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Map;
using Robust.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;

1
Content.Client/ScreenshotHook.cs
View File

@@ -4,7 +4,6 @@ using System.Threading.Tasks;
using Content.Shared.Input; using Content.Shared.Input;
using Robust.Client.Interfaces.Graphics; using Robust.Client.Interfaces.Graphics;
using Robust.Client.Interfaces.Input; using Robust.Client.Interfaces.Input;
using Robust.Shared.Input;
using Robust.Shared.Input.Binding; using Robust.Shared.Input.Binding;
using Robust.Shared.Interfaces.Resources; using Robust.Shared.Interfaces.Resources;
using Robust.Shared.IoC; using Robust.Shared.IoC;

7
Content.Client/State/GameScreen.cs
View File

@@ -1,20 +1,13 @@
using System.Collections.Generic;
using System.Collections.Immutable;
using Content.Client.Chat; using Content.Client.Chat;
using Content.Client.Interfaces.Chat; using Content.Client.Interfaces.Chat;
using Content.Client.UserInterface; using Content.Client.UserInterface;
using Content.Shared.Input; using Content.Shared.Input;
using Robust.Client.Console;
using Robust.Client.Interfaces.Input; using Robust.Client.Interfaces.Input;
using Robust.Client.Interfaces.State;
using Robust.Client.Interfaces.UserInterface; using Robust.Client.Interfaces.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Shared.Input;
using Robust.Shared.Input.Binding; using Robust.Shared.Input.Binding;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Robust.Shared.Map;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
namespace Content.Client.State namespace Content.Client.State

3
Content.Client/State/GameScreenBase.cs
View File

@@ -5,11 +5,10 @@ using Content.Client.GameObjects.Components;
using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems;
using Robust.Client.GameObjects.EntitySystems; using Robust.Client.GameObjects.EntitySystems;
using Robust.Client.Interfaces.GameObjects; using Robust.Client.Interfaces.GameObjects;
using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Client.Interfaces.Graphics.ClientEye; using Robust.Client.Interfaces.Graphics.ClientEye;
using Robust.Client.Interfaces.Input; using Robust.Client.Interfaces.Input;
using Robust.Client.Interfaces.UserInterface;
using Robust.Client.Interfaces.State; using Robust.Client.Interfaces.State;
using Robust.Client.Interfaces.UserInterface;
using Robust.Client.Player; using Robust.Client.Player;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Input; using Robust.Shared.Input;

2
Content.Client/State/LobbyState.cs
View File

@@ -9,10 +9,8 @@ using Robust.Client.Interfaces;
using Robust.Client.Interfaces.Input; using Robust.Client.Interfaces.Input;
using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.Interfaces.UserInterface; using Robust.Client.Interfaces.UserInterface;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.Player; using Robust.Client.Player;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Shared.Input;
using Robust.Shared.Input.Binding; using Robust.Shared.Input.Binding;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;

8
Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs
View File

@@ -1,4 +1,7 @@
using Content.Client.GameObjects.Components.Cargo; using System;
using System.Collections.Generic;
using Content.Client.GameObjects.Components.Cargo;
using Content.Client.UserInterface.Stylesheets;
using Content.Shared.Prototypes.Cargo; using Content.Shared.Prototypes.Cargo;
using Robust.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
@@ -7,9 +10,6 @@ using Robust.Client.Utility;
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 System;
using System.Collections.Generic;
using Content.Client.UserInterface.Stylesheets;
namespace Content.Client.UserInterface.Cargo namespace Content.Client.UserInterface.Cargo
{ {

6
Content.Client/UserInterface/Cargo/CargoConsoleOrderMenu.cs
View File

@@ -1,10 +1,8 @@
using Robust.Client.UserInterface.Controls; using System.Collections.Generic;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls; 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 System;
using System.Collections.Generic;
namespace Content.Client.UserInterface.Cargo namespace Content.Client.UserInterface.Cargo
{ {

2
Content.Client/UserInterface/Cargo/GalacticBankSelectionMenu.cs
View File

@@ -5,8 +5,6 @@ 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 System;
using static Robust.Client.UserInterface.Controls.ItemList;
namespace Content.Client.UserInterface.Cargo namespace Content.Client.UserInterface.Cargo
{ {

2
Content.Client/UserInterface/CharacterSetupGui.cs
View File

@@ -3,8 +3,8 @@ using Content.Client.GameObjects.Components.Mobs;
using Content.Client.Interfaces; using Content.Client.Interfaces;
using Content.Client.UserInterface.Stylesheets; using Content.Client.UserInterface.Stylesheets;
using Content.Client.Utility; using Content.Client.Utility;
using Content.Shared.Jobs;
using Content.Shared.Preferences; using Content.Shared.Preferences;
using Content.Shared.Roles;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.Interfaces.ResourceManagement;

11
Content.Client/UserInterface/CooldownGraphic.cs
View File

@@ -1,13 +1,12 @@
using Robust.Client.Graphics.Drawing; using System;
using Robust.Client.Interfaces.GameObjects.Components; using Robust.Client.Graphics.Drawing;
using Robust.Client.Interfaces.Graphics;
using Robust.Shared.Maths;
using System;
using Robust.Client.Graphics.Shaders; using Robust.Client.Graphics.Shaders;
using Robust.Client.UserInterface;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
namespace Robust.Client.UserInterface.Controls namespace Content.Client.UserInterface
{ {
public class CooldownGraphic : Control public class CooldownGraphic : Control

2
Content.Client/UserInterface/GameHud.cs
View File

@@ -8,12 +8,10 @@ using Robust.Client.Interfaces.Input;
using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Shared.Input;
using Robust.Shared.Input.Binding; using Robust.Shared.Input.Binding;
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 static Robust.Client.UserInterface.Control;
namespace Content.Client.UserInterface namespace Content.Client.UserInterface
{ {

1
Content.Client/UserInterface/GhostGui.cs
View File

@@ -1,4 +1,3 @@
using System.Data;
using Content.Client.GameObjects.Components.Observer; using Content.Client.GameObjects.Components.Observer;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;

5
Content.Client/UserInterface/HumanoidProfileEditor.cs
View File

@@ -3,11 +3,9 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using Content.Client.GameObjects.Components; using Content.Client.GameObjects.Components;
using Content.Client.Interfaces; using Content.Client.Interfaces;
using Content.Client.Utility;
using Content.Shared; using Content.Shared;
using Content.Shared.Jobs;
using Content.Shared.Antags;
using Content.Shared.Preferences; using Content.Shared.Preferences;
using Content.Shared.Roles;
using Robust.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
@@ -18,7 +16,6 @@ using Robust.Shared.Localization;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Utility; using Robust.Shared.Utility;
using static Content.Client.StaticIoC;
namespace Content.Client.UserInterface namespace Content.Client.UserInterface
{ {

3
Content.Client/UserInterface/IItemSlotManager.cs
View File

@@ -1,5 +1,4 @@
using Content.Client.GameObjects; using Robust.Client.UserInterface;
using Robust.Client.UserInterface;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
namespace Content.Client.UserInterface namespace Content.Client.UserInterface

1
Content.Client/UserInterface/ItemSlotButton.cs
View File

@@ -1,5 +1,4 @@
using System; using System;
using Content.Shared.GameObjects.Components.Items;
using Robust.Client.Graphics; using Robust.Client.Graphics;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;

7
Content.Client/UserInterface/ItemSlotManager.cs
View File

@@ -1,17 +1,12 @@
using System; using Content.Client.GameObjects.Components.Storage;
using Content.Client.GameObjects;
using Content.Client.GameObjects.Components.Storage;
using Content.Client.GameObjects.EntitySystems; using Content.Client.GameObjects.EntitySystems;
using Content.Client.Utility;
using Content.Shared.GameObjects.Components.Items; using Content.Shared.GameObjects.Components.Items;
using Content.Shared.Input; using Content.Shared.Input;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Client.GameObjects.EntitySystems; using Robust.Client.GameObjects.EntitySystems;
using Robust.Client.Graphics;
using Robust.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Client.Interfaces.Graphics.ClientEye; using Robust.Client.Interfaces.Graphics.ClientEye;
using Robust.Client.Interfaces.Input; using Robust.Client.Interfaces.Input;
using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.Player; using Robust.Client.Player;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
using Robust.Shared.Input; using Robust.Shared.Input;

11
Content.Client/UserInterface/LateJoinGui.cs
View File

@@ -1,19 +1,18 @@
using System;
using System.Linq;
using Content.Shared.Roles;
using Robust.Client.Console; using Robust.Client.Console;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.Utility; using Robust.Client.Utility;
using Content.Shared.Jobs;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Robust.Shared.Log; using Robust.Shared.Log;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Utility; using Robust.Shared.Utility;
using System;
using System.Collections.Generic;
using System.Linq;
namespace Content.Client.UserInterface
namespace Robust.Client.UserInterface.CustomControls
{ {
public sealed class LateJoinGui : SS14Window public sealed class LateJoinGui : SS14Window
{ {

4
Content.Client/UserInterface/LobbyCharacterPreviewPanel.cs
View File

@@ -1,10 +1,10 @@
using System.Linq; using System.Linq;
using Content.Client.GameObjects; using Content.Client.GameObjects.Components.HUD.Inventory;
using Content.Client.GameObjects.Components.Mobs; using Content.Client.GameObjects.Components.Mobs;
using Content.Client.Interfaces; using Content.Client.Interfaces;
using Content.Shared; using Content.Shared;
using Content.Shared.Jobs;
using Content.Shared.Preferences; using Content.Shared.Preferences;
using Content.Shared.Roles;
using Robust.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;

15
Content.Client/UserInterface/RoundEndSummaryWindow.cs
View File

@@ -1,19 +1,12 @@
using Robust.Client.Graphics; using System;
using Robust.Client.Interfaces.Input; using System.Collections.Generic;
using Robust.Client.Interfaces.ResourceManagement; using System.Linq;
using Robust.Client.ResourceManagement; using Content.Client.Utility;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Content.Client.Utility;
using Robust.Client.Player;
using System.Linq;
using System.Collections.Generic;
using static Robust.Client.UserInterface.Controls.ItemList;
using static Content.Shared.SharedGameTicker; using static Content.Shared.SharedGameTicker;
using System;
namespace Content.Client.UserInterface namespace Content.Client.UserInterface
{ {

22
Content.IntegrationTests/Tests/AI/AiControllerTest.cs
View File

@@ -1,23 +1,19 @@
using NUnit.Framework; using System;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.Map;
using Robust.Shared.Prototypes;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using Content.Server.GameObjects.Components.Movement; using Content.Server.GameObjects.Components.Movement;
using Content.Shared.VendingMachines; using NUnit.Framework;
using Robust.Server.AI; using Robust.Server.AI;
using Robust.Shared.Log; using Robust.Shared.GameObjects;
using Robust.Server.Interfaces.Maps; using Robust.Shared.Interfaces.GameObjects;
using Robust.Server.Interfaces.Timing; using Robust.Shared.Interfaces.Map;
using Robust.Shared.Interfaces.Reflection; using Robust.Shared.Interfaces.Reflection;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
namespace Content.IntegrationTests.Tests namespace Content.IntegrationTests.Tests.AI
{ {
[TestFixture] [TestFixture]
[TestOf(typeof(AiControllerTest))] [TestOf(typeof(AiControllerTest))]
@@ -47,7 +43,7 @@ namespace Content.IntegrationTests.Tests
Assert.That(attrib != null, $"No AiLogicProcessorAttribute found on {processor.Name}"); Assert.That(attrib != null, $"No AiLogicProcessorAttribute found on {processor.Name}");
processorNames.Add(attrib.SerializeName); processorNames.Add(attrib.SerializeName);
} }
foreach (var entity in prototypeManager.EnumeratePrototypes<EntityPrototype>()) foreach (var entity in prototypeManager.EnumeratePrototypes<EntityPrototype>())
{ {
var comps = entity.Components; var comps = entity.Components;

2
Content.IntegrationTests/Tests/BuckleTest.cs
View File

@@ -1,5 +1,6 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using Content.Server.GameObjects.Components.Buckle; using Content.Server.GameObjects.Components.Buckle;
using Content.Server.GameObjects.Components.Strap;
using Content.Shared.GameObjects.Components.Buckle; using Content.Shared.GameObjects.Components.Buckle;
using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems;
using NUnit.Framework; using NUnit.Framework;
@@ -7,7 +8,6 @@ using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Map;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Map; using Robust.Shared.Map;
using StrapComponent = Content.Server.GameObjects.Components.Strap.StrapComponent;
namespace Content.IntegrationTests.Tests namespace Content.IntegrationTests.Tests
{ {

1
Content.IntegrationTests/Tests/ContainerOcclusionTest.cs
View File

@@ -1,6 +1,5 @@
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Content.Server.GameObjects.Components;
using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Items.Storage;
using NUnit.Framework; using NUnit.Framework;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;

1
Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
View File

@@ -5,7 +5,6 @@ using Content.Server.GameObjects.Components;
using Content.Server.GameObjects.Components.Disposal; using Content.Server.GameObjects.Components.Disposal;
using Content.Server.GameObjects.Components.Power.ApcNetComponents; using Content.Server.GameObjects.Components.Power.ApcNetComponents;
using NUnit.Framework; using NUnit.Framework;
using Robust.Shared.GameObjects.Components;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Map;
using Robust.Shared.IoC; using Robust.Shared.IoC;

7
Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs
View File

@@ -1,7 +1,7 @@
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components;
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems.DoAfter;
using NUnit.Framework; using NUnit.Framework;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
@@ -9,7 +9,6 @@ using Robust.Shared.Interfaces.Map;
using Robust.Shared.Interfaces.Timing; using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Maths;
namespace Content.IntegrationTests.Tests.DoAfter namespace Content.IntegrationTests.Tests.DoAfter
{ {
@@ -35,7 +34,7 @@ namespace Content.IntegrationTests.Tests.DoAfter
var args = new DoAfterEventArgs(mob, tickTime / 2, cancelToken.Token); var args = new DoAfterEventArgs(mob, tickTime / 2, cancelToken.Token);
task = EntitySystem.Get<DoAfterSystem>().DoAfter(args); task = EntitySystem.Get<DoAfterSystem>().DoAfter(args);
}); });
await server.WaitRunTicks(1); await server.WaitRunTicks(1);
Assert.That(task.Result == DoAfterStatus.Finished); Assert.That(task.Result == DoAfterStatus.Finished);
} }
@@ -63,4 +62,4 @@ namespace Content.IntegrationTests.Tests.DoAfter
Assert.That(task.Result == DoAfterStatus.Cancelled, $"Result was {task.Result}"); Assert.That(task.Result == DoAfterStatus.Cancelled, $"Result was {task.Result}");
} }
} }
} }

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

@@ -1,20 +1,21 @@
using NUnit.Framework; using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using NUnit.Framework;
using Robust.Server.Interfaces.Maps;
using Robust.Server.Interfaces.Timing;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Map;
using Robust.Shared.Map;
using Robust.Shared.Prototypes;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Robust.Shared.Log; using Robust.Shared.Log;
using Robust.Server.Interfaces.Maps; using Robust.Shared.Map;
using Robust.Server.Interfaces.Timing; using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
namespace Content.IntegrationTests.Tests namespace Content.IntegrationTests.Tests
{ {
[TestFixture] [TestFixture]
[TestOf(typeof(Robust.Shared.GameObjects.Entity))] [TestOf(typeof(Entity))]
public class EntityTest : ContentIntegrationTest public class EntityTest : ContentIntegrationTest
{ {
[Test] [Test]
@@ -41,7 +42,7 @@ namespace Content.IntegrationTests.Tests
server.Assert(() => server.Assert(() =>
{ {
var testLocation = new GridCoordinates(new Robust.Shared.Maths.Vector2(0, 0), grid); var testLocation = new GridCoordinates(new Vector2(0, 0), grid);
//Generate list of non-abstract prototypes to test //Generate list of non-abstract prototypes to test
foreach (var prototype in prototypeMan.EnumeratePrototypes<EntityPrototype>()) foreach (var prototype in prototypeMan.EnumeratePrototypes<EntityPrototype>())

2
Content.IntegrationTests/Tests/GravityGridTest.cs
View File

@@ -1,8 +1,6 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using Content.Client.GameObjects.Components.Gravity;
using Content.Server.GameObjects.Components.Gravity; using Content.Server.GameObjects.Components.Gravity;
using Content.Server.GameObjects.Components.Power.ApcNetComponents; using Content.Server.GameObjects.Components.Power.ApcNetComponents;
using Content.Server.GameObjects.Components.Power;
using NUnit.Framework; using NUnit.Framework;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Map;

3
Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs
View File

@@ -1,11 +1,10 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using Content.Server.GameObjects; using Content.Server.GameObjects.Components.GUI;
using NUnit.Framework; using NUnit.Framework;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Map;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Maths;
using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
namespace Content.IntegrationTests.Tests namespace Content.IntegrationTests.Tests

3
Content.Server.Database/Migrations/Postgres/PostgresPreferencesDbContextModelSnapshot.cs
View File

@@ -1,8 +1,7 @@
// <auto-generated /> // <auto-generated />
using Content.Server.Database;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace Content.Server.Database.Migrations.Postgres namespace Content.Server.Database.Migrations.Postgres

5
Content.Server.Database/Migrations/Sqlite/20200118020532_initial.Designer.cs generated
View File

@@ -1,11 +1,10 @@
// <auto-generated /> // <auto-generated />
using Content.Server.Database;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Content.Server.Database.Migrations namespace Content.Server.Database.Migrations.Sqlite
{ {
[DbContext(typeof(SqlitePreferencesDbContext))] [DbContext(typeof(SqlitePreferencesDbContext))]
[Migration("20200118020532_initial")] [Migration("20200118020532_initial")]

2
Content.Server.Database/Migrations/Sqlite/20200118020532_initial.cs
View File

@@ -1,6 +1,6 @@
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;
namespace Content.Server.Database.Migrations namespace Content.Server.Database.Migrations.Sqlite
{ {
public partial class initial : Migration public partial class initial : Migration
{ {

5
Content.Server.Database/Migrations/Sqlite/20200118195640_jobs.Designer.cs generated
View File

@@ -1,11 +1,10 @@
// <auto-generated /> // <auto-generated />
using Content.Server.Database;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Content.Server.Database.Migrations namespace Content.Server.Database.Migrations.Sqlite
{ {
[DbContext(typeof(SqlitePreferencesDbContext))] [DbContext(typeof(SqlitePreferencesDbContext))]
[Migration("20200118195640_jobs")] [Migration("20200118195640_jobs")]

Some files were not shown because too many files have changed in this diff Show More