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

Rename toolbox references from ss14 to robust

Browse Source
This commit is contained in:
Silver
2019-04-15 21:11:38 -06:00
parent b879418fa3
commit a18692bc46
185 changed files with 1214 additions and 1246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,12 @@
using System.Collections.Generic; using System.Collections.Generic;
using Content.Shared.Chat; using Content.Shared.Chat;
using SS14.Client.Console; using Robust.Client.Console;
using SS14.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using SS14.Client.Input; using Robust.Client.Input;
using SS14.Client.UserInterface; using Robust.Client.UserInterface;
using SS14.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using SS14.Shared.Maths; using Robust.Shared.Maths;
using SS14.Shared.Utility; using Robust.Shared.Utility;
namespace Content.Client.Chat namespace Content.Client.Chat
{ {

14
Content.Client/Chat/ChatManager.cs
View File

@@ -1,13 +1,13 @@
using System; using System;
using Content.Client.Interfaces.Chat; using Content.Client.Interfaces.Chat;
using Content.Shared.Chat; using Content.Shared.Chat;
using SS14.Client.Console; using Robust.Client.Console;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Log; using Robust.Shared.Log;
using SS14.Shared.Maths; using Robust.Shared.Maths;
using SS14.Shared.Utility; using Robust.Shared.Utility;
namespace Content.Client.Chat namespace Content.Client.Chat
{ {

26
Content.Client/ClientNotifyManager.cs
View File

@@ -2,19 +2,19 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using Content.Client.Interfaces; using Content.Client.Interfaces;
using Content.Shared; using Content.Shared;
using SS14.Client; using Robust.Client;
using SS14.Client.Interfaces.Console; using Robust.Client.Interfaces.Console;
using SS14.Client.Interfaces.Graphics.ClientEye; using Robust.Client.Interfaces.Graphics.ClientEye;
using SS14.Client.Interfaces.Input; using Robust.Client.Interfaces.Input;
using SS14.Client.Interfaces.UserInterface; using Robust.Client.Interfaces.UserInterface;
using SS14.Client.Player; using Robust.Client.Player;
using SS14.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Map; using Robust.Shared.Map;
using SS14.Shared.Maths; using Robust.Shared.Maths;
using SS14.Shared.Utility; using Robust.Shared.Utility;
namespace Content.Client namespace Content.Client
{ {

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

@@ -1,10 +1,10 @@
using Content.Client.Interfaces; using Content.Client.Interfaces;
using Content.Shared.GameObjects.Components.Markers; using Content.Shared.GameObjects.Components.Markers;
using SS14.Client.Interfaces.Console; using Robust.Client.Interfaces.Console;
using SS14.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.IoC; using Robust.Shared.IoC;
namespace Content.Client.Commands namespace Content.Client.Commands
{ {

6
Content.Client/Construction/ConstructionButton.cs
View File

@@ -1,7 +1,7 @@
using Content.Client.GameObjects.Components.Construction; using Content.Client.GameObjects.Components.Construction;
using SS14.Client.Interfaces.Graphics; using Robust.Client.Interfaces.Graphics;
using SS14.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using SS14.Shared.Utility; using Robust.Shared.Utility;
namespace Content.Client.Construction namespace Content.Client.Construction
{ {

38
Content.Client/Construction/ConstructionMenu.cs
View File

@@ -3,25 +3,25 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using Content.Client.GameObjects.Components.Construction; using Content.Client.GameObjects.Components.Construction;
using Content.Shared.Construction; using Content.Shared.Construction;
using SS14.Client.GameObjects; using Robust.Client.GameObjects;
using SS14.Client.Graphics; using Robust.Client.Graphics;
using SS14.Client.Interfaces.GameObjects; using Robust.Client.Interfaces.GameObjects;
using SS14.Client.Interfaces.Graphics; using Robust.Client.Interfaces.Graphics;
using SS14.Client.Interfaces.Placement; using Robust.Client.Interfaces.Placement;
using SS14.Client.Interfaces.ResourceManagement; using Robust.Client.Interfaces.ResourceManagement;
using SS14.Client.Placement; using Robust.Client.Placement;
using SS14.Client.ResourceManagement; using Robust.Client.ResourceManagement;
using SS14.Client.UserInterface; using Robust.Client.UserInterface;
using SS14.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using SS14.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.CustomControls;
using SS14.Client.Utility; using Robust.Client.Utility;
using SS14.Shared.Enums; using Robust.Shared.Enums;
using SS14.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Log; using Robust.Shared.Log;
using SS14.Shared.Maths; using Robust.Shared.Maths;
using SS14.Shared.Prototypes; using Robust.Shared.Prototypes;
using SS14.Shared.Utility; using Robust.Shared.Utility;
namespace Content.Client.Construction namespace Content.Client.Construction
{ {

18
Content.Client/Construction/ConstructionPlacementHijack.cs
View File

@@ -1,14 +1,14 @@
using Content.Client.GameObjects.Components.Construction; using Content.Client.GameObjects.Components.Construction;
using Content.Shared.Construction; using Content.Shared.Construction;
using SS14.Client.Graphics; using Robust.Client.Graphics;
using SS14.Client.Interfaces.ResourceManagement; using Robust.Client.Interfaces.ResourceManagement;
using SS14.Client.Placement; using Robust.Client.Placement;
using SS14.Client.ResourceManagement; using Robust.Client.ResourceManagement;
using SS14.Client.Utility; using Robust.Client.Utility;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Map; using Robust.Shared.Map;
using SS14.Shared.Maths; using Robust.Shared.Maths;
namespace Content.Client.Construction namespace Content.Client.Construction
{ {

18
Content.Client/Content.Client.csproj
View File

@@ -126,17 +126,17 @@
<Project>{26aeebb3-dde7-443a-9f43-7bc7f4acf6b5}</Project> <Project>{26aeebb3-dde7-443a-9f43-7bc7f4acf6b5}</Project>
<Name>Content.Shared</Name> <Name>Content.Shared</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\RobustToolbox\SS14.Client\SS14.Client.csproj"> <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj">
<Project>{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}</Project> <Project>{83429bd6-6358-4b18-be51-401df8ea2673}</Project>
<Name>SS14.Client</Name> <Name>Robust.Client</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\RobustToolbox\SS14.Shared.Maths\SS14.Shared.Maths.csproj"> <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj">
<Project>{7DC961F2-A45B-4193-BE7F-77622A231943}</Project> <Project>{93f23a82-00c5-4572-964e-e7c9457726d4}</Project>
<Name>SS14.Shared.Maths</Name> <Name>Robust.Shared.Maths</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\RobustToolbox\SS14.Shared\SS14.Shared.csproj"> <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj">
<Project>{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}</Project> <Project>{0529f740-0000-0000-0000-000000000000}</Project>
<Name>SS14.Shared</Name> <Name>Robust.Shared</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

24
Content.Client/EntryPoint.cs
View File

@@ -14,16 +14,16 @@ using Content.Client.Interfaces.Parallax;
using Content.Client.Parallax; using Content.Client.Parallax;
using Content.Shared.GameObjects.Components.Weapons.Ranged; using Content.Shared.GameObjects.Components.Weapons.Ranged;
using Content.Shared.Interfaces; using Content.Shared.Interfaces;
using SS14.Client; using Robust.Client;
using SS14.Client.Interfaces; using Robust.Client.Interfaces;
using SS14.Client.Interfaces.Graphics.Overlays; using Robust.Client.Interfaces.Graphics.Overlays;
using SS14.Client.Interfaces.Input; using Robust.Client.Interfaces.Input;
using SS14.Client.Player; using Robust.Client.Player;
using SS14.Client.Utility; using Robust.Client.Utility;
using SS14.Shared.ContentPack; using Robust.Shared.ContentPack;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Prototypes; using Robust.Shared.Prototypes;
using System; using System;
using Content.Client.Chat; using Content.Client.Chat;
using Content.Client.GameObjects.Components; using Content.Client.GameObjects.Components;
@@ -33,8 +33,8 @@ using Content.Client.Interfaces.Chat;
using Content.Client.UserInterface; using Content.Client.UserInterface;
using Content.Shared.GameObjects.Components.Markers; using Content.Shared.GameObjects.Components.Markers;
using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs;
using SS14.Client.Interfaces.UserInterface; using Robust.Client.Interfaces.UserInterface;
using SS14.Shared.Log; using Robust.Shared.Log;
namespace Content.Client namespace Content.Client
{ {

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

@@ -1,14 +1,14 @@
using Content.Client.GameObjects.Components.Mobs; using Content.Client.GameObjects.Components.Mobs;
using Content.Shared.Input; using Content.Shared.Input;
using SS14.Client.Interfaces.Input; using Robust.Client.Interfaces.Input;
using SS14.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.CustomControls;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Input; using Robust.Shared.Input;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Utility; using Robust.Shared.Utility;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using SS14.Client.Interfaces.Graphics; using Robust.Client.Interfaces.Graphics;
namespace Content.Client.GameObjects.Components.Actor namespace Content.Client.GameObjects.Components.Actor
{ {

6
Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs
View File

@@ -1,9 +1,9 @@
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
using Content.Shared.GameObjects.Components.Inventory; using Content.Shared.GameObjects.Components.Inventory;
using Content.Shared.GameObjects.Components.Items; using Content.Shared.GameObjects.Components.Items;
using SS14.Client.Graphics; using Robust.Client.Graphics;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using System; using System;
namespace Content.Client.GameObjects.Components.Clothing namespace Content.Client.GameObjects.Components.Clothing

8
Content.Client/GameObjects/Components/Construction/ConstructionGhostComponent.cs
View File

@@ -1,8 +1,8 @@
using Content.Shared.Construction; using Content.Shared.Construction;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
namespace Content.Client.GameObjects.Components.Construction namespace Content.Client.GameObjects.Components.Construction
{ {

22
Content.Client/GameObjects/Components/Construction/ConstructorComponent.cs
View File

@@ -2,17 +2,17 @@
using Content.Client.Construction; using Content.Client.Construction;
using Content.Shared.Construction; using Content.Shared.Construction;
using Content.Shared.GameObjects.Components.Construction; using Content.Shared.GameObjects.Components.Construction;
using SS14.Client.GameObjects; using Robust.Client.GameObjects;
using SS14.Client.Interfaces.GameObjects; using Robust.Client.Interfaces.GameObjects;
using SS14.Client.Interfaces.Graphics; using Robust.Client.Interfaces.Graphics;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Log; using Robust.Shared.Log;
using SS14.Shared.Map; using Robust.Shared.Map;
using SS14.Shared.Maths; using Robust.Shared.Maths;
namespace Content.Client.GameObjects.Components.Construction namespace Content.Client.GameObjects.Components.Construction
{ {

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

@@ -1,5 +1,5 @@
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using System.Collections.Generic; using System.Collections.Generic;
namespace Content.Client.GameObjects namespace Content.Client.GameObjects

12
Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs
View File

@@ -1,11 +1,11 @@
using System; using System;
using Content.Shared.GameObjects.Components.Doors; using Content.Shared.GameObjects.Components.Doors;
using SS14.Client.Animations; using Robust.Client.Animations;
using SS14.Client.GameObjects; using Robust.Client.GameObjects;
using SS14.Client.GameObjects.Components.Animations; using Robust.Client.GameObjects.Components.Animations;
using SS14.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Utility; using Robust.Shared.Utility;
using YamlDotNet.RepresentationModel; using YamlDotNet.RepresentationModel;
namespace Content.Client.GameObjects.Components.Doors namespace Content.Client.GameObjects.Components.Doors

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

@@ -1,17 +1,17 @@
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
using SS14.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using SS14.Client.UserInterface; using Robust.Client.UserInterface;
using SS14.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using SS14.Shared.Utility; using Robust.Shared.Utility;
using System; using System;
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 SS14.Shared.Interfaces.Reflection; using Robust.Shared.Interfaces.Reflection;
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.SharedInventoryComponent.ClientInventoryMessage;
using Content.Client.GameObjects.Components.Mobs; using Content.Client.GameObjects.Components.Mobs;

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

@@ -1,12 +1,12 @@
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using Content.Client.GameObjects.EntitySystems; using Content.Client.GameObjects.EntitySystems;
using JetBrains.Annotations; using JetBrains.Annotations;
using SS14.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.GameObjects.Components.Transform; using Robust.Shared.GameObjects.Components.Transform;
using SS14.Shared.Map; using Robust.Shared.Map;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using static SS14.Client.GameObjects.SpriteComponent; using static Robust.Client.GameObjects.SpriteComponent;
namespace Content.Client.GameObjects.Components.IconSmoothing namespace Content.Client.GameObjects.Components.IconSmoothing
{ {

20
Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs
View File

@@ -1,18 +1,18 @@
using Content.Client.Interfaces.GameObjects; using Content.Client.Interfaces.GameObjects;
using Content.Client.UserInterface; using Content.Client.UserInterface;
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
using SS14.Client.Interfaces.UserInterface; using Robust.Client.Interfaces.UserInterface;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using SS14.Client.GameObjects; using Robust.Client.GameObjects;
using SS14.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using SS14.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using SS14.Shared.Utility; using Robust.Shared.Utility;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
namespace Content.Client.GameObjects namespace Content.Client.GameObjects
{ {

18
Content.Client/GameObjects/Components/Items/ItemComponent.cs
View File

@@ -1,14 +1,14 @@
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
using Content.Shared.GameObjects.Components.Items; using Content.Shared.GameObjects.Components.Items;
using SS14.Client.Graphics; using Robust.Client.Graphics;
using SS14.Client.Interfaces.ResourceManagement; using Robust.Client.Interfaces.ResourceManagement;
using SS14.Client.ResourceManagement; using Robust.Client.ResourceManagement;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.GameObjects.Components.Renderable; using Robust.Shared.GameObjects.Components.Renderable;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using SS14.Shared.Utility; using Robust.Shared.Utility;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using System; using System;
namespace Content.Client.GameObjects namespace Content.Client.GameObjects

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

@@ -1,10 +1,10 @@
using System; using System;
using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs;
using SS14.Client.GameObjects; using Robust.Client.GameObjects;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using SS14.Shared.Maths; using Robust.Shared.Maths;
namespace Content.Client.GameObjects.Components.Mobs namespace Content.Client.GameObjects.Components.Mobs
{ {

2
Content.Client/GameObjects/Components/Mobs/ICharacterUI.cs
View File

@@ -1,5 +1,5 @@
using Content.Client.GameObjects.Components.Actor; using Content.Client.GameObjects.Components.Actor;
using SS14.Client.UserInterface; using Robust.Client.UserInterface;
namespace Content.Client.GameObjects.Components.Mobs namespace Content.Client.GameObjects.Components.Mobs
{ {

28
Content.Client/GameObjects/Components/Mobs/SpeciesUI.cs
View File

@@ -2,22 +2,22 @@
using Content.Client.GameObjects.Components.Mobs; using Content.Client.GameObjects.Components.Mobs;
using Content.Client.Graphics.Overlays; using Content.Client.Graphics.Overlays;
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
using SS14.Client.GameObjects; using Robust.Client.GameObjects;
using SS14.Client.Interfaces.Graphics.Overlays; using Robust.Client.Interfaces.Graphics.Overlays;
using SS14.Client.Interfaces.ResourceManagement; using Robust.Client.Interfaces.ResourceManagement;
using SS14.Client.Player; using Robust.Client.Player;
using SS14.Client.ResourceManagement; using Robust.Client.ResourceManagement;
using SS14.Client.UserInterface; using Robust.Client.UserInterface;
using SS14.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Log; using Robust.Shared.Log;
using SS14.Shared.Utility; using Robust.Shared.Utility;
using System.Collections.Generic; using System.Collections.Generic;
using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs;
using SS14.Client.Graphics.Overlays; using Robust.Client.Graphics.Overlays;
namespace Content.Client.GameObjects namespace Content.Client.GameObjects
{ {

8
Content.Client/GameObjects/Components/Mobs/SpeciesVisualizer2D.cs
View File

@@ -1,8 +1,8 @@
using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs;
using SS14.Client.GameObjects; using Robust.Client.GameObjects;
using SS14.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Maths; using Robust.Shared.Maths;
namespace Content.Client.GameObjects.Components.Mobs namespace Content.Client.GameObjects.Components.Mobs
{ {

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

@@ -1,12 +1,12 @@
using System; using System;
using Content.Shared.GameObjects.Components.Power; using Content.Shared.GameObjects.Components.Power;
using SS14.Client.GameObjects.Components.UserInterface; using Robust.Client.GameObjects.Components.UserInterface;
using SS14.Client.Interfaces.Graphics; using Robust.Client.Interfaces.Graphics;
using SS14.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using SS14.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.CustomControls;
using SS14.Shared.GameObjects.Components.UserInterface; using Robust.Shared.GameObjects.Components.UserInterface;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Utility; using Robust.Shared.Utility;
namespace Content.Client.GameObjects.Components.Power namespace Content.Client.GameObjects.Components.Power
{ {

6
Content.Client/GameObjects/Components/Power/ApcVisualizer2D.cs
View File

@@ -1,7 +1,7 @@
using Content.Shared.GameObjects.Components.Power; using Content.Shared.GameObjects.Components.Power;
using SS14.Client.GameObjects; using Robust.Client.GameObjects;
using SS14.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
namespace Content.Client.GameObjects.Components.Power namespace Content.Client.GameObjects.Components.Power
{ {

8
Content.Client/GameObjects/Components/Power/PowerCellVisualizer2D.cs
View File

@@ -1,9 +1,9 @@
using Content.Shared.GameObjects.Components.Power; using Content.Shared.GameObjects.Components.Power;
using Content.Shared.Utility; using Content.Shared.Utility;
using SS14.Client.GameObjects; using Robust.Client.GameObjects;
using SS14.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Utility; using Robust.Shared.Utility;
using YamlDotNet.RepresentationModel; using YamlDotNet.RepresentationModel;
namespace Content.Client.GameObjects.Components.Power namespace Content.Client.GameObjects.Components.Power

14
Content.Client/GameObjects/Components/Power/PowerDebugTool.cs
View File

@@ -1,11 +1,11 @@
using Content.Shared.GameObjects.Components.Power; using Content.Shared.GameObjects.Components.Power;
using SS14.Client.Interfaces.Graphics; using Robust.Client.Interfaces.Graphics;
using SS14.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using SS14.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.CustomControls;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using SS14.Shared.IoC; using Robust.Shared.IoC;
namespace Content.Client.GameObjects.Components.Power namespace Content.Client.GameObjects.Components.Power
{ {

6
Content.Client/GameObjects/Components/Power/SmesVisualizer2D.cs
View File

@@ -1,7 +1,7 @@
using Content.Shared.GameObjects.Components.Power; using Content.Shared.GameObjects.Components.Power;
using SS14.Client.GameObjects; using Robust.Client.GameObjects;
using SS14.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;

18
Content.Client/GameObjects/Components/Sound/SoundComponent.cs
View File

@@ -1,15 +1,15 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Content.Shared.GameObjects.Components.Sound; using Content.Shared.GameObjects.Components.Sound;
using SS14.Client.GameObjects.EntitySystems; using Robust.Client.GameObjects.EntitySystems;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using SS14.Shared.Interfaces.Timers; using Robust.Shared.Interfaces.Timers;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Log; using Robust.Shared.Log;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using SS14.Shared.Timers; using Robust.Shared.Timers;
namespace Content.Client.GameObjects.Components.Sound namespace Content.Client.GameObjects.Components.Sound
{ {

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

@@ -1,16 +1,16 @@
using Content.Shared.GameObjects.Components.Storage; using Content.Shared.GameObjects.Components.Storage;
using SS14.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using SS14.Client.UserInterface; using Robust.Client.UserInterface;
using SS14.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using SS14.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.CustomControls;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Utility; using Robust.Shared.Utility;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using SS14.Client.Interfaces.Graphics; using Robust.Client.Interfaces.Graphics;
namespace Content.Client.GameObjects.Components.Storage namespace Content.Client.GameObjects.Components.Storage
{ {

6
Content.Client/GameObjects/Components/SubFloorHideComponent.cs
View File

@@ -1,7 +1,7 @@
using Content.Shared.Maps; using Content.Shared.Maps;
using SS14.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.GameObjects.Components.Transform; using Robust.Shared.GameObjects.Components.Transform;
namespace Content.Client.GameObjects.Components namespace Content.Client.GameObjects.Components
{ {

6
Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineVisualizer2D.cs
View File

@@ -1,8 +1,8 @@
using Content.Shared.GameObjects.Components.Weapons.Ranged; using Content.Shared.GameObjects.Components.Weapons.Ranged;
using Content.Shared.Utility; using Content.Shared.Utility;
using SS14.Client.GameObjects; using Robust.Client.GameObjects;
using SS14.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using SS14.Shared.Utility; using Robust.Shared.Utility;
using YamlDotNet.RepresentationModel; using YamlDotNet.RepresentationModel;
namespace Content.Client.GameObjects.Components.Weapons.Ranged namespace Content.Client.GameObjects.Components.Weapons.Ranged

6
Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponVisualizer2D.cs
View File

@@ -1,8 +1,8 @@
using Content.Shared.GameObjects.Components.Weapons.Ranged; using Content.Shared.GameObjects.Components.Weapons.Ranged;
using Content.Shared.Utility; using Content.Shared.Utility;
using SS14.Client.GameObjects; using Robust.Client.GameObjects;
using SS14.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using SS14.Shared.Utility; using Robust.Shared.Utility;
using YamlDotNet.RepresentationModel; using YamlDotNet.RepresentationModel;
namespace Content.Client.GameObjects.Components.Weapons.Ranged namespace Content.Client.GameObjects.Components.Weapons.Ranged

8
Content.Client/GameObjects/Components/Weapons/Ranged/ClientRangedWeaponComponent.cs
View File

@@ -1,9 +1,9 @@
using System; using System;
using Content.Shared.GameObjects.Components.Weapons.Ranged; using Content.Shared.GameObjects.Components.Weapons.Ranged;
using SS14.Shared.Interfaces.Timing; using Robust.Shared.Interfaces.Timing;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Log; using Robust.Shared.Log;
using SS14.Shared.Map; using Robust.Shared.Map;
namespace Content.Client.GameObjects.Components.Weapons.Ranged namespace Content.Client.GameObjects.Components.Weapons.Ranged
{ {

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

@@ -1,6 +1,6 @@
using Content.Client.GameObjects.Components.Mobs; using Content.Client.GameObjects.Components.Mobs;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
namespace Content.Client.GameObjects.EntitySystems namespace Content.Client.GameObjects.EntitySystems
{ {

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

@@ -3,20 +3,20 @@ using System.Threading.Tasks;
using Content.Shared.GameObjects.EntitySystemMessages; using Content.Shared.GameObjects.EntitySystemMessages;
using Content.Shared.Input; using Content.Shared.Input;
using JetBrains.Annotations; using JetBrains.Annotations;
using SS14.Client.GameObjects.EntitySystems; using Robust.Client.GameObjects.EntitySystems;
using SS14.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using SS14.Client.Interfaces.Input; using Robust.Client.Interfaces.Input;
using SS14.Client.Interfaces.UserInterface; using Robust.Client.Interfaces.UserInterface;
using SS14.Client.UserInterface; using Robust.Client.UserInterface;
using SS14.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using SS14.Shared.Input; using Robust.Shared.Input;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Map; using Robust.Shared.Map;
using SS14.Shared.Maths; using Robust.Shared.Maths;
using SS14.Shared.Players; using Robust.Shared.Players;
namespace Content.Client.GameObjects.EntitySystems namespace Content.Client.GameObjects.EntitySystems
{ {

18
Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs
View File

@@ -3,15 +3,15 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using Content.Client.GameObjects.Components.IconSmoothing; using Content.Client.GameObjects.Components.IconSmoothing;
using JetBrains.Annotations; using JetBrains.Annotations;
using SS14.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.GameObjects.Components.Transform; using Robust.Shared.GameObjects.Components.Transform;
using SS14.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Map;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Map; using Robust.Shared.Map;
using SS14.Shared.Maths; using Robust.Shared.Maths;
namespace Content.Client.GameObjects.EntitySystems namespace Content.Client.GameObjects.EntitySystems
{ {

14
Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs
View File

@@ -1,13 +1,13 @@
using Content.Client.GameObjects.Components.Weapons.Ranged; using Content.Client.GameObjects.Components.Weapons.Ranged;
using Content.Client.Interfaces.GameObjects; using Content.Client.Interfaces.GameObjects;
using Content.Shared.Input; using Content.Shared.Input;
using SS14.Client.GameObjects.EntitySystems; using Robust.Client.GameObjects.EntitySystems;
using SS14.Client.Interfaces.Graphics.ClientEye; using Robust.Client.Interfaces.Graphics.ClientEye;
using SS14.Client.Interfaces.Input; using Robust.Client.Interfaces.Input;
using SS14.Client.Player; using Robust.Client.Player;
using SS14.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using SS14.Shared.Input; using Robust.Shared.Input;
using SS14.Shared.IoC; using Robust.Shared.IoC;
namespace Content.Client.GameObjects.EntitySystems namespace Content.Client.GameObjects.EntitySystems
{ {

14
Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs
View File

@@ -1,12 +1,12 @@
using Content.Client.GameObjects.Components; using Content.Client.GameObjects.Components;
using Content.Shared.Maps; using Content.Shared.Maps;
using SS14.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using SS14.Shared.GameObjects.Components.Transform; using Robust.Shared.GameObjects.Components.Transform;
using SS14.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Map;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Map; using Robust.Shared.Map;
namespace Content.Client.GameObjects.EntitySystems namespace Content.Client.GameObjects.EntitySystems
{ {

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

@@ -4,23 +4,23 @@ using System.Linq;
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
using Content.Shared.GameObjects.EntitySystemMessages; using Content.Shared.GameObjects.EntitySystemMessages;
using Content.Shared.Input; using Content.Shared.Input;
using SS14.Client.GameObjects.EntitySystems; using Robust.Client.GameObjects.EntitySystems;
using SS14.Client.Interfaces.Input; using Robust.Client.Interfaces.Input;
using SS14.Client.Interfaces.State; using Robust.Client.Interfaces.State;
using SS14.Client.Interfaces.UserInterface; using Robust.Client.Interfaces.UserInterface;
using SS14.Client.Player; using Robust.Client.Player;
using SS14.Client.State.States; using Robust.Client.State.States;
using SS14.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using SS14.Shared.Input; using Robust.Shared.Input;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Log; using Robust.Shared.Log;
using SS14.Shared.Map; using Robust.Shared.Map;
using SS14.Shared.Maths; using Robust.Shared.Maths;
using SS14.Shared.Utility; using Robust.Shared.Utility;
namespace Content.Client.GameObjects.EntitySystems namespace Content.Client.GameObjects.EntitySystems
{ {

20
Content.Client/GameTicking/ClientGameTicker.cs
View File

@@ -5,16 +5,16 @@ using Content.Client.Interfaces.Chat;
using Content.Client.UserInterface; using Content.Client.UserInterface;
using Content.Shared; using Content.Shared;
using Content.Shared.Input; using Content.Shared.Input;
using SS14.Client; using Robust.Client;
using SS14.Client.Console; using Robust.Client.Console;
using SS14.Client.Interfaces; using Robust.Client.Interfaces;
using SS14.Client.Interfaces.Input; using Robust.Client.Interfaces.Input;
using SS14.Client.Interfaces.UserInterface; using Robust.Client.Interfaces.UserInterface;
using SS14.Shared.Input; using Robust.Shared.Input;
using SS14.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Utility; using Robust.Shared.Utility;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
namespace Content.Client.GameTicking namespace Content.Client.GameTicking
{ {

16
Content.Client/Graphics/Overlays/CircleMaskOverlay.cs
View File

@@ -1,11 +1,11 @@
using SS14.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using SS14.Client.Graphics.Overlays; using Robust.Client.Graphics.Overlays;
using SS14.Client.Graphics.Shaders; using Robust.Client.Graphics.Shaders;
using SS14.Client.Interfaces.Graphics.ClientEye; using Robust.Client.Interfaces.Graphics.ClientEye;
using SS14.Client.Interfaces.Graphics.Overlays; using Robust.Client.Interfaces.Graphics.Overlays;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Maths; using Robust.Shared.Maths;
using SS14.Shared.Prototypes; using Robust.Shared.Prototypes;
namespace Content.Client.Graphics.Overlays namespace Content.Client.Graphics.Overlays
{ {

16
Content.Client/Graphics/Overlays/GradientCircleMask.cs
View File

@@ -1,11 +1,11 @@
using SS14.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using SS14.Client.Graphics.Overlays; using Robust.Client.Graphics.Overlays;
using SS14.Client.Graphics.Shaders; using Robust.Client.Graphics.Shaders;
using SS14.Client.Interfaces.Graphics.ClientEye; using Robust.Client.Interfaces.Graphics.ClientEye;
using SS14.Client.Interfaces.Graphics.Overlays; using Robust.Client.Interfaces.Graphics.Overlays;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Maths; using Robust.Shared.Maths;
using SS14.Shared.Prototypes; using Robust.Shared.Prototypes;
namespace Content.Client.Graphics.Overlays namespace Content.Client.Graphics.Overlays
{ {

2
Content.Client/Input/ContentContexts.cs
View File

@@ -1,5 +1,5 @@
using Content.Shared.Input; using Content.Shared.Input;
using SS14.Shared.Input; using Robust.Shared.Input;
namespace Content.Client.Input namespace Content.Client.Input
{ {

2
Content.Client/Interfaces/GameObjects/Components/Items/IHandsComponent.cs
View File

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

2
Content.Client/Interfaces/IClientGameTicker.cs
View File

@@ -1,4 +1,4 @@
using SS14.Client; using Robust.Client;
namespace Content.Client.Interfaces namespace Content.Client.Interfaces
{ {

4
Content.Client/Interfaces/IClientNotifyManager.cs
View File

@@ -1,6 +1,6 @@
using Content.Shared.Interfaces; using Content.Shared.Interfaces;
using SS14.Client; using Robust.Client;
using SS14.Shared.Map; using Robust.Shared.Map;
namespace Content.Client.Interfaces namespace Content.Client.Interfaces
{ {

2
Content.Client/Interfaces/Parallax/IParallaxManager.cs
View File

@@ -1,5 +1,5 @@
using System; using System;
using SS14.Client.Graphics; using Robust.Client.Graphics;
namespace Content.Client.Interfaces.Parallax namespace Content.Client.Interfaces.Parallax
{ {

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

@@ -5,11 +5,11 @@ using Nett;
using SixLabors.ImageSharp; using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.PixelFormats;
using SixLabors.Primitives; using SixLabors.Primitives;
using SS14.Client.Utility; using Robust.Client.Utility;
using SS14.Shared.Log; using Robust.Shared.Log;
using SS14.Shared.Maths; using Robust.Shared.Maths;
using SS14.Shared.Noise; using Robust.Shared.Noise;
using BlendFactor = SS14.Shared.Maths.Color.BlendFactor; using BlendFactor = Robust.Shared.Maths.Color.BlendFactor;
namespace Content.Client.Parallax namespace Content.Client.Parallax
{ {

10
Content.Client/Parallax/ParallaxManager.cs
View File

@@ -7,11 +7,11 @@ using ICSharpCode.SharpZipLib.Checksum;
using Nett; using Nett;
using SixLabors.ImageSharp; using SixLabors.ImageSharp;
using SixLabors.Primitives; using SixLabors.Primitives;
using SS14.Client.Graphics; using Robust.Client.Graphics;
using SS14.Client.Interfaces.ResourceManagement; using Robust.Client.Interfaces.ResourceManagement;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Log; using Robust.Shared.Log;
using SS14.Shared.Utility; using Robust.Shared.Utility;
namespace Content.Client.Parallax namespace Content.Client.Parallax
{ {

18
Content.Client/Parallax/ParallaxOverlay.cs
View File

@@ -1,13 +1,13 @@
using Content.Client.Interfaces.Parallax; using Content.Client.Interfaces.Parallax;
using SS14.Client.Graphics; using Robust.Client.Graphics;
using SS14.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using SS14.Client.Graphics.Overlays; using Robust.Client.Graphics.Overlays;
using SS14.Client.Graphics.Shaders; using Robust.Client.Graphics.Shaders;
using SS14.Client.Interfaces.Graphics.ClientEye; using Robust.Client.Interfaces.Graphics.ClientEye;
using SS14.Client.Interfaces.Graphics.Overlays; using Robust.Client.Interfaces.Graphics.Overlays;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Maths; using Robust.Shared.Maths;
using SS14.Shared.Prototypes; using Robust.Shared.Prototypes;
namespace Content.Client.Parallax namespace Content.Client.Parallax
{ {

32
Content.Client/UserInterface/HandsGui.cs
View File

@@ -1,22 +1,22 @@
using Content.Client.GameObjects; using Content.Client.GameObjects;
using Content.Client.GameObjects.EntitySystems; using Content.Client.GameObjects.EntitySystems;
using Content.Client.Interfaces.GameObjects; using Content.Client.Interfaces.GameObjects;
using SS14.Client.GameObjects; using Robust.Client.GameObjects;
using SS14.Client.Graphics; using Robust.Client.Graphics;
using SS14.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using SS14.Client.Input; using Robust.Client.Input;
using SS14.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using SS14.Client.Interfaces.ResourceManagement; using Robust.Client.Interfaces.ResourceManagement;
using SS14.Client.Interfaces.UserInterface; using Robust.Client.Interfaces.UserInterface;
using SS14.Client.Player; using Robust.Client.Player;
using SS14.Client.ResourceManagement; using Robust.Client.ResourceManagement;
using SS14.Client.UserInterface; using Robust.Client.UserInterface;
using SS14.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Log; using Robust.Shared.Log;
using SS14.Shared.Map; using Robust.Shared.Map;
using SS14.Shared.Maths; using Robust.Shared.Maths;
namespace Content.Client.UserInterface namespace Content.Client.UserInterface
{ {

8
Content.Client/UserInterface/LobbyGui.cs
View File

@@ -1,8 +1,8 @@
using Content.Client.Chat; using Content.Client.Chat;
using SS14.Client.UserInterface; using Robust.Client.UserInterface;
using SS14.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using SS14.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.CustomControls;
using SS14.Shared.Utility; using Robust.Shared.Utility;
namespace Content.Client.UserInterface namespace Content.Client.UserInterface
{ {

14
Content.Client/UserInterface/NanoStyle.cs
View File

@@ -1,12 +1,12 @@
using Content.Client.GameObjects.EntitySystems; using Content.Client.GameObjects.EntitySystems;
using Content.Client.Utility; using Content.Client.Utility;
using SS14.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using SS14.Client.Interfaces.ResourceManagement; using Robust.Client.Interfaces.ResourceManagement;
using SS14.Client.UserInterface; using Robust.Client.UserInterface;
using SS14.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using SS14.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.CustomControls;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Maths; using Robust.Shared.Maths;
namespace Content.Client.UserInterface namespace Content.Client.UserInterface
{ {

8
Content.Client/Utility/ResourceCacheExtensions.cs
View File

@@ -1,8 +1,8 @@
using JetBrains.Annotations; using JetBrains.Annotations;
using SS14.Client.Graphics; using Robust.Client.Graphics;
using SS14.Client.Interfaces.ResourceManagement; using Robust.Client.Interfaces.ResourceManagement;
using SS14.Client.ResourceManagement; using Robust.Client.ResourceManagement;
using SS14.Shared.Utility; using Robust.Shared.Utility;
namespace Content.Client.Utility namespace Content.Client.Utility
{ {

20
Content.Server/AI/AimShootLifeProcessor.cs
View File

@@ -1,15 +1,15 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Content.Server.Interfaces.GameObjects.Components.Movement; using Content.Server.Interfaces.GameObjects.Components.Movement;
using SS14.Server.AI; using Robust.Server.AI;
using SS14.Server.GameObjects; using Robust.Server.GameObjects;
using SS14.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.Interfaces.Physics; using Robust.Shared.Interfaces.Physics;
using SS14.Shared.Interfaces.Timing; using Robust.Shared.Interfaces.Timing;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Maths; using Robust.Shared.Maths;
namespace Content.Server.AI namespace Content.Server.AI
{ {
@@ -119,7 +119,7 @@ namespace Content.Server.AI
// build the ray // build the ray
var dir = entity.GetComponent<ITransformComponent>().WorldPosition - myTransform.WorldPosition; var dir = entity.GetComponent<ITransformComponent>().WorldPosition - myTransform.WorldPosition;
var ray = new Ray(myTransform.WorldPosition, dir.Normalized); var ray = new Ray(myTransform.WorldPosition, dir.Normalized,0); //TODO verify if 0 is the correct Collision Mask
// cast the ray // cast the ray
var result = _physMan.IntersectRay(ray, maxRayLen); var result = _physMan.IntersectRay(ray, maxRayLen);

10
Content.Server/Administration/AGhost.cs
View File

@@ -1,8 +1,8 @@
using Content.Server.Players; using Content.Server.Players;
using SS14.Server.Interfaces.Console; using Robust.Server.Interfaces.Console;
using SS14.Server.Interfaces.Player; using Robust.Server.Interfaces.Player;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.IoC; using Robust.Shared.IoC;
namespace Content.Server.Administration namespace Content.Server.Administration
{ {

8
Content.Server/Chat/ChatCommands.cs
View File

@@ -1,8 +1,8 @@
using Content.Server.Interfaces.Chat; using Content.Server.Interfaces.Chat;
using SS14.Server.Interfaces.Console; using Robust.Server.Interfaces.Console;
using SS14.Server.Interfaces.Player; using Robust.Server.Interfaces.Player;
using SS14.Shared.Enums; using Robust.Shared.Enums;
using SS14.Shared.IoC; using Robust.Shared.IoC;
namespace Content.Server.Chat namespace Content.Server.Chat
{ {

10
Content.Server/Chat/ChatManager.cs
View File

@@ -1,11 +1,11 @@
using System.Linq; using System.Linq;
using Content.Server.Interfaces.Chat; using Content.Server.Interfaces.Chat;
using Content.Shared.Chat; using Content.Shared.Chat;
using SS14.Server.Interfaces.Player; using Robust.Server.Interfaces.Player;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using SS14.Shared.Interfaces.Resources; using Robust.Shared.Interfaces.Resources;
using SS14.Shared.IoC; using Robust.Shared.IoC;
namespace Content.Server.Chat namespace Content.Server.Chat
{ {

18
Content.Server/Content.Server.csproj
View File

@@ -167,17 +167,17 @@
<Project>{26aeebb3-dde7-443a-9f43-7bc7f4acf6b5}</Project> <Project>{26aeebb3-dde7-443a-9f43-7bc7f4acf6b5}</Project>
<Name>Content.Shared</Name> <Name>Content.Shared</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\RobustToolbox\SS14.Server\SS14.Server.csproj"> <ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj">
<Project>{B04AAE71-0000-0000-0000-000000000000}</Project> <Project>{b04aae71-0000-0000-0000-000000000000}</Project>
<Name>SS14.Server</Name> <Name>Robust.Server</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\RobustToolbox\SS14.Shared.Maths\SS14.Shared.Maths.csproj"> <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj">
<Project>{93F23A82-00C5-4572-964E-E7C9457726D4}</Project> <Project>{93f23a82-00c5-4572-964e-e7c9457726d4}</Project>
<Name>SS14.Shared.Maths</Name> <Name>Robust.Shared.Maths</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\RobustToolbox\SS14.Shared\SS14.Shared.csproj"> <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj">
<Project>{0529F740-0000-0000-0000-000000000000}</Project> <Project>{0529f740-0000-0000-0000-000000000000}</Project>
<Name>SS14.Shared</Name> <Name>Robust.Shared</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

38
Content.Server/EntryPoint.cs
View File

@@ -5,23 +5,23 @@ using Content.Server.GameObjects.Components.Power;
using Content.Server.GameObjects.Components.Interactable.Tools; using Content.Server.GameObjects.Components.Interactable.Tools;
using Content.Server.Interfaces.GameObjects; using Content.Server.Interfaces.GameObjects;
using Content.Server.Placement; using Content.Server.Placement;
using SS14.Server; using Robust.Server;
using SS14.Server.Interfaces; using Robust.Server.Interfaces;
using SS14.Server.Interfaces.Maps; using Robust.Server.Interfaces.Maps;
using SS14.Server.Interfaces.Player; using Robust.Server.Interfaces.Player;
using SS14.Server.Player; using Robust.Server.Player;
using SS14.Shared.Console; using Robust.Shared.Console;
using SS14.Shared.ContentPack; using Robust.Shared.ContentPack;
using SS14.Shared.Enums; using Robust.Shared.Enums;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Map;
using SS14.Shared.Interfaces.Timers; using Robust.Shared.Interfaces.Timers;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Log; using Robust.Shared.Log;
using SS14.Shared.Map; using Robust.Shared.Map;
using SS14.Shared.Timers; using Robust.Shared.Timers;
using SS14.Shared.Interfaces.Timing; using Robust.Shared.Interfaces.Timing;
using SS14.Shared.Maths; using Robust.Shared.Maths;
using Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan; using Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan;
using Content.Server.GameObjects.Components.Weapon.Ranged.Projectile; using Content.Server.GameObjects.Components.Weapon.Ranged.Projectile;
using Content.Server.GameObjects.Components.Projectiles; using Content.Server.GameObjects.Components.Projectiles;
@@ -44,8 +44,8 @@ using Content.Shared.GameObjects.Components.Inventory;
using Content.Shared.GameObjects.Components.Markers; using Content.Shared.GameObjects.Components.Markers;
using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.Interfaces; using Content.Shared.Interfaces;
using SS14.Server.Interfaces.ServerStatus; using Robust.Server.Interfaces.ServerStatus;
using SS14.Shared.Timing; using Robust.Shared.Timing;
using Content.Server.GameObjects.Components.Destructible; using Content.Server.GameObjects.Components.Destructible;
using Content.Server.GameObjects.Components.Movement; using Content.Server.GameObjects.Components.Movement;
using Content.Server.Interfaces.Chat; using Content.Server.Interfaces.Chat;

2
Content.Server/GameObjects/Components/CatwalkComponent.cs
View File

@@ -1,4 +1,4 @@
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
namespace Content.Server.GameObjects.Components namespace Content.Server.GameObjects.Components
{ {

16
Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs
View File

@@ -4,14 +4,14 @@ using Content.Server.GameObjects.Components.Interactable.Tools;
using Content.Server.GameObjects.Components.Stack; using Content.Server.GameObjects.Components.Stack;
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Shared.Construction; using Content.Shared.Construction;
using SS14.Server.GameObjects; using Robust.Server.GameObjects;
using SS14.Server.GameObjects.EntitySystems; using Robust.Server.GameObjects.EntitySystems;
using SS14.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.GameObjects;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using static Content.Shared.Construction.ConstructionStepMaterial; using static Content.Shared.Construction.ConstructionStepMaterial;
using static Content.Shared.Construction.ConstructionStepTool; using static Content.Shared.Construction.ConstructionStepTool;

22
Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs
View File

@@ -6,17 +6,17 @@ using Content.Server.GameObjects.Components.Stack;
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Shared.Construction; using Content.Shared.Construction;
using Content.Shared.GameObjects.Components.Construction; using Content.Shared.GameObjects.Components.Construction;
using SS14.Server.GameObjects; using Robust.Server.GameObjects;
using SS14.Server.GameObjects.EntitySystems; using Robust.Server.GameObjects.EntitySystems;
using SS14.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.GameObjects;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Map; using Robust.Shared.Map;
using SS14.Shared.Maths; using Robust.Shared.Maths;
using SS14.Shared.Prototypes; using Robust.Shared.Prototypes;
namespace Content.Server.GameObjects.Components.Construction namespace Content.Server.GameObjects.Components.Construction
{ {

10
Content.Server/GameObjects/Components/Damage/DamageableComponent.cs
View File

@@ -1,14 +1,14 @@
using Content.Server.Interfaces.GameObjects; using Content.Server.Interfaces.GameObjects;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using SS14.Shared.Maths; using Robust.Shared.Maths;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Utility; using Robust.Shared.Utility;
using YamlDotNet.RepresentationModel; using YamlDotNet.RepresentationModel;
using Content.Server.Interfaces; using Content.Server.Interfaces;
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects namespace Content.Server.GameObjects
{ {

10
Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs
View File

@@ -1,13 +1,13 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Log; using Robust.Shared.Log;
using SS14.Shared.Utility; using Robust.Shared.Utility;
using YamlDotNet.RepresentationModel; using YamlDotNet.RepresentationModel;
using Content.Server.Interfaces; using Content.Server.Interfaces;
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Destructible namespace Content.Server.GameObjects.Components.Destructible
{ {

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

@@ -1,12 +1,12 @@
using System; using System;
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Shared.GameObjects.Components.Doors; using Content.Shared.GameObjects.Components.Doors;
using SS14.Server.GameObjects; using Robust.Server.GameObjects;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using SS14.Shared.Maths; using Robust.Shared.Maths;
using SS14.Shared.Timers; using Robust.Shared.Timers;
namespace Content.Server.GameObjects namespace Content.Server.GameObjects
{ {

22
Content.Server/GameObjects/Components/GUI/InventoryComponent.cs
View File

@@ -1,20 +1,20 @@
using SS14.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.Components.Container;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using static Content.Shared.GameObjects.SharedInventoryComponent.ClientInventoryMessage; using static Content.Shared.GameObjects.SharedInventoryComponent.ClientInventoryMessage;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Server.Interfaces.Player; using Robust.Server.Interfaces.Player;
using SS14.Shared.ContentPack; using Robust.Shared.ContentPack;
using System.Linq; using System.Linq;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using SS14.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.Utility; using Robust.Shared.Utility;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects namespace Content.Server.GameObjects
{ {

30
Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs
View File

@@ -5,21 +5,21 @@ using Content.Server.Interfaces.GameObjects;
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
using Content.Shared.Input; using Content.Shared.Input;
using JetBrains.Annotations; using JetBrains.Annotations;
using SS14.Server.GameObjects; using Robust.Server.GameObjects;
using SS14.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.Components.Container;
using SS14.Server.Interfaces.Player; using Robust.Server.Interfaces.Player;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Input; using Robust.Shared.Input;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Log; using Robust.Shared.Log;
using SS14.Shared.Map; using Robust.Shared.Map;
using SS14.Shared.Maths; using Robust.Shared.Maths;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using SS14.Shared.Utility; using Robust.Shared.Utility;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects namespace Content.Server.GameObjects
{ {

22
Content.Server/GameObjects/Components/Healing/HealingComponent.cs
View File

@@ -1,17 +1,17 @@
using System; using System;
using Content.Server.GameObjects.Components.Stack; using Content.Server.GameObjects.Components.Stack;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Map; using Robust.Shared.Map;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Server.GameObjects; using Robust.Server.GameObjects;
using SS14.Shared.Maths; using Robust.Shared.Maths;
using SS14.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Timing; using Robust.Shared.Interfaces.Timing;
using SS14.Shared.GameObjects.EntitySystemMessages; using Robust.Shared.GameObjects.EntitySystemMessages;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using SS14.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects.Components;
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
namespace Content.Server.GameObjects.Components.Weapon.Melee namespace Content.Server.GameObjects.Components.Weapon.Melee

14
Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs
View File

@@ -2,13 +2,13 @@
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces.GameObjects; using Content.Server.Interfaces.GameObjects;
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
using SS14.Server.GameObjects; using Robust.Server.GameObjects;
using SS14.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.Components.Container;
using SS14.Shared.Enums; using Robust.Shared.Enums;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Utility; using Robust.Shared.Utility;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Interactable namespace Content.Server.GameObjects.Components.Interactable
{ {

8
Content.Server/GameObjects/Components/Interactable/Tools/BaseTool.cs
View File

@@ -1,7 +1,7 @@
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using SS14.Shared.Utility; using Robust.Shared.Utility;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using YamlDotNet.RepresentationModel; using YamlDotNet.RepresentationModel;
namespace Content.Server.GameObjects.Components.Interactable.Tools namespace Content.Server.GameObjects.Components.Interactable.Tools

10
Content.Server/GameObjects/Components/Interactable/Tools/CrowbarComponent.cs
View File

@@ -1,10 +1,10 @@
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Shared.Maps; using Content.Shared.Maps;
using SS14.Server.GameObjects.EntitySystems; using Robust.Server.GameObjects.EntitySystems;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Map;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Map; using Robust.Shared.Map;
namespace Content.Server.GameObjects.Components.Interactable.Tools namespace Content.Server.GameObjects.Components.Interactable.Tools
{ {

12
Content.Server/GameObjects/Components/Interactable/Tools/WelderComponent.cs
View File

@@ -1,13 +1,13 @@
using System; using System;
using System.Text; using System.Text;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Utility; using Robust.Shared.Utility;
using YamlDotNet.RepresentationModel; using YamlDotNet.RepresentationModel;
using SS14.Server.GameObjects; using Robust.Server.GameObjects;
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using SS14.Shared.Maths; using Robust.Shared.Maths;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Interactable.Tools namespace Content.Server.GameObjects.Components.Interactable.Tools
{ {

4
Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs
View File

@@ -1,7 +1,7 @@
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
using Content.Shared.GameObjects.Components.Items; using Content.Shared.GameObjects.Components.Items;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;

6
Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs
View File

@@ -1,9 +1,9 @@
using Content.Server.Interfaces.GameObjects; using Content.Server.Interfaces.GameObjects;
using SS14.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.GameObjects;
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using System; using System;
using Content.Shared.GameObjects.Components.Items; using Content.Shared.GameObjects.Components.Items;

28
Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs
View File

@@ -1,22 +1,22 @@
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces.GameObjects; using Content.Server.Interfaces.GameObjects;
using Content.Shared.GameObjects.Components.Storage; using Content.Shared.GameObjects.Components.Storage;
using SS14.Server.GameObjects; using Robust.Server.GameObjects;
using SS14.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.Components.Container;
using SS14.Server.Interfaces.Player; using Robust.Server.Interfaces.Player;
using SS14.Server.Player; using Robust.Server.Player;
using SS14.Shared.Enums; using Robust.Shared.Enums;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Log; using Robust.Shared.Log;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using System.Collections.Generic; using System.Collections.Generic;
using Content.Shared.Interfaces; using Content.Shared.Interfaces;
using SS14.Shared.GameObjects.EntitySystemMessages; using Robust.Shared.GameObjects.EntitySystemMessages;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects namespace Content.Server.GameObjects
{ {

4
Content.Server/GameObjects/Components/Items/Storage/StoreableComponent.cs
View File

@@ -1,5 +1,5 @@
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
namespace Content.Server.GameObjects namespace Content.Server.GameObjects
{ {

6
Content.Server/GameObjects/Components/Markers/SpawnPointComponent.cs
View File

@@ -1,8 +1,8 @@
using System; using System;
using Content.Shared.GameObjects.Components.Markers; using Content.Shared.GameObjects.Components.Markers;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Markers namespace Content.Server.GameObjects.Components.Markers
{ {

14
Content.Server/GameObjects/Components/Materials/MaterialComponent.cs
View File

@@ -1,12 +1,12 @@
using System.Collections.Generic; using System.Collections.Generic;
using Content.Server.Materials; using Content.Server.Materials;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.Reflection; using Robust.Shared.Interfaces.Reflection;
using SS14.Shared.Interfaces.Serialization; using Robust.Shared.Interfaces.Serialization;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Prototypes; using Robust.Shared.Prototypes;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using SS14.Shared.Utility; using Robust.Shared.Utility;
namespace Content.Server.GameObjects.Components.Materials namespace Content.Server.GameObjects.Components.Materials
{ {

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

@@ -1,5 +1,5 @@
using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs;
using SS14.Shared.Maths; using Robust.Shared.Maths;
namespace Content.Server.GameObjects.Components.Mobs namespace Content.Server.GameObjects.Components.Mobs
{ {

4
Content.Server/GameObjects/Components/Mobs/DamageStates.cs
View File

@@ -1,7 +1,7 @@
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs;
using SS14.Server.GameObjects; using Robust.Server.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
namespace Content.Server.GameObjects namespace Content.Server.GameObjects
{ {

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

@@ -1,5 +1,5 @@
using System; using System;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using Content.Shared.GameObjects.Components.Inventory; using Content.Shared.GameObjects.Components.Inventory;
namespace Content.Server.GameObjects namespace Content.Server.GameObjects

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

@@ -4,12 +4,12 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Content.Server.Mobs; using Content.Server.Mobs;
using SS14.Server.GameObjects; using Robust.Server.GameObjects;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using SS14.Shared.Log; using Robust.Shared.Log;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Mobs namespace Content.Server.GameObjects.Components.Mobs
{ {

12
Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs
View File

@@ -3,12 +3,12 @@ using System.Collections.Generic;
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces; using Content.Server.Interfaces;
using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs;
using SS14.Server.GameObjects; using Robust.Server.GameObjects;
using SS14.Shared.ContentPack; using Robust.Shared.ContentPack;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
namespace Content.Server.GameObjects namespace Content.Server.GameObjects
{ {

6
Content.Server/GameObjects/Components/Movement/AiControllerComponent.cs
View File

@@ -1,7 +1,7 @@
using Content.Server.Interfaces.GameObjects.Components.Movement; using Content.Server.Interfaces.GameObjects.Components.Movement;
using SS14.Server.AI; using Robust.Server.AI;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
namespace Content.Server.GameObjects.Components.Movement namespace Content.Server.GameObjects.Components.Movement
{ {

14
Content.Server/GameObjects/Components/Movement/PlayerInputMoverComponent.cs
View File

@@ -1,11 +1,11 @@
using Content.Server.Interfaces.GameObjects.Components.Movement; using Content.Server.Interfaces.GameObjects.Components.Movement;
using SS14.Server.GameObjects; using Robust.Server.GameObjects;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Log; using Robust.Shared.Log;
using SS14.Shared.Map; using Robust.Shared.Map;
using SS14.Shared.Maths; using Robust.Shared.Maths;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Movement namespace Content.Server.GameObjects.Components.Movement
{ {

16
Content.Server/GameObjects/Components/Power/ApcComponent.cs
View File

@@ -1,14 +1,14 @@
using Content.Server.GameObjects.Components.Sound; using Content.Server.GameObjects.Components.Sound;
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Shared.GameObjects.Components.Power; using Content.Shared.GameObjects.Components.Power;
using SS14.Server.GameObjects; using Robust.Server.GameObjects;
using SS14.Server.GameObjects.Components.UserInterface; using Robust.Server.GameObjects.Components.UserInterface;
using SS14.Server.GameObjects.EntitySystems; using Robust.Server.GameObjects.EntitySystems;
using SS14.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.GameObjects;
using SS14.Shared.Audio; using Robust.Shared.Audio;
using SS14.Shared.GameObjects.Components.UserInterface; using Robust.Shared.GameObjects.Components.UserInterface;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.IoC; using Robust.Shared.IoC;
namespace Content.Server.GameObjects.Components.Power namespace Content.Server.GameObjects.Components.Power
{ {

10
Content.Server/GameObjects/Components/Power/LightBulbComponent.cs
View File

@@ -1,9 +1,9 @@
using System; using System;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Maths; using Robust.Shared.Maths;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using SpriteComponent = SS14.Server.GameObjects.SpriteComponent; using SpriteComponent = Robust.Server.GameObjects.SpriteComponent;
namespace Content.Server.GameObjects.Components.Power namespace Content.Server.GameObjects.Components.Power
{ {

2
Content.Server/GameObjects/Components/Power/PowerCellComponent.cs
View File

@@ -1,5 +1,5 @@
using Content.Shared.GameObjects.Components.Power; using Content.Shared.GameObjects.Components.Power;
using SS14.Server.GameObjects; using Robust.Server.GameObjects;
namespace Content.Server.GameObjects.Components.Power namespace Content.Server.GameObjects.Components.Power
{ {

8
Content.Server/GameObjects/Components/Power/PowerDebugTool.cs
View File

@@ -2,10 +2,10 @@
using System.Text; using System.Text;
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Shared.GameObjects.Components.Power; using Content.Shared.GameObjects.Components.Power;
using SS14.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.Map; using Robust.Shared.Map;
namespace Content.Server.GameObjects.Components.Power namespace Content.Server.GameObjects.Components.Power
{ {

16
Content.Server/GameObjects/Components/Power/PowerDevice.cs
View File

@@ -1,15 +1,15 @@
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using SS14.Server.GameObjects; using Robust.Server.GameObjects;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using SS14.Shared.Utility; using Robust.Shared.Utility;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using YamlDotNet.RepresentationModel; using YamlDotNet.RepresentationModel;
namespace Content.Server.GameObjects.Components.Power namespace Content.Server.GameObjects.Components.Power

14
Content.Server/GameObjects/Components/Power/PowerGeneratorComponent.cs
View File

@@ -1,11 +1,11 @@
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Log; using Robust.Shared.Log;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using SS14.Shared.Utility; using Robust.Shared.Utility;
using System; using System;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using YamlDotNet.RepresentationModel; using YamlDotNet.RepresentationModel;
namespace Content.Server.GameObjects.Components.Power namespace Content.Server.GameObjects.Components.Power

12
Content.Server/GameObjects/Components/Power/PowerNodeComponent.cs
View File

@@ -1,11 +1,11 @@
using SS14.Server.GameObjects; using Robust.Server.GameObjects;
using SS14.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.GameObjects;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using System; using System;
using System.Linq; using System.Linq;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Power namespace Content.Server.GameObjects.Components.Power
{ {

18
Content.Server/GameObjects/Components/Power/PowerProviderComponent.cs
View File

@@ -1,15 +1,15 @@
using SS14.Server.GameObjects; using Robust.Server.GameObjects;
using SS14.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Log; using Robust.Shared.Log;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using SS14.Shared.Utility; using Robust.Shared.Utility;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using YamlDotNet.RepresentationModel; using YamlDotNet.RepresentationModel;
namespace Content.Server.GameObjects.Components.Power namespace Content.Server.GameObjects.Components.Power

12
Content.Server/GameObjects/Components/Power/PowerStorageComponent.cs
View File

@@ -1,11 +1,11 @@
using Content.Shared.GameObjects.Components.Power; using Content.Shared.GameObjects.Components.Power;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using SS14.Shared.Utility; using Robust.Shared.Utility;
using System; using System;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using YamlDotNet.RepresentationModel; using YamlDotNet.RepresentationModel;
namespace Content.Server.GameObjects.Components.Power namespace Content.Server.GameObjects.Components.Power

4
Content.Server/GameObjects/Components/Power/PowerStorageNetComponent.cs
View File

@@ -1,5 +1,5 @@
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Power namespace Content.Server.GameObjects.Components.Power
{ {

14
Content.Server/GameObjects/Components/Power/PowerTransferComponent.cs
View File

@@ -1,13 +1,13 @@
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using SS14.Server.GameObjects; using Robust.Server.GameObjects;
using SS14.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.GameObjects;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using System.Linq; using System.Linq;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Content.Server.GameObjects.Components.Interactable.Tools; using Content.Server.GameObjects.Components.Interactable.Tools;
using SS14.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using System; using System;
namespace Content.Server.GameObjects.Components.Power namespace Content.Server.GameObjects.Components.Power

20
Content.Server/GameObjects/Components/Power/PoweredLightComponent.cs
View File

@@ -2,16 +2,16 @@
using Content.Server.GameObjects.Components.Sound; using Content.Server.GameObjects.Components.Sound;
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
using SS14.Server.GameObjects; using Robust.Server.GameObjects;
using SS14.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.Components.Container;
using SS14.Shared.Audio; using Robust.Shared.Audio;
using SS14.Shared.Enums; using Robust.Shared.Enums;
using SS14.Shared.GameObjects; using Robust.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Timing; using Robust.Shared.Interfaces.Timing;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Serialization; using Robust.Shared.Serialization;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Power namespace Content.Server.GameObjects.Components.Power
{ {

8
Content.Server/GameObjects/Components/Power/Powernet.cs
View File

@@ -1,10 +1,10 @@
using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems;
using SS14.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using SS14.Shared.IoC; using Robust.Shared.IoC;
using SS14.Shared.Log; using Robust.Shared.Log;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using SS14.Shared.ViewVariables; using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Power namespace Content.Server.GameObjects.Components.Power
{ {

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