diff --git a/Content.Client/Chat/ChatBox.cs b/Content.Client/Chat/ChatBox.cs index 228ccea90b..f9f9b46152 100644 --- a/Content.Client/Chat/ChatBox.cs +++ b/Content.Client/Chat/ChatBox.cs @@ -1,12 +1,12 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Content.Shared.Chat; -using SS14.Client.Console; -using SS14.Client.Graphics.Drawing; -using SS14.Client.Input; -using SS14.Client.UserInterface; -using SS14.Client.UserInterface.Controls; -using SS14.Shared.Maths; -using SS14.Shared.Utility; +using Robust.Client.Console; +using Robust.Client.Graphics.Drawing; +using Robust.Client.Input; +using Robust.Client.UserInterface; +using Robust.Client.UserInterface.Controls; +using Robust.Shared.Maths; +using Robust.Shared.Utility; namespace Content.Client.Chat { diff --git a/Content.Client/Chat/ChatManager.cs b/Content.Client/Chat/ChatManager.cs index 13e42b52e1..91daab3b15 100644 --- a/Content.Client/Chat/ChatManager.cs +++ b/Content.Client/Chat/ChatManager.cs @@ -1,13 +1,13 @@ using System; using Content.Client.Interfaces.Chat; using Content.Shared.Chat; -using SS14.Client.Console; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.IoC; -using SS14.Shared.Log; -using SS14.Shared.Maths; -using SS14.Shared.Utility; +using Robust.Client.Console; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.IoC; +using Robust.Shared.Log; +using Robust.Shared.Maths; +using Robust.Shared.Utility; namespace Content.Client.Chat { diff --git a/Content.Client/ClientNotifyManager.cs b/Content.Client/ClientNotifyManager.cs index 56364513ee..fc4db8db17 100644 --- a/Content.Client/ClientNotifyManager.cs +++ b/Content.Client/ClientNotifyManager.cs @@ -2,19 +2,19 @@ using System; using System.Collections.Generic; using Content.Client.Interfaces; using Content.Shared; -using SS14.Client; -using SS14.Client.Interfaces.Console; -using SS14.Client.Interfaces.Graphics.ClientEye; -using SS14.Client.Interfaces.Input; -using SS14.Client.Interfaces.UserInterface; -using SS14.Client.Player; -using SS14.Client.UserInterface.Controls; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.IoC; -using SS14.Shared.Map; -using SS14.Shared.Maths; -using SS14.Shared.Utility; +using Robust.Client; +using Robust.Client.Interfaces.Console; +using Robust.Client.Interfaces.Graphics.ClientEye; +using Robust.Client.Interfaces.Input; +using Robust.Client.Interfaces.UserInterface; +using Robust.Client.Player; +using Robust.Client.UserInterface.Controls; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Utility; namespace Content.Client { diff --git a/Content.Client/Commands/DebugCommands.cs b/Content.Client/Commands/DebugCommands.cs index 3ab831798b..6ffac303f7 100644 --- a/Content.Client/Commands/DebugCommands.cs +++ b/Content.Client/Commands/DebugCommands.cs @@ -1,10 +1,10 @@ using Content.Client.Interfaces; using Content.Shared.GameObjects.Components.Markers; -using SS14.Client.Interfaces.Console; -using SS14.Client.Interfaces.GameObjects.Components; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.IoC; +using Robust.Client.Interfaces.Console; +using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; namespace Content.Client.Commands { diff --git a/Content.Client/Construction/ConstructionButton.cs b/Content.Client/Construction/ConstructionButton.cs index dbc5444c62..14a8464f14 100644 --- a/Content.Client/Construction/ConstructionButton.cs +++ b/Content.Client/Construction/ConstructionButton.cs @@ -1,7 +1,7 @@ using Content.Client.GameObjects.Components.Construction; -using SS14.Client.Interfaces.Graphics; -using SS14.Client.UserInterface.Controls; -using SS14.Shared.Utility; +using Robust.Client.Interfaces.Graphics; +using Robust.Client.UserInterface.Controls; +using Robust.Shared.Utility; namespace Content.Client.Construction { diff --git a/Content.Client/Construction/ConstructionMenu.cs b/Content.Client/Construction/ConstructionMenu.cs index 993d90fefa..c319cff27e 100644 --- a/Content.Client/Construction/ConstructionMenu.cs +++ b/Content.Client/Construction/ConstructionMenu.cs @@ -3,25 +3,25 @@ using System.Collections.Generic; using System.Linq; using Content.Client.GameObjects.Components.Construction; using Content.Shared.Construction; -using SS14.Client.GameObjects; -using SS14.Client.Graphics; -using SS14.Client.Interfaces.GameObjects; -using SS14.Client.Interfaces.Graphics; -using SS14.Client.Interfaces.Placement; -using SS14.Client.Interfaces.ResourceManagement; -using SS14.Client.Placement; -using SS14.Client.ResourceManagement; -using SS14.Client.UserInterface; -using SS14.Client.UserInterface.Controls; -using SS14.Client.UserInterface.CustomControls; -using SS14.Client.Utility; -using SS14.Shared.Enums; -using SS14.Shared.Interfaces.GameObjects.Components; -using SS14.Shared.IoC; -using SS14.Shared.Log; -using SS14.Shared.Maths; -using SS14.Shared.Prototypes; -using SS14.Shared.Utility; +using Robust.Client.GameObjects; +using Robust.Client.Graphics; +using Robust.Client.Interfaces.GameObjects; +using Robust.Client.Interfaces.Graphics; +using Robust.Client.Interfaces.Placement; +using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.Placement; +using Robust.Client.ResourceManagement; +using Robust.Client.UserInterface; +using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.CustomControls; +using Robust.Client.Utility; +using Robust.Shared.Enums; +using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.IoC; +using Robust.Shared.Log; +using Robust.Shared.Maths; +using Robust.Shared.Prototypes; +using Robust.Shared.Utility; namespace Content.Client.Construction { diff --git a/Content.Client/Construction/ConstructionPlacementHijack.cs b/Content.Client/Construction/ConstructionPlacementHijack.cs index fc1ec338e9..bf1abe4ee1 100644 --- a/Content.Client/Construction/ConstructionPlacementHijack.cs +++ b/Content.Client/Construction/ConstructionPlacementHijack.cs @@ -1,14 +1,14 @@ using Content.Client.GameObjects.Components.Construction; using Content.Shared.Construction; -using SS14.Client.Graphics; -using SS14.Client.Interfaces.ResourceManagement; -using SS14.Client.Placement; -using SS14.Client.ResourceManagement; -using SS14.Client.Utility; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.IoC; -using SS14.Shared.Map; -using SS14.Shared.Maths; +using Robust.Client.Graphics; +using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.Placement; +using Robust.Client.ResourceManagement; +using Robust.Client.Utility; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Maths; namespace Content.Client.Construction { diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj index dbf6b9a7fe..fb7d05835e 100644 --- a/Content.Client/Content.Client.csproj +++ b/Content.Client/Content.Client.csproj @@ -126,17 +126,17 @@ {26aeebb3-dde7-443a-9f43-7bc7f4acf6b5} Content.Shared - - {3F8AA5A7-7198-49D5-B460-4A83A8F1528A} - SS14.Client + + {83429bd6-6358-4b18-be51-401df8ea2673} + Robust.Client - - {7DC961F2-A45B-4193-BE7F-77622A231943} - SS14.Shared.Maths + + {93f23a82-00c5-4572-964e-e7c9457726d4} + Robust.Shared.Maths - - {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1} - SS14.Shared + + {0529f740-0000-0000-0000-000000000000} + Robust.Shared @@ -160,4 +160,4 @@ - + \ No newline at end of file diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint.cs index 999f4b7915..d1c4affc94 100644 --- a/Content.Client/EntryPoint.cs +++ b/Content.Client/EntryPoint.cs @@ -14,16 +14,16 @@ using Content.Client.Interfaces.Parallax; using Content.Client.Parallax; using Content.Shared.GameObjects.Components.Weapons.Ranged; using Content.Shared.Interfaces; -using SS14.Client; -using SS14.Client.Interfaces; -using SS14.Client.Interfaces.Graphics.Overlays; -using SS14.Client.Interfaces.Input; -using SS14.Client.Player; -using SS14.Client.Utility; -using SS14.Shared.ContentPack; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.IoC; -using SS14.Shared.Prototypes; +using Robust.Client; +using Robust.Client.Interfaces; +using Robust.Client.Interfaces.Graphics.Overlays; +using Robust.Client.Interfaces.Input; +using Robust.Client.Player; +using Robust.Client.Utility; +using Robust.Shared.ContentPack; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Prototypes; using System; using Content.Client.Chat; using Content.Client.GameObjects.Components; @@ -33,8 +33,8 @@ using Content.Client.Interfaces.Chat; using Content.Client.UserInterface; using Content.Shared.GameObjects.Components.Markers; using Content.Shared.GameObjects.Components.Mobs; -using SS14.Client.Interfaces.UserInterface; -using SS14.Shared.Log; +using Robust.Client.Interfaces.UserInterface; +using Robust.Shared.Log; namespace Content.Client { diff --git a/Content.Client/GameObjects/Components/Actor/CharacterInterface.cs b/Content.Client/GameObjects/Components/Actor/CharacterInterface.cs index 338408363b..ae94888011 100644 --- a/Content.Client/GameObjects/Components/Actor/CharacterInterface.cs +++ b/Content.Client/GameObjects/Components/Actor/CharacterInterface.cs @@ -1,14 +1,14 @@ using Content.Client.GameObjects.Components.Mobs; using Content.Shared.Input; -using SS14.Client.Interfaces.Input; -using SS14.Client.UserInterface.CustomControls; -using SS14.Shared.GameObjects; -using SS14.Shared.Input; -using SS14.Shared.IoC; -using SS14.Shared.Utility; +using Robust.Client.Interfaces.Input; +using Robust.Client.UserInterface.CustomControls; +using Robust.Shared.GameObjects; +using Robust.Shared.Input; +using Robust.Shared.IoC; +using Robust.Shared.Utility; using System.Collections.Generic; using System.Linq; -using SS14.Client.Interfaces.Graphics; +using Robust.Client.Interfaces.Graphics; namespace Content.Client.GameObjects.Components.Actor { diff --git a/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs b/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs index 21e70c823a..8a9eb99b9d 100644 --- a/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs +++ b/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs @@ -1,9 +1,9 @@ using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Inventory; using Content.Shared.GameObjects.Components.Items; -using SS14.Client.Graphics; -using SS14.Shared.GameObjects; -using SS14.Shared.ViewVariables; +using Robust.Client.Graphics; +using Robust.Shared.GameObjects; +using Robust.Shared.ViewVariables; using System; namespace Content.Client.GameObjects.Components.Clothing diff --git a/Content.Client/GameObjects/Components/Construction/ConstructionGhostComponent.cs b/Content.Client/GameObjects/Components/Construction/ConstructionGhostComponent.cs index 17d29e2f69..1f9a0f1531 100644 --- a/Content.Client/GameObjects/Components/Construction/ConstructionGhostComponent.cs +++ b/Content.Client/GameObjects/Components/Construction/ConstructionGhostComponent.cs @@ -1,8 +1,8 @@ using Content.Shared.Construction; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.ViewVariables; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.ViewVariables; namespace Content.Client.GameObjects.Components.Construction { diff --git a/Content.Client/GameObjects/Components/Construction/ConstructorComponent.cs b/Content.Client/GameObjects/Components/Construction/ConstructorComponent.cs index 0f9484c326..a1addc3171 100644 --- a/Content.Client/GameObjects/Components/Construction/ConstructorComponent.cs +++ b/Content.Client/GameObjects/Components/Construction/ConstructorComponent.cs @@ -2,17 +2,17 @@ using Content.Client.Construction; using Content.Shared.Construction; using Content.Shared.GameObjects.Components.Construction; -using SS14.Client.GameObjects; -using SS14.Client.Interfaces.GameObjects; -using SS14.Client.Interfaces.Graphics; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.GameObjects.Components; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.IoC; -using SS14.Shared.Log; -using SS14.Shared.Map; -using SS14.Shared.Maths; +using Robust.Client.GameObjects; +using Robust.Client.Interfaces.GameObjects; +using Robust.Client.Interfaces.Graphics; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.IoC; +using Robust.Shared.Log; +using Robust.Shared.Map; +using Robust.Shared.Maths; namespace Content.Client.GameObjects.Components.Construction { diff --git a/Content.Client/GameObjects/Components/DamageableComponent.cs b/Content.Client/GameObjects/Components/DamageableComponent.cs index c17d430c15..311f89e80c 100644 --- a/Content.Client/GameObjects/Components/DamageableComponent.cs +++ b/Content.Client/GameObjects/Components/DamageableComponent.cs @@ -1,5 +1,5 @@ using Content.Shared.GameObjects; -using SS14.Shared.GameObjects; +using Robust.Shared.GameObjects; using System.Collections.Generic; namespace Content.Client.GameObjects diff --git a/Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs b/Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs index 0e95477979..0b2f0798ee 100644 --- a/Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs @@ -1,11 +1,11 @@ using System; using Content.Shared.GameObjects.Components.Doors; -using SS14.Client.Animations; -using SS14.Client.GameObjects; -using SS14.Client.GameObjects.Components.Animations; -using SS14.Client.Interfaces.GameObjects.Components; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Utility; +using Robust.Client.Animations; +using Robust.Client.GameObjects; +using Robust.Client.GameObjects.Components.Animations; +using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; namespace Content.Client.GameObjects.Components.Doors diff --git a/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs b/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs index 7448fdfc5e..f96eaf12e5 100644 --- a/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs +++ b/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs @@ -1,17 +1,17 @@ using Content.Shared.GameObjects; -using SS14.Client.Interfaces.GameObjects.Components; -using SS14.Client.UserInterface; -using SS14.Client.UserInterface.Controls; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.IoC; -using SS14.Shared.Serialization; -using SS14.Shared.Utility; +using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Client.UserInterface; +using Robust.Client.UserInterface.Controls; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; using System; using System.Collections.Generic; using System.Linq; 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.SharedInventoryComponent.ClientInventoryMessage; using Content.Client.GameObjects.Components.Mobs; diff --git a/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs b/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs index e416f4d69c..6b510ff8bd 100644 --- a/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs +++ b/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs @@ -1,12 +1,12 @@ using System.Diagnostics.CodeAnalysis; using Content.Client.GameObjects.EntitySystems; using JetBrains.Annotations; -using SS14.Client.Interfaces.GameObjects.Components; -using SS14.Shared.GameObjects; -using SS14.Shared.GameObjects.Components.Transform; -using SS14.Shared.Map; -using SS14.Shared.Serialization; -using static SS14.Client.GameObjects.SpriteComponent; +using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Components.Transform; +using Robust.Shared.Map; +using Robust.Shared.Serialization; +using static Robust.Client.GameObjects.SpriteComponent; namespace Content.Client.GameObjects.Components.IconSmoothing { diff --git a/Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs b/Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs index 6a35768f42..4da04a34b2 100644 --- a/Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs +++ b/Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs @@ -1,18 +1,18 @@ using Content.Client.Interfaces.GameObjects; using Content.Client.UserInterface; using Content.Shared.GameObjects; -using SS14.Client.Interfaces.UserInterface; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.IoC; +using Robust.Client.Interfaces.UserInterface; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; using System.Collections.Generic; using System.Linq; -using SS14.Client.GameObjects; -using SS14.Client.Interfaces.GameObjects.Components; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.Serialization; -using SS14.Shared.Utility; -using SS14.Shared.ViewVariables; +using Robust.Client.GameObjects; +using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; +using Robust.Shared.ViewVariables; namespace Content.Client.GameObjects { diff --git a/Content.Client/GameObjects/Components/Items/ItemComponent.cs b/Content.Client/GameObjects/Components/Items/ItemComponent.cs index 3bbfa35eea..574f25b50d 100644 --- a/Content.Client/GameObjects/Components/Items/ItemComponent.cs +++ b/Content.Client/GameObjects/Components/Items/ItemComponent.cs @@ -1,14 +1,14 @@ using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Items; -using SS14.Client.Graphics; -using SS14.Client.Interfaces.ResourceManagement; -using SS14.Client.ResourceManagement; -using SS14.Shared.GameObjects; -using SS14.Shared.GameObjects.Components.Renderable; -using SS14.Shared.IoC; -using SS14.Shared.Serialization; -using SS14.Shared.Utility; -using SS14.Shared.ViewVariables; +using Robust.Client.Graphics; +using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.ResourceManagement; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Components.Renderable; +using Robust.Shared.IoC; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; +using Robust.Shared.ViewVariables; using System; namespace Content.Client.GameObjects diff --git a/Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs b/Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs index 4c25b5b94a..6745d2a271 100644 --- a/Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs +++ b/Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs @@ -1,10 +1,10 @@ using System; using Content.Shared.GameObjects.Components.Mobs; -using SS14.Client.GameObjects; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.Maths; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.Maths; namespace Content.Client.GameObjects.Components.Mobs { diff --git a/Content.Client/GameObjects/Components/Mobs/ICharacterUI.cs b/Content.Client/GameObjects/Components/Mobs/ICharacterUI.cs index e65e448110..748bdf40bc 100644 --- a/Content.Client/GameObjects/Components/Mobs/ICharacterUI.cs +++ b/Content.Client/GameObjects/Components/Mobs/ICharacterUI.cs @@ -1,5 +1,5 @@ using Content.Client.GameObjects.Components.Actor; -using SS14.Client.UserInterface; +using Robust.Client.UserInterface; namespace Content.Client.GameObjects.Components.Mobs { diff --git a/Content.Client/GameObjects/Components/Mobs/SpeciesUI.cs b/Content.Client/GameObjects/Components/Mobs/SpeciesUI.cs index 08b0f4b8ce..672c045357 100644 --- a/Content.Client/GameObjects/Components/Mobs/SpeciesUI.cs +++ b/Content.Client/GameObjects/Components/Mobs/SpeciesUI.cs @@ -2,22 +2,22 @@ using Content.Client.GameObjects.Components.Mobs; using Content.Client.Graphics.Overlays; using Content.Shared.GameObjects; -using SS14.Client.GameObjects; -using SS14.Client.Interfaces.Graphics.Overlays; -using SS14.Client.Interfaces.ResourceManagement; -using SS14.Client.Player; -using SS14.Client.ResourceManagement; -using SS14.Client.UserInterface; -using SS14.Client.UserInterface.Controls; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.IoC; -using SS14.Shared.Log; -using SS14.Shared.Utility; +using Robust.Client.GameObjects; +using Robust.Client.Interfaces.Graphics.Overlays; +using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.Player; +using Robust.Client.ResourceManagement; +using Robust.Client.UserInterface; +using Robust.Client.UserInterface.Controls; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.IoC; +using Robust.Shared.Log; +using Robust.Shared.Utility; using System.Collections.Generic; using Content.Shared.GameObjects.Components.Mobs; -using SS14.Client.Graphics.Overlays; +using Robust.Client.Graphics.Overlays; namespace Content.Client.GameObjects { diff --git a/Content.Client/GameObjects/Components/Mobs/SpeciesVisualizer2D.cs b/Content.Client/GameObjects/Components/Mobs/SpeciesVisualizer2D.cs index e5bd756988..63a9363763 100644 --- a/Content.Client/GameObjects/Components/Mobs/SpeciesVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Mobs/SpeciesVisualizer2D.cs @@ -1,8 +1,8 @@ using Content.Shared.GameObjects.Components.Mobs; -using SS14.Client.GameObjects; -using SS14.Client.Interfaces.GameObjects.Components; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Maths; +using Robust.Client.GameObjects; +using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Maths; namespace Content.Client.GameObjects.Components.Mobs { diff --git a/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs b/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs index 7253d5de5b..be9512bbdc 100644 --- a/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs @@ -1,12 +1,12 @@ using System; using Content.Shared.GameObjects.Components.Power; -using SS14.Client.GameObjects.Components.UserInterface; -using SS14.Client.Interfaces.Graphics; -using SS14.Client.UserInterface.Controls; -using SS14.Client.UserInterface.CustomControls; -using SS14.Shared.GameObjects.Components.UserInterface; -using SS14.Shared.IoC; -using SS14.Shared.Utility; +using Robust.Client.GameObjects.Components.UserInterface; +using Robust.Client.Interfaces.Graphics; +using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.CustomControls; +using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.IoC; +using Robust.Shared.Utility; namespace Content.Client.GameObjects.Components.Power { diff --git a/Content.Client/GameObjects/Components/Power/ApcVisualizer2D.cs b/Content.Client/GameObjects/Components/Power/ApcVisualizer2D.cs index ee46cc84cb..098636ae70 100644 --- a/Content.Client/GameObjects/Components/Power/ApcVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Power/ApcVisualizer2D.cs @@ -1,7 +1,7 @@ using Content.Shared.GameObjects.Components.Power; -using SS14.Client.GameObjects; -using SS14.Client.Interfaces.GameObjects.Components; -using SS14.Shared.Interfaces.GameObjects; +using Robust.Client.GameObjects; +using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Shared.Interfaces.GameObjects; namespace Content.Client.GameObjects.Components.Power { diff --git a/Content.Client/GameObjects/Components/Power/PowerCellVisualizer2D.cs b/Content.Client/GameObjects/Components/Power/PowerCellVisualizer2D.cs index c2d4769143..6bb18d2d44 100644 --- a/Content.Client/GameObjects/Components/Power/PowerCellVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Power/PowerCellVisualizer2D.cs @@ -1,9 +1,9 @@ using Content.Shared.GameObjects.Components.Power; using Content.Shared.Utility; -using SS14.Client.GameObjects; -using SS14.Client.Interfaces.GameObjects.Components; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Utility; +using Robust.Client.GameObjects; +using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; namespace Content.Client.GameObjects.Components.Power diff --git a/Content.Client/GameObjects/Components/Power/PowerDebugTool.cs b/Content.Client/GameObjects/Components/Power/PowerDebugTool.cs index 9c6962892a..c9e1fd958d 100644 --- a/Content.Client/GameObjects/Components/Power/PowerDebugTool.cs +++ b/Content.Client/GameObjects/Components/Power/PowerDebugTool.cs @@ -1,11 +1,11 @@ using Content.Shared.GameObjects.Components.Power; -using SS14.Client.Interfaces.Graphics; -using SS14.Client.UserInterface.Controls; -using SS14.Client.UserInterface.CustomControls; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.IoC; +using Robust.Client.Interfaces.Graphics; +using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.CustomControls; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.IoC; namespace Content.Client.GameObjects.Components.Power { diff --git a/Content.Client/GameObjects/Components/Power/SmesVisualizer2D.cs b/Content.Client/GameObjects/Components/Power/SmesVisualizer2D.cs index 5631f3f0ec..98c08abc1c 100644 --- a/Content.Client/GameObjects/Components/Power/SmesVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Power/SmesVisualizer2D.cs @@ -1,7 +1,7 @@ using Content.Shared.GameObjects.Components.Power; -using SS14.Client.GameObjects; -using SS14.Client.Interfaces.GameObjects.Components; -using SS14.Shared.Interfaces.GameObjects; +using Robust.Client.GameObjects; +using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Shared.Interfaces.GameObjects; using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Client/GameObjects/Components/Sound/SoundComponent.cs b/Content.Client/GameObjects/Components/Sound/SoundComponent.cs index 6dc1d362bb..e8a47f1643 100644 --- a/Content.Client/GameObjects/Components/Sound/SoundComponent.cs +++ b/Content.Client/GameObjects/Components/Sound/SoundComponent.cs @@ -1,15 +1,15 @@ using System; using System.Collections.Generic; using Content.Shared.GameObjects.Components.Sound; -using SS14.Client.GameObjects.EntitySystems; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.Interfaces.Timers; -using SS14.Shared.IoC; -using SS14.Shared.Log; -using SS14.Shared.Serialization; -using SS14.Shared.Timers; +using Robust.Client.GameObjects.EntitySystems; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.Interfaces.Timers; +using Robust.Shared.IoC; +using Robust.Shared.Log; +using Robust.Shared.Serialization; +using Robust.Shared.Timers; namespace Content.Client.GameObjects.Components.Sound { diff --git a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs index f112bb8e7e..9df61aa0b3 100644 --- a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs +++ b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs @@ -1,16 +1,16 @@ using Content.Shared.GameObjects.Components.Storage; -using SS14.Client.Interfaces.GameObjects.Components; -using SS14.Client.UserInterface; -using SS14.Client.UserInterface.Controls; -using SS14.Client.UserInterface.CustomControls; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.IoC; -using SS14.Shared.Utility; +using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Client.UserInterface; +using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.CustomControls; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.IoC; +using Robust.Shared.Utility; using System; using System.Collections.Generic; -using SS14.Client.Interfaces.Graphics; +using Robust.Client.Interfaces.Graphics; namespace Content.Client.GameObjects.Components.Storage { diff --git a/Content.Client/GameObjects/Components/SubFloorHideComponent.cs b/Content.Client/GameObjects/Components/SubFloorHideComponent.cs index 50cd10f33f..45d6c366d0 100644 --- a/Content.Client/GameObjects/Components/SubFloorHideComponent.cs +++ b/Content.Client/GameObjects/Components/SubFloorHideComponent.cs @@ -1,7 +1,7 @@ using Content.Shared.Maps; -using SS14.Client.Interfaces.GameObjects.Components; -using SS14.Shared.GameObjects; -using SS14.Shared.GameObjects.Components.Transform; +using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Components.Transform; namespace Content.Client.GameObjects.Components { diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineVisualizer2D.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineVisualizer2D.cs index f4a4df10b7..d4248ccdc6 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineVisualizer2D.cs @@ -1,8 +1,8 @@ using Content.Shared.GameObjects.Components.Weapons.Ranged; using Content.Shared.Utility; -using SS14.Client.GameObjects; -using SS14.Client.Interfaces.GameObjects.Components; -using SS14.Shared.Utility; +using Robust.Client.GameObjects; +using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; namespace Content.Client.GameObjects.Components.Weapons.Ranged diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponVisualizer2D.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponVisualizer2D.cs index 6f50eb0eea..d0d23be050 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponVisualizer2D.cs @@ -1,8 +1,8 @@ using Content.Shared.GameObjects.Components.Weapons.Ranged; using Content.Shared.Utility; -using SS14.Client.GameObjects; -using SS14.Client.Interfaces.GameObjects.Components; -using SS14.Shared.Utility; +using Robust.Client.GameObjects; +using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; namespace Content.Client.GameObjects.Components.Weapons.Ranged diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/ClientRangedWeaponComponent.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/ClientRangedWeaponComponent.cs index 33b7b221b0..3c7c76c5e4 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/ClientRangedWeaponComponent.cs +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/ClientRangedWeaponComponent.cs @@ -1,9 +1,9 @@ using System; using Content.Shared.GameObjects.Components.Weapons.Ranged; -using SS14.Shared.Interfaces.Timing; -using SS14.Shared.IoC; -using SS14.Shared.Log; -using SS14.Shared.Map; +using Robust.Shared.Interfaces.Timing; +using Robust.Shared.IoC; +using Robust.Shared.Log; +using Robust.Shared.Map; namespace Content.Client.GameObjects.Components.Weapons.Ranged { diff --git a/Content.Client/GameObjects/EntitySystems/CameraRecoilSystem.cs b/Content.Client/GameObjects/EntitySystems/CameraRecoilSystem.cs index e1c7d9c8ee..2d5af8c103 100644 --- a/Content.Client/GameObjects/EntitySystems/CameraRecoilSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/CameraRecoilSystem.cs @@ -1,6 +1,6 @@ using Content.Client.GameObjects.Components.Mobs; -using SS14.Shared.GameObjects; -using SS14.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; namespace Content.Client.GameObjects.EntitySystems { diff --git a/Content.Client/GameObjects/EntitySystems/ExamineSystem.cs b/Content.Client/GameObjects/EntitySystems/ExamineSystem.cs index aad58b3e4a..7133287378 100644 --- a/Content.Client/GameObjects/EntitySystems/ExamineSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/ExamineSystem.cs @@ -3,20 +3,20 @@ using System.Threading.Tasks; using Content.Shared.GameObjects.EntitySystemMessages; using Content.Shared.Input; using JetBrains.Annotations; -using SS14.Client.GameObjects.EntitySystems; -using SS14.Client.Interfaces.GameObjects.Components; -using SS14.Client.Interfaces.Input; -using SS14.Client.Interfaces.UserInterface; -using SS14.Client.UserInterface; -using SS14.Client.UserInterface.Controls; -using SS14.Shared.GameObjects; -using SS14.Shared.GameObjects.Systems; -using SS14.Shared.Input; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.IoC; -using SS14.Shared.Map; -using SS14.Shared.Maths; -using SS14.Shared.Players; +using Robust.Client.GameObjects.EntitySystems; +using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Client.Interfaces.Input; +using Robust.Client.Interfaces.UserInterface; +using Robust.Client.UserInterface; +using Robust.Client.UserInterface.Controls; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Input; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Players; namespace Content.Client.GameObjects.EntitySystems { diff --git a/Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs b/Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs index 77aa222196..b210804f00 100644 --- a/Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs @@ -3,15 +3,15 @@ using System.Collections.Generic; using System.Linq; using Content.Client.GameObjects.Components.IconSmoothing; using JetBrains.Annotations; -using SS14.Client.Interfaces.GameObjects.Components; -using SS14.Shared.GameObjects; -using SS14.Shared.GameObjects.Components.Transform; -using SS14.Shared.GameObjects.Systems; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Map; -using SS14.Shared.IoC; -using SS14.Shared.Map; -using SS14.Shared.Maths; +using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Components.Transform; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Map; +using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Maths; namespace Content.Client.GameObjects.EntitySystems { diff --git a/Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs b/Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs index e4d8db6114..9071ee8e31 100644 --- a/Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs @@ -1,13 +1,13 @@ using Content.Client.GameObjects.Components.Weapons.Ranged; using Content.Client.Interfaces.GameObjects; using Content.Shared.Input; -using SS14.Client.GameObjects.EntitySystems; -using SS14.Client.Interfaces.Graphics.ClientEye; -using SS14.Client.Interfaces.Input; -using SS14.Client.Player; -using SS14.Shared.GameObjects.Systems; -using SS14.Shared.Input; -using SS14.Shared.IoC; +using Robust.Client.GameObjects.EntitySystems; +using Robust.Client.Interfaces.Graphics.ClientEye; +using Robust.Client.Interfaces.Input; +using Robust.Client.Player; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Input; +using Robust.Shared.IoC; namespace Content.Client.GameObjects.EntitySystems { diff --git a/Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs b/Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs index 2f9fb91559..d340f5a645 100644 --- a/Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs @@ -1,12 +1,12 @@ using Content.Client.GameObjects.Components; using Content.Shared.Maps; -using SS14.Client.Interfaces.GameObjects.Components; -using SS14.Shared.GameObjects.Components.Transform; -using SS14.Shared.GameObjects.Systems; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Map; -using SS14.Shared.IoC; -using SS14.Shared.Map; +using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Shared.GameObjects.Components.Transform; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Map; +using Robust.Shared.IoC; +using Robust.Shared.Map; namespace Content.Client.GameObjects.EntitySystems { diff --git a/Content.Client/GameObjects/EntitySystems/VerbSystem.cs b/Content.Client/GameObjects/EntitySystems/VerbSystem.cs index 5af9397b45..5b8332e118 100644 --- a/Content.Client/GameObjects/EntitySystems/VerbSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/VerbSystem.cs @@ -4,23 +4,23 @@ using System.Linq; using Content.Shared.GameObjects; using Content.Shared.GameObjects.EntitySystemMessages; using Content.Shared.Input; -using SS14.Client.GameObjects.EntitySystems; -using SS14.Client.Interfaces.Input; -using SS14.Client.Interfaces.State; -using SS14.Client.Interfaces.UserInterface; -using SS14.Client.Player; -using SS14.Client.State.States; -using SS14.Client.UserInterface.Controls; -using SS14.Shared.GameObjects; -using SS14.Shared.GameObjects.Systems; -using SS14.Shared.Input; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.IoC; -using SS14.Shared.Log; -using SS14.Shared.Map; -using SS14.Shared.Maths; -using SS14.Shared.Utility; +using Robust.Client.GameObjects.EntitySystems; +using Robust.Client.Interfaces.Input; +using Robust.Client.Interfaces.State; +using Robust.Client.Interfaces.UserInterface; +using Robust.Client.Player; +using Robust.Client.State.States; +using Robust.Client.UserInterface.Controls; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Input; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.IoC; +using Robust.Shared.Log; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Utility; namespace Content.Client.GameObjects.EntitySystems { diff --git a/Content.Client/GameTicking/ClientGameTicker.cs b/Content.Client/GameTicking/ClientGameTicker.cs index 63f973dbd3..65ad1f3612 100644 --- a/Content.Client/GameTicking/ClientGameTicker.cs +++ b/Content.Client/GameTicking/ClientGameTicker.cs @@ -5,16 +5,16 @@ using Content.Client.Interfaces.Chat; using Content.Client.UserInterface; using Content.Shared; using Content.Shared.Input; -using SS14.Client; -using SS14.Client.Console; -using SS14.Client.Interfaces; -using SS14.Client.Interfaces.Input; -using SS14.Client.Interfaces.UserInterface; -using SS14.Shared.Input; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.IoC; -using SS14.Shared.Utility; -using SS14.Shared.ViewVariables; +using Robust.Client; +using Robust.Client.Console; +using Robust.Client.Interfaces; +using Robust.Client.Interfaces.Input; +using Robust.Client.Interfaces.UserInterface; +using Robust.Shared.Input; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.IoC; +using Robust.Shared.Utility; +using Robust.Shared.ViewVariables; namespace Content.Client.GameTicking { diff --git a/Content.Client/Graphics/Overlays/CircleMaskOverlay.cs b/Content.Client/Graphics/Overlays/CircleMaskOverlay.cs index 49fbfde363..81dfff8b5d 100644 --- a/Content.Client/Graphics/Overlays/CircleMaskOverlay.cs +++ b/Content.Client/Graphics/Overlays/CircleMaskOverlay.cs @@ -1,11 +1,11 @@ -using SS14.Client.Graphics.Drawing; -using SS14.Client.Graphics.Overlays; -using SS14.Client.Graphics.Shaders; -using SS14.Client.Interfaces.Graphics.ClientEye; -using SS14.Client.Interfaces.Graphics.Overlays; -using SS14.Shared.IoC; -using SS14.Shared.Maths; -using SS14.Shared.Prototypes; +using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics.Overlays; +using Robust.Client.Graphics.Shaders; +using Robust.Client.Interfaces.Graphics.ClientEye; +using Robust.Client.Interfaces.Graphics.Overlays; +using Robust.Shared.IoC; +using Robust.Shared.Maths; +using Robust.Shared.Prototypes; namespace Content.Client.Graphics.Overlays { diff --git a/Content.Client/Graphics/Overlays/GradientCircleMask.cs b/Content.Client/Graphics/Overlays/GradientCircleMask.cs index a06ccfe941..8637878cf9 100644 --- a/Content.Client/Graphics/Overlays/GradientCircleMask.cs +++ b/Content.Client/Graphics/Overlays/GradientCircleMask.cs @@ -1,11 +1,11 @@ -using SS14.Client.Graphics.Drawing; -using SS14.Client.Graphics.Overlays; -using SS14.Client.Graphics.Shaders; -using SS14.Client.Interfaces.Graphics.ClientEye; -using SS14.Client.Interfaces.Graphics.Overlays; -using SS14.Shared.IoC; -using SS14.Shared.Maths; -using SS14.Shared.Prototypes; +using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics.Overlays; +using Robust.Client.Graphics.Shaders; +using Robust.Client.Interfaces.Graphics.ClientEye; +using Robust.Client.Interfaces.Graphics.Overlays; +using Robust.Shared.IoC; +using Robust.Shared.Maths; +using Robust.Shared.Prototypes; namespace Content.Client.Graphics.Overlays { diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs index 1f1afa5d93..53d7cb71df 100644 --- a/Content.Client/Input/ContentContexts.cs +++ b/Content.Client/Input/ContentContexts.cs @@ -1,5 +1,5 @@ using Content.Shared.Input; -using SS14.Shared.Input; +using Robust.Shared.Input; namespace Content.Client.Input { diff --git a/Content.Client/Interfaces/GameObjects/Components/Items/IHandsComponent.cs b/Content.Client/Interfaces/GameObjects/Components/Items/IHandsComponent.cs index 9ee28d856d..852b7e3a28 100644 --- a/Content.Client/Interfaces/GameObjects/Components/Items/IHandsComponent.cs +++ b/Content.Client/Interfaces/GameObjects/Components/Items/IHandsComponent.cs @@ -1,4 +1,4 @@ -using SS14.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects; namespace Content.Client.Interfaces.GameObjects { diff --git a/Content.Client/Interfaces/IClientGameTicker.cs b/Content.Client/Interfaces/IClientGameTicker.cs index a612b28b8a..16d3608caa 100644 --- a/Content.Client/Interfaces/IClientGameTicker.cs +++ b/Content.Client/Interfaces/IClientGameTicker.cs @@ -1,4 +1,4 @@ -using SS14.Client; +using Robust.Client; namespace Content.Client.Interfaces { diff --git a/Content.Client/Interfaces/IClientNotifyManager.cs b/Content.Client/Interfaces/IClientNotifyManager.cs index 479f070b17..ba4698041b 100644 --- a/Content.Client/Interfaces/IClientNotifyManager.cs +++ b/Content.Client/Interfaces/IClientNotifyManager.cs @@ -1,6 +1,6 @@ using Content.Shared.Interfaces; -using SS14.Client; -using SS14.Shared.Map; +using Robust.Client; +using Robust.Shared.Map; namespace Content.Client.Interfaces { diff --git a/Content.Client/Interfaces/Parallax/IParallaxManager.cs b/Content.Client/Interfaces/Parallax/IParallaxManager.cs index 8956eade7a..12b45d6336 100644 --- a/Content.Client/Interfaces/Parallax/IParallaxManager.cs +++ b/Content.Client/Interfaces/Parallax/IParallaxManager.cs @@ -1,5 +1,5 @@ using System; -using SS14.Client.Graphics; +using Robust.Client.Graphics; namespace Content.Client.Interfaces.Parallax { diff --git a/Content.Client/Parallax/ParallaxGenerator.cs b/Content.Client/Parallax/ParallaxGenerator.cs index b974182c37..5d2b6046a3 100644 --- a/Content.Client/Parallax/ParallaxGenerator.cs +++ b/Content.Client/Parallax/ParallaxGenerator.cs @@ -5,11 +5,11 @@ using Nett; using SixLabors.ImageSharp; using SixLabors.ImageSharp.PixelFormats; using SixLabors.Primitives; -using SS14.Client.Utility; -using SS14.Shared.Log; -using SS14.Shared.Maths; -using SS14.Shared.Noise; -using BlendFactor = SS14.Shared.Maths.Color.BlendFactor; +using Robust.Client.Utility; +using Robust.Shared.Log; +using Robust.Shared.Maths; +using Robust.Shared.Noise; +using BlendFactor = Robust.Shared.Maths.Color.BlendFactor; namespace Content.Client.Parallax { diff --git a/Content.Client/Parallax/ParallaxManager.cs b/Content.Client/Parallax/ParallaxManager.cs index 696e58b3ac..f9cb241958 100644 --- a/Content.Client/Parallax/ParallaxManager.cs +++ b/Content.Client/Parallax/ParallaxManager.cs @@ -7,11 +7,11 @@ using ICSharpCode.SharpZipLib.Checksum; using Nett; using SixLabors.ImageSharp; using SixLabors.Primitives; -using SS14.Client.Graphics; -using SS14.Client.Interfaces.ResourceManagement; -using SS14.Shared.IoC; -using SS14.Shared.Log; -using SS14.Shared.Utility; +using Robust.Client.Graphics; +using Robust.Client.Interfaces.ResourceManagement; +using Robust.Shared.IoC; +using Robust.Shared.Log; +using Robust.Shared.Utility; namespace Content.Client.Parallax { diff --git a/Content.Client/Parallax/ParallaxOverlay.cs b/Content.Client/Parallax/ParallaxOverlay.cs index 368de07454..c4266073a5 100644 --- a/Content.Client/Parallax/ParallaxOverlay.cs +++ b/Content.Client/Parallax/ParallaxOverlay.cs @@ -1,13 +1,13 @@ using Content.Client.Interfaces.Parallax; -using SS14.Client.Graphics; -using SS14.Client.Graphics.Drawing; -using SS14.Client.Graphics.Overlays; -using SS14.Client.Graphics.Shaders; -using SS14.Client.Interfaces.Graphics.ClientEye; -using SS14.Client.Interfaces.Graphics.Overlays; -using SS14.Shared.IoC; -using SS14.Shared.Maths; -using SS14.Shared.Prototypes; +using Robust.Client.Graphics; +using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics.Overlays; +using Robust.Client.Graphics.Shaders; +using Robust.Client.Interfaces.Graphics.ClientEye; +using Robust.Client.Interfaces.Graphics.Overlays; +using Robust.Shared.IoC; +using Robust.Shared.Maths; +using Robust.Shared.Prototypes; namespace Content.Client.Parallax { diff --git a/Content.Client/UserInterface/HandsGui.cs b/Content.Client/UserInterface/HandsGui.cs index 900639b1f1..fd0dc3371b 100644 --- a/Content.Client/UserInterface/HandsGui.cs +++ b/Content.Client/UserInterface/HandsGui.cs @@ -1,22 +1,22 @@ using Content.Client.GameObjects; using Content.Client.GameObjects.EntitySystems; using Content.Client.Interfaces.GameObjects; -using SS14.Client.GameObjects; -using SS14.Client.Graphics; -using SS14.Client.Graphics.Drawing; -using SS14.Client.Input; -using SS14.Client.Interfaces.GameObjects.Components; -using SS14.Client.Interfaces.ResourceManagement; -using SS14.Client.Interfaces.UserInterface; -using SS14.Client.Player; -using SS14.Client.ResourceManagement; -using SS14.Client.UserInterface; -using SS14.Client.UserInterface.Controls; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.IoC; -using SS14.Shared.Log; -using SS14.Shared.Map; -using SS14.Shared.Maths; +using Robust.Client.GameObjects; +using Robust.Client.Graphics; +using Robust.Client.Graphics.Drawing; +using Robust.Client.Input; +using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.Interfaces.UserInterface; +using Robust.Client.Player; +using Robust.Client.ResourceManagement; +using Robust.Client.UserInterface; +using Robust.Client.UserInterface.Controls; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Log; +using Robust.Shared.Map; +using Robust.Shared.Maths; namespace Content.Client.UserInterface { diff --git a/Content.Client/UserInterface/LobbyGui.cs b/Content.Client/UserInterface/LobbyGui.cs index 2607743321..0ff209bba1 100644 --- a/Content.Client/UserInterface/LobbyGui.cs +++ b/Content.Client/UserInterface/LobbyGui.cs @@ -1,8 +1,8 @@ using Content.Client.Chat; -using SS14.Client.UserInterface; -using SS14.Client.UserInterface.Controls; -using SS14.Client.UserInterface.CustomControls; -using SS14.Shared.Utility; +using Robust.Client.UserInterface; +using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.CustomControls; +using Robust.Shared.Utility; namespace Content.Client.UserInterface { diff --git a/Content.Client/UserInterface/NanoStyle.cs b/Content.Client/UserInterface/NanoStyle.cs index a235bc407f..d86d848b68 100644 --- a/Content.Client/UserInterface/NanoStyle.cs +++ b/Content.Client/UserInterface/NanoStyle.cs @@ -1,12 +1,12 @@ using Content.Client.GameObjects.EntitySystems; using Content.Client.Utility; -using SS14.Client.Graphics.Drawing; -using SS14.Client.Interfaces.ResourceManagement; -using SS14.Client.UserInterface; -using SS14.Client.UserInterface.Controls; -using SS14.Client.UserInterface.CustomControls; -using SS14.Shared.IoC; -using SS14.Shared.Maths; +using Robust.Client.Graphics.Drawing; +using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.UserInterface; +using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.CustomControls; +using Robust.Shared.IoC; +using Robust.Shared.Maths; namespace Content.Client.UserInterface { diff --git a/Content.Client/Utility/ResourceCacheExtensions.cs b/Content.Client/Utility/ResourceCacheExtensions.cs index af0c988548..c88fbed335 100644 --- a/Content.Client/Utility/ResourceCacheExtensions.cs +++ b/Content.Client/Utility/ResourceCacheExtensions.cs @@ -1,8 +1,8 @@ using JetBrains.Annotations; -using SS14.Client.Graphics; -using SS14.Client.Interfaces.ResourceManagement; -using SS14.Client.ResourceManagement; -using SS14.Shared.Utility; +using Robust.Client.Graphics; +using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.ResourceManagement; +using Robust.Shared.Utility; namespace Content.Client.Utility { diff --git a/Content.Server/AI/AimShootLifeProcessor.cs b/Content.Server/AI/AimShootLifeProcessor.cs index da1426b040..f5c7b88ba0 100644 --- a/Content.Server/AI/AimShootLifeProcessor.cs +++ b/Content.Server/AI/AimShootLifeProcessor.cs @@ -1,15 +1,15 @@ using System; using System.Collections.Generic; using Content.Server.Interfaces.GameObjects.Components.Movement; -using SS14.Server.AI; -using SS14.Server.GameObjects; -using SS14.Server.Interfaces.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.GameObjects.Components; -using SS14.Shared.Interfaces.Physics; -using SS14.Shared.Interfaces.Timing; -using SS14.Shared.IoC; -using SS14.Shared.Maths; +using Robust.Server.AI; +using Robust.Server.GameObjects; +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.Interfaces.Physics; +using Robust.Shared.Interfaces.Timing; +using Robust.Shared.IoC; +using Robust.Shared.Maths; namespace Content.Server.AI { @@ -119,7 +119,7 @@ namespace Content.Server.AI // build the ray var dir = entity.GetComponent().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 var result = _physMan.IntersectRay(ray, maxRayLen); diff --git a/Content.Server/Administration/AGhost.cs b/Content.Server/Administration/AGhost.cs index f116dde189..31abc066d3 100644 --- a/Content.Server/Administration/AGhost.cs +++ b/Content.Server/Administration/AGhost.cs @@ -1,8 +1,8 @@ -using Content.Server.Players; -using SS14.Server.Interfaces.Console; -using SS14.Server.Interfaces.Player; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.IoC; +using Content.Server.Players; +using Robust.Server.Interfaces.Console; +using Robust.Server.Interfaces.Player; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; namespace Content.Server.Administration { diff --git a/Content.Server/Chat/ChatCommands.cs b/Content.Server/Chat/ChatCommands.cs index d1962ea548..0934ed254f 100644 --- a/Content.Server/Chat/ChatCommands.cs +++ b/Content.Server/Chat/ChatCommands.cs @@ -1,8 +1,8 @@ using Content.Server.Interfaces.Chat; -using SS14.Server.Interfaces.Console; -using SS14.Server.Interfaces.Player; -using SS14.Shared.Enums; -using SS14.Shared.IoC; +using Robust.Server.Interfaces.Console; +using Robust.Server.Interfaces.Player; +using Robust.Shared.Enums; +using Robust.Shared.IoC; namespace Content.Server.Chat { diff --git a/Content.Server/Chat/ChatManager.cs b/Content.Server/Chat/ChatManager.cs index c658da0103..0339e0b741 100644 --- a/Content.Server/Chat/ChatManager.cs +++ b/Content.Server/Chat/ChatManager.cs @@ -1,11 +1,11 @@ using System.Linq; using Content.Server.Interfaces.Chat; using Content.Shared.Chat; -using SS14.Server.Interfaces.Player; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.Interfaces.Resources; -using SS14.Shared.IoC; +using Robust.Server.Interfaces.Player; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.Interfaces.Resources; +using Robust.Shared.IoC; namespace Content.Server.Chat { diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj index f0584fb52f..895ec78e7e 100644 --- a/Content.Server/Content.Server.csproj +++ b/Content.Server/Content.Server.csproj @@ -167,17 +167,17 @@ {26aeebb3-dde7-443a-9f43-7bc7f4acf6b5} Content.Shared - - {B04AAE71-0000-0000-0000-000000000000} - SS14.Server + + {b04aae71-0000-0000-0000-000000000000} + Robust.Server - - {93F23A82-00C5-4572-964E-E7C9457726D4} - SS14.Shared.Maths + + {93f23a82-00c5-4572-964e-e7c9457726d4} + Robust.Shared.Maths - - {0529F740-0000-0000-0000-000000000000} - SS14.Shared + + {0529f740-0000-0000-0000-000000000000} + Robust.Shared diff --git a/Content.Server/EntryPoint.cs b/Content.Server/EntryPoint.cs index c9f6431231..5b60875594 100644 --- a/Content.Server/EntryPoint.cs +++ b/Content.Server/EntryPoint.cs @@ -5,23 +5,23 @@ using Content.Server.GameObjects.Components.Power; using Content.Server.GameObjects.Components.Interactable.Tools; using Content.Server.Interfaces.GameObjects; using Content.Server.Placement; -using SS14.Server; -using SS14.Server.Interfaces; -using SS14.Server.Interfaces.Maps; -using SS14.Server.Interfaces.Player; -using SS14.Server.Player; -using SS14.Shared.Console; -using SS14.Shared.ContentPack; -using SS14.Shared.Enums; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Map; -using SS14.Shared.Interfaces.Timers; -using SS14.Shared.IoC; -using SS14.Shared.Log; -using SS14.Shared.Map; -using SS14.Shared.Timers; -using SS14.Shared.Interfaces.Timing; -using SS14.Shared.Maths; +using Robust.Server; +using Robust.Server.Interfaces; +using Robust.Server.Interfaces.Maps; +using Robust.Server.Interfaces.Player; +using Robust.Server.Player; +using Robust.Shared.Console; +using Robust.Shared.ContentPack; +using Robust.Shared.Enums; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Map; +using Robust.Shared.Interfaces.Timers; +using Robust.Shared.IoC; +using Robust.Shared.Log; +using Robust.Shared.Map; +using Robust.Shared.Timers; +using Robust.Shared.Interfaces.Timing; +using Robust.Shared.Maths; using Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan; using Content.Server.GameObjects.Components.Weapon.Ranged.Projectile; 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.Mobs; using Content.Shared.Interfaces; -using SS14.Server.Interfaces.ServerStatus; -using SS14.Shared.Timing; +using Robust.Server.Interfaces.ServerStatus; +using Robust.Shared.Timing; using Content.Server.GameObjects.Components.Destructible; using Content.Server.GameObjects.Components.Movement; using Content.Server.Interfaces.Chat; diff --git a/Content.Server/GameObjects/Components/CatwalkComponent.cs b/Content.Server/GameObjects/Components/CatwalkComponent.cs index ea1a0123f1..4e1769b210 100644 --- a/Content.Server/GameObjects/Components/CatwalkComponent.cs +++ b/Content.Server/GameObjects/Components/CatwalkComponent.cs @@ -1,4 +1,4 @@ -using SS14.Shared.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.Components { diff --git a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs b/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs index 9406cf9e4a..18d8072b38 100644 --- a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs +++ b/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs @@ -4,14 +4,14 @@ using Content.Server.GameObjects.Components.Interactable.Tools; using Content.Server.GameObjects.Components.Stack; using Content.Server.GameObjects.EntitySystems; using Content.Shared.Construction; -using SS14.Server.GameObjects; -using SS14.Server.GameObjects.EntitySystems; -using SS14.Server.Interfaces.GameObjects; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.GameObjects.Components; -using SS14.Shared.IoC; -using SS14.Shared.ViewVariables; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.IoC; +using Robust.Shared.ViewVariables; using static Content.Shared.Construction.ConstructionStepMaterial; using static Content.Shared.Construction.ConstructionStepTool; diff --git a/Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs b/Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs index 824994ed42..8d7e9491c6 100644 --- a/Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs +++ b/Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs @@ -6,17 +6,17 @@ using Content.Server.GameObjects.Components.Stack; using Content.Server.GameObjects.EntitySystems; using Content.Shared.Construction; using Content.Shared.GameObjects.Components.Construction; -using SS14.Server.GameObjects; -using SS14.Server.GameObjects.EntitySystems; -using SS14.Server.Interfaces.GameObjects; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.GameObjects.Components; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.IoC; -using SS14.Shared.Map; -using SS14.Shared.Maths; -using SS14.Shared.Prototypes; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Prototypes; namespace Content.Server.GameObjects.Components.Construction { diff --git a/Content.Server/GameObjects/Components/Damage/DamageableComponent.cs b/Content.Server/GameObjects/Components/Damage/DamageableComponent.cs index b65f77c4e2..0a561e7301 100644 --- a/Content.Server/GameObjects/Components/Damage/DamageableComponent.cs +++ b/Content.Server/GameObjects/Components/Damage/DamageableComponent.cs @@ -1,14 +1,14 @@ using Content.Server.Interfaces.GameObjects; using System; using System.Collections.Generic; -using SS14.Shared.Maths; -using SS14.Shared.GameObjects; -using SS14.Shared.Utility; +using Robust.Shared.Maths; +using Robust.Shared.GameObjects; +using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; using Content.Server.Interfaces; using Content.Shared.GameObjects; -using SS14.Shared.Serialization; -using SS14.Shared.ViewVariables; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects { diff --git a/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs b/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs index a0b220f78b..0fd5cdd388 100644 --- a/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs +++ b/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs @@ -1,13 +1,13 @@ using System; using System.Collections.Generic; -using SS14.Shared.GameObjects; -using SS14.Shared.Log; -using SS14.Shared.Utility; +using Robust.Shared.GameObjects; +using Robust.Shared.Log; +using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; using Content.Server.Interfaces; using Content.Shared.GameObjects; -using SS14.Shared.Serialization; -using SS14.Shared.ViewVariables; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Destructible { diff --git a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs b/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs index de39cee46d..3100198fd6 100644 --- a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs +++ b/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs @@ -1,12 +1,12 @@ using System; using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Doors; -using SS14.Server.GameObjects; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.Maths; -using SS14.Shared.Timers; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.Maths; +using Robust.Shared.Timers; namespace Content.Server.GameObjects { diff --git a/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs b/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs index 2443bd55b6..5f76615ea3 100644 --- a/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs +++ b/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs @@ -1,20 +1,20 @@ -using SS14.Server.GameObjects.Components.Container; +using Robust.Server.GameObjects.Components.Container; using System; using System.Collections.Generic; using Content.Shared.GameObjects; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Network; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Network; using static Content.Shared.GameObjects.SharedInventoryComponent.ClientInventoryMessage; -using SS14.Shared.IoC; -using SS14.Server.Interfaces.Player; -using SS14.Shared.ContentPack; +using Robust.Shared.IoC; +using Robust.Server.Interfaces.Player; +using Robust.Shared.ContentPack; using System.Linq; -using SS14.Shared.Serialization; -using SS14.Shared.Interfaces.GameObjects.Components; -using SS14.Shared.Utility; -using SS14.Shared.ViewVariables; +using Robust.Shared.Serialization; +using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.Utility; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects { diff --git a/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs b/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs index aee3c389b3..98f4a0cc07 100644 --- a/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs +++ b/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs @@ -5,21 +5,21 @@ using Content.Server.Interfaces.GameObjects; using Content.Shared.GameObjects; using Content.Shared.Input; using JetBrains.Annotations; -using SS14.Server.GameObjects; -using SS14.Server.GameObjects.Components.Container; -using SS14.Server.Interfaces.Player; -using SS14.Shared.GameObjects; -using SS14.Shared.Input; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.GameObjects.Components; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.IoC; -using SS14.Shared.Log; -using SS14.Shared.Map; -using SS14.Shared.Maths; -using SS14.Shared.Serialization; -using SS14.Shared.Utility; -using SS14.Shared.ViewVariables; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.Components.Container; +using Robust.Server.Interfaces.Player; +using Robust.Shared.GameObjects; +using Robust.Shared.Input; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.IoC; +using Robust.Shared.Log; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects { diff --git a/Content.Server/GameObjects/Components/Healing/HealingComponent.cs b/Content.Server/GameObjects/Components/Healing/HealingComponent.cs index 357bdc66ef..82b5420fe6 100644 --- a/Content.Server/GameObjects/Components/Healing/HealingComponent.cs +++ b/Content.Server/GameObjects/Components/Healing/HealingComponent.cs @@ -1,17 +1,17 @@ using System; using Content.Server.GameObjects.Components.Stack; -using SS14.Shared.GameObjects; +using Robust.Shared.GameObjects; using Content.Server.GameObjects.EntitySystems; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Map; -using SS14.Shared.IoC; -using SS14.Server.GameObjects; -using SS14.Shared.Maths; -using SS14.Server.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Timing; -using SS14.Shared.GameObjects.EntitySystemMessages; -using SS14.Shared.Serialization; -using SS14.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Map; +using Robust.Shared.IoC; +using Robust.Server.GameObjects; +using Robust.Shared.Maths; +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Timing; +using Robust.Shared.GameObjects.EntitySystemMessages; +using Robust.Shared.Serialization; +using Robust.Shared.Interfaces.GameObjects.Components; using Content.Shared.GameObjects; namespace Content.Server.GameObjects.Components.Weapon.Melee diff --git a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs index 39f47be303..31594f589d 100644 --- a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs @@ -2,13 +2,13 @@ using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces.GameObjects; using Content.Shared.GameObjects; -using SS14.Server.GameObjects; -using SS14.Server.GameObjects.Components.Container; -using SS14.Shared.Enums; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Utility; -using SS14.Shared.ViewVariables; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.Components.Container; +using Robust.Shared.Enums; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Utility; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Interactable { diff --git a/Content.Server/GameObjects/Components/Interactable/Tools/BaseTool.cs b/Content.Server/GameObjects/Components/Interactable/Tools/BaseTool.cs index de8b3c6aa8..dfb871a073 100644 --- a/Content.Server/GameObjects/Components/Interactable/Tools/BaseTool.cs +++ b/Content.Server/GameObjects/Components/Interactable/Tools/BaseTool.cs @@ -1,7 +1,7 @@ -using SS14.Shared.GameObjects; -using SS14.Shared.Serialization; -using SS14.Shared.Utility; -using SS14.Shared.ViewVariables; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; +using Robust.Shared.ViewVariables; using YamlDotNet.RepresentationModel; namespace Content.Server.GameObjects.Components.Interactable.Tools diff --git a/Content.Server/GameObjects/Components/Interactable/Tools/CrowbarComponent.cs b/Content.Server/GameObjects/Components/Interactable/Tools/CrowbarComponent.cs index b0ff5f380f..ed61174afc 100644 --- a/Content.Server/GameObjects/Components/Interactable/Tools/CrowbarComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/Tools/CrowbarComponent.cs @@ -1,10 +1,10 @@ using Content.Server.GameObjects.EntitySystems; using Content.Shared.Maps; -using SS14.Server.GameObjects.EntitySystems; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Map; -using SS14.Shared.IoC; -using SS14.Shared.Map; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Map; +using Robust.Shared.IoC; +using Robust.Shared.Map; namespace Content.Server.GameObjects.Components.Interactable.Tools { diff --git a/Content.Server/GameObjects/Components/Interactable/Tools/WelderComponent.cs b/Content.Server/GameObjects/Components/Interactable/Tools/WelderComponent.cs index 45b1239d61..cb1e6597b7 100644 --- a/Content.Server/GameObjects/Components/Interactable/Tools/WelderComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/Tools/WelderComponent.cs @@ -1,13 +1,13 @@ using System; using System.Text; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Utility; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; -using SS14.Server.GameObjects; +using Robust.Server.GameObjects; using Content.Server.GameObjects.EntitySystems; -using SS14.Shared.Maths; -using SS14.Shared.Serialization; -using SS14.Shared.ViewVariables; +using Robust.Shared.Maths; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Interactable.Tools { diff --git a/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs b/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs index 8aa0af932f..5b846a9e22 100644 --- a/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs @@ -1,7 +1,7 @@ using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Items; -using SS14.Shared.GameObjects; -using SS14.Shared.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; using System; using System.Collections.Generic; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; diff --git a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs index 26ae93ef90..eb46eb6e1b 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs @@ -1,9 +1,9 @@ using Content.Server.Interfaces.GameObjects; -using SS14.Server.Interfaces.GameObjects; +using Robust.Server.Interfaces.GameObjects; using Content.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects; using Content.Server.GameObjects.EntitySystems; -using SS14.Shared.GameObjects; +using Robust.Shared.GameObjects; using System; using Content.Shared.GameObjects.Components.Items; diff --git a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs index 759ff0585b..3973619d47 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs @@ -1,22 +1,22 @@ using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces.GameObjects; using Content.Shared.GameObjects.Components.Storage; -using SS14.Server.GameObjects; -using SS14.Server.GameObjects.Components.Container; -using SS14.Server.Interfaces.Player; -using SS14.Server.Player; -using SS14.Shared.Enums; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.GameObjects.Components; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.IoC; -using SS14.Shared.Log; -using SS14.Shared.Serialization; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.Components.Container; +using Robust.Server.Interfaces.Player; +using Robust.Server.Player; +using Robust.Shared.Enums; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.IoC; +using Robust.Shared.Log; +using Robust.Shared.Serialization; using System.Collections.Generic; using Content.Shared.Interfaces; -using SS14.Shared.GameObjects.EntitySystemMessages; -using SS14.Shared.ViewVariables; +using Robust.Shared.GameObjects.EntitySystemMessages; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects { diff --git a/Content.Server/GameObjects/Components/Items/Storage/StoreableComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/StoreableComponent.cs index 946b7eb636..b800fc58fa 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/StoreableComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/StoreableComponent.cs @@ -1,5 +1,5 @@ -using SS14.Shared.GameObjects; -using SS14.Shared.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; namespace Content.Server.GameObjects { diff --git a/Content.Server/GameObjects/Components/Markers/SpawnPointComponent.cs b/Content.Server/GameObjects/Components/Markers/SpawnPointComponent.cs index cb3397f262..318931dbd8 100644 --- a/Content.Server/GameObjects/Components/Markers/SpawnPointComponent.cs +++ b/Content.Server/GameObjects/Components/Markers/SpawnPointComponent.cs @@ -1,8 +1,8 @@ using System; using Content.Shared.GameObjects.Components.Markers; -using SS14.Shared.GameObjects; -using SS14.Shared.Serialization; -using SS14.Shared.ViewVariables; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Markers { diff --git a/Content.Server/GameObjects/Components/Materials/MaterialComponent.cs b/Content.Server/GameObjects/Components/Materials/MaterialComponent.cs index 273bb47fe5..f1a3ae2edc 100644 --- a/Content.Server/GameObjects/Components/Materials/MaterialComponent.cs +++ b/Content.Server/GameObjects/Components/Materials/MaterialComponent.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; using Content.Server.Materials; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.Reflection; -using SS14.Shared.Interfaces.Serialization; -using SS14.Shared.IoC; -using SS14.Shared.Prototypes; -using SS14.Shared.Serialization; -using SS14.Shared.Utility; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.Reflection; +using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.IoC; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; namespace Content.Server.GameObjects.Components.Materials { diff --git a/Content.Server/GameObjects/Components/Mobs/CameraRecoilComponent.cs b/Content.Server/GameObjects/Components/Mobs/CameraRecoilComponent.cs index 356f71cee5..ce2c3e76ed 100644 --- a/Content.Server/GameObjects/Components/Mobs/CameraRecoilComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/CameraRecoilComponent.cs @@ -1,5 +1,5 @@ using Content.Shared.GameObjects.Components.Mobs; -using SS14.Shared.Maths; +using Robust.Shared.Maths; namespace Content.Server.GameObjects.Components.Mobs { diff --git a/Content.Server/GameObjects/Components/Mobs/DamageStates.cs b/Content.Server/GameObjects/Components/Mobs/DamageStates.cs index e38fdf1e98..7cbd757679 100644 --- a/Content.Server/GameObjects/Components/Mobs/DamageStates.cs +++ b/Content.Server/GameObjects/Components/Mobs/DamageStates.cs @@ -1,7 +1,7 @@ using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Mobs; -using SS14.Server.GameObjects; -using SS14.Shared.Interfaces.GameObjects; +using Robust.Server.GameObjects; +using Robust.Shared.Interfaces.GameObjects; namespace Content.Server.GameObjects { diff --git a/Content.Server/GameObjects/Components/Mobs/HeatResistanceComponent.cs b/Content.Server/GameObjects/Components/Mobs/HeatResistanceComponent.cs index 4d5bec36aa..193d215d9a 100644 --- a/Content.Server/GameObjects/Components/Mobs/HeatResistanceComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/HeatResistanceComponent.cs @@ -1,5 +1,5 @@ using System; -using SS14.Shared.GameObjects; +using Robust.Shared.GameObjects; using Content.Shared.GameObjects.Components.Inventory; namespace Content.Server.GameObjects diff --git a/Content.Server/GameObjects/Components/Mobs/MindComponent.cs b/Content.Server/GameObjects/Components/Mobs/MindComponent.cs index 50e6cf7f12..061d2d5315 100644 --- a/Content.Server/GameObjects/Components/Mobs/MindComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/MindComponent.cs @@ -4,12 +4,12 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Content.Server.Mobs; -using SS14.Server.GameObjects; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.Log; -using SS14.Shared.ViewVariables; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.Log; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Mobs { diff --git a/Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs b/Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs index 223210dac5..74a540fdf5 100644 --- a/Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs @@ -3,12 +3,12 @@ using System.Collections.Generic; using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; using Content.Shared.GameObjects.Components.Mobs; -using SS14.Server.GameObjects; -using SS14.Shared.ContentPack; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.Serialization; +using Robust.Server.GameObjects; +using Robust.Shared.ContentPack; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.Serialization; namespace Content.Server.GameObjects { diff --git a/Content.Server/GameObjects/Components/Movement/AiControllerComponent.cs b/Content.Server/GameObjects/Components/Movement/AiControllerComponent.cs index 10906d3f48..1c0647e244 100644 --- a/Content.Server/GameObjects/Components/Movement/AiControllerComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/AiControllerComponent.cs @@ -1,7 +1,7 @@ using Content.Server.Interfaces.GameObjects.Components.Movement; -using SS14.Server.AI; -using SS14.Shared.GameObjects; -using SS14.Shared.Serialization; +using Robust.Server.AI; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Movement { diff --git a/Content.Server/GameObjects/Components/Movement/PlayerInputMoverComponent.cs b/Content.Server/GameObjects/Components/Movement/PlayerInputMoverComponent.cs index 9d89028ef8..645463a437 100644 --- a/Content.Server/GameObjects/Components/Movement/PlayerInputMoverComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/PlayerInputMoverComponent.cs @@ -1,11 +1,11 @@ using Content.Server.Interfaces.GameObjects.Components.Movement; -using SS14.Server.GameObjects; -using SS14.Shared.GameObjects; -using SS14.Shared.Log; -using SS14.Shared.Map; -using SS14.Shared.Maths; -using SS14.Shared.Serialization; -using SS14.Shared.ViewVariables; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; +using Robust.Shared.Log; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Movement { diff --git a/Content.Server/GameObjects/Components/Power/ApcComponent.cs b/Content.Server/GameObjects/Components/Power/ApcComponent.cs index b63cd37330..51a5130131 100644 --- a/Content.Server/GameObjects/Components/Power/ApcComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcComponent.cs @@ -1,14 +1,14 @@ using Content.Server.GameObjects.Components.Sound; using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Power; -using SS14.Server.GameObjects; -using SS14.Server.GameObjects.Components.UserInterface; -using SS14.Server.GameObjects.EntitySystems; -using SS14.Server.Interfaces.GameObjects; -using SS14.Shared.Audio; -using SS14.Shared.GameObjects.Components.UserInterface; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.IoC; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.Components.UserInterface; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.Audio; +using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; namespace Content.Server.GameObjects.Components.Power { diff --git a/Content.Server/GameObjects/Components/Power/LightBulbComponent.cs b/Content.Server/GameObjects/Components/Power/LightBulbComponent.cs index b9aae3a803..11cdb8cb42 100644 --- a/Content.Server/GameObjects/Components/Power/LightBulbComponent.cs +++ b/Content.Server/GameObjects/Components/Power/LightBulbComponent.cs @@ -1,9 +1,9 @@ using System; -using SS14.Shared.GameObjects; -using SS14.Shared.Maths; -using SS14.Shared.Serialization; -using SS14.Shared.ViewVariables; -using SpriteComponent = SS14.Server.GameObjects.SpriteComponent; +using Robust.Shared.GameObjects; +using Robust.Shared.Maths; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; +using SpriteComponent = Robust.Server.GameObjects.SpriteComponent; namespace Content.Server.GameObjects.Components.Power { diff --git a/Content.Server/GameObjects/Components/Power/PowerCellComponent.cs b/Content.Server/GameObjects/Components/Power/PowerCellComponent.cs index 6e11da5d5d..5c25236961 100644 --- a/Content.Server/GameObjects/Components/Power/PowerCellComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerCellComponent.cs @@ -1,5 +1,5 @@ using Content.Shared.GameObjects.Components.Power; -using SS14.Server.GameObjects; +using Robust.Server.GameObjects; namespace Content.Server.GameObjects.Components.Power { diff --git a/Content.Server/GameObjects/Components/Power/PowerDebugTool.cs b/Content.Server/GameObjects/Components/Power/PowerDebugTool.cs index 0fff0c1e4f..ef06753a2a 100644 --- a/Content.Server/GameObjects/Components/Power/PowerDebugTool.cs +++ b/Content.Server/GameObjects/Components/Power/PowerDebugTool.cs @@ -2,10 +2,10 @@ using System.Text; using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Power; -using SS14.Server.Interfaces.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.GameObjects.Components; -using SS14.Shared.Map; +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.Map; namespace Content.Server.GameObjects.Components.Power { diff --git a/Content.Server/GameObjects/Components/Power/PowerDevice.cs b/Content.Server/GameObjects/Components/Power/PowerDevice.cs index 74c61c557a..53a28dea75 100644 --- a/Content.Server/GameObjects/Components/Power/PowerDevice.cs +++ b/Content.Server/GameObjects/Components/Power/PowerDevice.cs @@ -1,15 +1,15 @@ using Content.Server.GameObjects.EntitySystems; -using SS14.Server.GameObjects; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.GameObjects.Components; -using SS14.Shared.IoC; -using SS14.Shared.Serialization; -using SS14.Shared.Utility; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.IoC; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; using System; using System.Collections.Generic; using System.Linq; -using SS14.Shared.ViewVariables; +using Robust.Shared.ViewVariables; using YamlDotNet.RepresentationModel; namespace Content.Server.GameObjects.Components.Power diff --git a/Content.Server/GameObjects/Components/Power/PowerGeneratorComponent.cs b/Content.Server/GameObjects/Components/Power/PowerGeneratorComponent.cs index 425677f648..c469974411 100644 --- a/Content.Server/GameObjects/Components/Power/PowerGeneratorComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerGeneratorComponent.cs @@ -1,11 +1,11 @@ -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.IoC; -using SS14.Shared.Log; -using SS14.Shared.Serialization; -using SS14.Shared.Utility; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Log; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; using System; -using SS14.Shared.ViewVariables; +using Robust.Shared.ViewVariables; using YamlDotNet.RepresentationModel; namespace Content.Server.GameObjects.Components.Power diff --git a/Content.Server/GameObjects/Components/Power/PowerNodeComponent.cs b/Content.Server/GameObjects/Components/Power/PowerNodeComponent.cs index 3daf442272..7a4bbb39e9 100644 --- a/Content.Server/GameObjects/Components/Power/PowerNodeComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerNodeComponent.cs @@ -1,11 +1,11 @@ -using SS14.Server.GameObjects; -using SS14.Server.Interfaces.GameObjects; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects.Components; -using SS14.Shared.IoC; +using Robust.Server.GameObjects; +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.IoC; using System; using System.Linq; -using SS14.Shared.ViewVariables; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Power { diff --git a/Content.Server/GameObjects/Components/Power/PowerProviderComponent.cs b/Content.Server/GameObjects/Components/Power/PowerProviderComponent.cs index 758939e765..78ff050583 100644 --- a/Content.Server/GameObjects/Components/Power/PowerProviderComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerProviderComponent.cs @@ -1,15 +1,15 @@ -using SS14.Server.GameObjects; -using SS14.Server.Interfaces.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.GameObjects.Components; -using SS14.Shared.IoC; -using SS14.Shared.Log; -using SS14.Shared.Serialization; -using SS14.Shared.Utility; +using Robust.Server.GameObjects; +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.IoC; +using Robust.Shared.Log; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; using System; using System.Collections.Generic; using System.Linq; -using SS14.Shared.ViewVariables; +using Robust.Shared.ViewVariables; using YamlDotNet.RepresentationModel; namespace Content.Server.GameObjects.Components.Power diff --git a/Content.Server/GameObjects/Components/Power/PowerStorageComponent.cs b/Content.Server/GameObjects/Components/Power/PowerStorageComponent.cs index 02f42f3019..e403f638fd 100644 --- a/Content.Server/GameObjects/Components/Power/PowerStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerStorageComponent.cs @@ -1,11 +1,11 @@ using Content.Shared.GameObjects.Components.Power; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.IoC; -using SS14.Shared.Serialization; -using SS14.Shared.Utility; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; using System; -using SS14.Shared.ViewVariables; +using Robust.Shared.ViewVariables; using YamlDotNet.RepresentationModel; namespace Content.Server.GameObjects.Components.Power diff --git a/Content.Server/GameObjects/Components/Power/PowerStorageNetComponent.cs b/Content.Server/GameObjects/Components/Power/PowerStorageNetComponent.cs index bb28c110db..6b8ad3cd97 100644 --- a/Content.Server/GameObjects/Components/Power/PowerStorageNetComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerStorageNetComponent.cs @@ -1,5 +1,5 @@ -using SS14.Shared.Serialization; -using SS14.Shared.ViewVariables; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Power { diff --git a/Content.Server/GameObjects/Components/Power/PowerTransferComponent.cs b/Content.Server/GameObjects/Components/Power/PowerTransferComponent.cs index f214f519a1..cd0588c5b9 100644 --- a/Content.Server/GameObjects/Components/Power/PowerTransferComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerTransferComponent.cs @@ -1,13 +1,13 @@ using Content.Server.GameObjects.EntitySystems; -using SS14.Server.GameObjects; -using SS14.Server.Interfaces.GameObjects; -using SS14.Shared.GameObjects; -using SS14.Shared.IoC; +using Robust.Server.GameObjects; +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using System.Linq; -using SS14.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects; using Content.Server.GameObjects.Components.Interactable.Tools; -using SS14.Shared.Interfaces.GameObjects.Components; -using SS14.Shared.ViewVariables; +using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.ViewVariables; using System; namespace Content.Server.GameObjects.Components.Power diff --git a/Content.Server/GameObjects/Components/Power/PoweredLightComponent.cs b/Content.Server/GameObjects/Components/Power/PoweredLightComponent.cs index 10db5dbd24..c78e7067ad 100644 --- a/Content.Server/GameObjects/Components/Power/PoweredLightComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PoweredLightComponent.cs @@ -2,16 +2,16 @@ using Content.Server.GameObjects.Components.Sound; using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects; -using SS14.Server.GameObjects; -using SS14.Server.GameObjects.Components.Container; -using SS14.Shared.Audio; -using SS14.Shared.Enums; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Timing; -using SS14.Shared.IoC; -using SS14.Shared.Serialization; -using SS14.Shared.ViewVariables; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.Components.Container; +using Robust.Shared.Audio; +using Robust.Shared.Enums; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Timing; +using Robust.Shared.IoC; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Power { diff --git a/Content.Server/GameObjects/Components/Power/Powernet.cs b/Content.Server/GameObjects/Components/Power/Powernet.cs index d30a266418..3ee7f3f418 100644 --- a/Content.Server/GameObjects/Components/Power/Powernet.cs +++ b/Content.Server/GameObjects/Components/Power/Powernet.cs @@ -1,10 +1,10 @@ using Content.Shared.GameObjects.EntitySystems; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.IoC; -using SS14.Shared.Log; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Log; using System; using System.Collections.Generic; -using SS14.Shared.ViewVariables; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Power { diff --git a/Content.Server/GameObjects/Components/Power/SmesComponent.cs b/Content.Server/GameObjects/Components/Power/SmesComponent.cs index 490c2dad70..9576980b79 100644 --- a/Content.Server/GameObjects/Components/Power/SmesComponent.cs +++ b/Content.Server/GameObjects/Components/Power/SmesComponent.cs @@ -1,8 +1,8 @@ using System; using Content.Shared.GameObjects.Components.Power; using Content.Shared.Utility; -using SS14.Server.GameObjects; -using SS14.Shared.GameObjects; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.Components.Power { diff --git a/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs b/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs index a1d752b018..0b1b6730b4 100644 --- a/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs +++ b/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs @@ -1,11 +1,11 @@ -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Physics; -using SS14.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Physics; +using Robust.Shared.Interfaces.GameObjects.Components; using System; using System.Collections.Generic; using YamlDotNet.RepresentationModel; -using SS14.Shared.Utility; +using Robust.Shared.Utility; using Content.Shared.GameObjects; namespace Content.Server.GameObjects.Components.Projectiles diff --git a/Content.Server/GameObjects/Components/Projectiles/ThrownItemComponent.cs b/Content.Server/GameObjects/Components/Projectiles/ThrownItemComponent.cs index 54d01e30c3..6eac36d453 100644 --- a/Content.Server/GameObjects/Components/Projectiles/ThrownItemComponent.cs +++ b/Content.Server/GameObjects/Components/Projectiles/ThrownItemComponent.cs @@ -2,8 +2,8 @@ using Content.Server.GameObjects.Components.Projectiles; using Content.Shared.GameObjects; using Content.Shared.Physics; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects.Components; namespace Content.Server.GameObjects.Components { diff --git a/Content.Server/GameObjects/Components/Sound/SoundComponent.cs b/Content.Server/GameObjects/Components/Sound/SoundComponent.cs index 5045dbe48d..9a136031ea 100644 --- a/Content.Server/GameObjects/Components/Sound/SoundComponent.cs +++ b/Content.Server/GameObjects/Components/Sound/SoundComponent.cs @@ -1,13 +1,13 @@ using System.Collections.Generic; using Content.Shared.GameObjects.Components.Sound; -using SS14.Server.GameObjects.EntitySystems; -using SS14.Shared.Audio; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.Log; -using SS14.Shared.Map; -using SS14.Shared.Serialization; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Shared.Audio; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.Log; +using Robust.Shared.Map; +using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Sound { diff --git a/Content.Server/GameObjects/Components/Stack/StackComponent.cs b/Content.Server/GameObjects/Components/Stack/StackComponent.cs index d0d8dae690..c3cdc59077 100644 --- a/Content.Server/GameObjects/Components/Stack/StackComponent.cs +++ b/Content.Server/GameObjects/Components/Stack/StackComponent.cs @@ -1,11 +1,11 @@ using System; using Content.Server.GameObjects.EntitySystems; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.Reflection; -using SS14.Shared.IoC; -using SS14.Shared.Serialization; -using SS14.Shared.Utility; -using SS14.Shared.ViewVariables; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.Reflection; +using Robust.Shared.IoC; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Stack { diff --git a/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs b/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs index 9c6f88f9f6..811b102a65 100644 --- a/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs +++ b/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs @@ -1,12 +1,12 @@ using Content.Server.Interfaces.GameObjects; using Content.Shared.Maths; using System; -using SS14.Shared.GameObjects; -using SS14.Shared.Utility; +using Robust.Shared.GameObjects; +using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; using Content.Shared.GameObjects; -using SS14.Shared.Serialization; -using SS14.Shared.ViewVariables; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects { diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs index 961f2ff730..a36dff18c1 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs @@ -1,16 +1,16 @@ using System; -using SS14.Shared.GameObjects; +using Robust.Shared.GameObjects; using Content.Server.GameObjects.EntitySystems; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Map; -using SS14.Shared.IoC; -using SS14.Server.GameObjects; -using SS14.Shared.Maths; -using SS14.Server.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Timing; -using SS14.Shared.GameObjects.EntitySystemMessages; -using SS14.Shared.Serialization; -using SS14.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Map; +using Robust.Shared.IoC; +using Robust.Server.GameObjects; +using Robust.Shared.Maths; +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Timing; +using Robust.Shared.GameObjects.EntitySystemMessages; +using Robust.Shared.Serialization; +using Robust.Shared.Interfaces.GameObjects.Components; using Content.Shared.GameObjects; namespace Content.Server.GameObjects.Components.Weapon.Melee diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponCapacitorComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponCapacitorComponent.cs index be7ed87dbc..f5ddd546e9 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponCapacitorComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponCapacitorComponent.cs @@ -1,6 +1,6 @@ using System; using Content.Server.GameObjects.Components.Power; -using SS14.Shared.Serialization; +using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan { diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs index 5919109924..f539a37955 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs @@ -1,18 +1,18 @@ using Content.Shared.GameObjects; -using SS14.Server.GameObjects.EntitySystems; -using SS14.Shared.Audio; -using SS14.Shared.GameObjects.EntitySystemMessages; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Physics; -using SS14.Shared.Interfaces.Timing; -using SS14.Shared.IoC; -using SS14.Shared.Map; -using SS14.Shared.Maths; -using SS14.Shared.Physics; -using SS14.Shared.Serialization; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Shared.Audio; +using Robust.Shared.GameObjects.EntitySystemMessages; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Physics; +using Robust.Shared.Interfaces.Timing; +using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Physics; +using Robust.Shared.Serialization; using System; using Content.Server.GameObjects.Components.Sound; -using SS14.Shared.GameObjects; +using Robust.Shared.GameObjects; using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.Components.Power; using Content.Shared.Interfaces; @@ -84,7 +84,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan var userPosition = user.Transform.WorldPosition; //Remember world positions are ephemeral and can only be used instantaneously var angle = new Angle(clickLocation.Position - userPosition); - var ray = new Ray(userPosition, angle.ToVec()); + var ray = new Ray(userPosition, angle.ToVec(), 0); //TODO set the CollsionMask for this ray. var rayCastResults = IoCManager.Resolve().IntersectRay(ray, MaxLength, Owner.Transform.GetMapTransform().Owner); diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticBulletComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticBulletComponent.cs index fd686b84d0..adbacdd85a 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticBulletComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticBulletComponent.cs @@ -1,5 +1,5 @@ -using SS14.Shared.GameObjects; -using SS14.Shared.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile { diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs index e690a83bb5..4d7e4c07a9 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using Content.Shared.GameObjects.Components.Weapons.Ranged; -using SS14.Server.GameObjects; -using SS14.Server.GameObjects.Components.Container; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Serialization; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.Components.Container; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile { diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs index b121bd1e8f..14b82815a2 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs @@ -4,13 +4,13 @@ using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Weapons.Ranged; using Content.Shared.Interfaces; -using SS14.Server.GameObjects; -using SS14.Server.GameObjects.Components.Container; -using SS14.Shared.Audio; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Maths; -using SS14.Shared.Serialization; -using SS14.Shared.Utility; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.Components.Container; +using Robust.Shared.Audio; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Maths; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile { diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeaponComponent.cs index 8b12bbf433..9fd97d63b1 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeaponComponent.cs @@ -2,11 +2,11 @@ using System; using Content.Server.GameObjects.Components.Interactable; using Content.Server.GameObjects.Components.Sound; using Content.Shared.GameObjects; -using SS14.Server.GameObjects.Components.Container; -using SS14.Server.GameObjects.EntitySystems; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.IoC; -using SS14.Shared.Serialization; +using Robust.Server.GameObjects.Components.Container; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile { diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs index 0e1de9a103..9d86c27a94 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs @@ -2,18 +2,18 @@ using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Projectiles; using Content.Server.GameObjects.Components.Sound; -using SS14.Server.GameObjects; -using SS14.Server.GameObjects.EntitySystems; -using SS14.Server.Interfaces.GameObjects; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.GameObjects.Components; -using SS14.Shared.IoC; -using SS14.Shared.Log; -using SS14.Shared.Map; -using SS14.Shared.Maths; -using SS14.Shared.Serialization; -using SS14.Shared.ViewVariables; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.IoC; +using Robust.Shared.Log; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile { diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs index 13ee023499..0c82bd11cc 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs @@ -1,15 +1,15 @@ using System; -using SS14.Shared.GameObjects; +using Robust.Shared.GameObjects; using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Weapons.Ranged; -using SS14.Server.Interfaces.Player; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.Interfaces.Timing; -using SS14.Shared.IoC; -using SS14.Shared.Log; -using SS14.Shared.Map; -using SS14.Shared.Timers; +using Robust.Server.Interfaces.Player; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.Interfaces.Timing; +using Robust.Shared.IoC; +using Robust.Shared.Log; +using Robust.Shared.Map; +using Robust.Shared.Timers; namespace Content.Server.GameObjects.Components.Weapon.Ranged { diff --git a/Content.Server/GameObjects/ContainerSlot.cs b/Content.Server/GameObjects/ContainerSlot.cs index 0d939a58dc..d8104c1f78 100644 --- a/Content.Server/GameObjects/ContainerSlot.cs +++ b/Content.Server/GameObjects/ContainerSlot.cs @@ -1,8 +1,8 @@ -using SS14.Server.GameObjects.Components.Container; -using SS14.Server.Interfaces.GameObjects; -using SS14.Shared.Interfaces.GameObjects; +using Robust.Server.GameObjects.Components.Container; +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects; using System.Collections.Generic; -using SS14.Shared.ViewVariables; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects { diff --git a/Content.Server/GameObjects/EntitySystems/ActionBlockerSystem.cs b/Content.Server/GameObjects/EntitySystems/ActionBlockerSystem.cs index 087bc864ca..50585f3a0d 100644 --- a/Content.Server/GameObjects/EntitySystems/ActionBlockerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ActionBlockerSystem.cs @@ -1,5 +1,5 @@ -using SS14.Shared.GameObjects.Systems; -using SS14.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Interfaces.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/AiSystem.cs b/Content.Server/GameObjects/EntitySystems/AiSystem.cs index ff9f6ae310..40db41a3d1 100644 --- a/Content.Server/GameObjects/EntitySystems/AiSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AiSystem.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; using Content.Server.GameObjects.Components.Movement; -using SS14.Server.AI; -using SS14.Server.Interfaces.Timing; -using SS14.Shared.GameObjects; -using SS14.Shared.GameObjects.Systems; -using SS14.Shared.Interfaces.Reflection; -using SS14.Shared.IoC; +using Robust.Server.AI; +using Robust.Server.Interfaces.Timing; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Interfaces.Reflection; +using Robust.Shared.IoC; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/Click/ExamineSystem.cs b/Content.Server/GameObjects/EntitySystems/Click/ExamineSystem.cs index c8a9a9de9b..0c655a0351 100644 --- a/Content.Server/GameObjects/EntitySystems/Click/ExamineSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Click/ExamineSystem.cs @@ -2,20 +2,20 @@ using System.Text; using Content.Shared.GameObjects.EntitySystemMessages; using Content.Shared.Input; -using SS14.Server.GameObjects.EntitySystems; -using SS14.Server.Interfaces.Player; -using SS14.Shared.GameObjects; -using SS14.Shared.GameObjects.Systems; -using SS14.Shared.Input; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.GameObjects.Components; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.IoC; -using SS14.Shared.Log; -using SS14.Shared.Map; -using SS14.Shared.Maths; -using SS14.Shared.Players; -using SS14.Shared.Utility; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.Interfaces.Player; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Input; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.IoC; +using Robust.Shared.Log; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Players; +using Robust.Shared.Utility; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs index 982a56df0b..07cfc857bc 100644 --- a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs @@ -1,18 +1,18 @@ using System; using Content.Server.Interfaces.GameObjects; -using SS14.Shared.GameObjects; -using SS14.Shared.GameObjects.Systems; -using SS14.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Interfaces.GameObjects; using System.Collections.Generic; using System.Linq; using Content.Shared.Input; -using SS14.Shared.Input; -using SS14.Shared.Log; -using SS14.Shared.Map; -using SS14.Server.GameObjects.EntitySystems; -using SS14.Server.Interfaces.Player; -using SS14.Shared.Interfaces.GameObjects.Components; -using SS14.Shared.Players; +using Robust.Shared.Input; +using Robust.Shared.Log; +using Robust.Shared.Map; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.Interfaces.Player; +using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.Players; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/DoorSystem.cs b/Content.Server/GameObjects/EntitySystems/DoorSystem.cs index 437529ac1b..4455f8b3a7 100644 --- a/Content.Server/GameObjects/EntitySystems/DoorSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/DoorSystem.cs @@ -1,5 +1,5 @@ -using SS14.Shared.GameObjects; -using SS14.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/HandHeldLightSystem.cs b/Content.Server/GameObjects/EntitySystems/HandHeldLightSystem.cs index df96775a79..a6df7eaae8 100644 --- a/Content.Server/GameObjects/EntitySystems/HandHeldLightSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/HandHeldLightSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Interactable; -using SS14.Shared.GameObjects; -using SS14.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/HandsSystem.cs b/Content.Server/GameObjects/EntitySystems/HandsSystem.cs index aed2d6decb..b45d014211 100644 --- a/Content.Server/GameObjects/EntitySystems/HandsSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/HandsSystem.cs @@ -4,19 +4,19 @@ using Content.Server.GameObjects.Components.Stack; using Content.Server.Interfaces.GameObjects; using Content.Shared.Input; using Content.Shared.Physics; -using SS14.Server.GameObjects; -using SS14.Server.GameObjects.EntitySystems; -using SS14.Server.Interfaces.Player; -using SS14.Shared.GameObjects; -using SS14.Shared.GameObjects.EntitySystemMessages; -using SS14.Shared.GameObjects.Systems; -using SS14.Shared.Input; -using SS14.Shared.Interfaces.GameObjects.Components; -using SS14.Shared.Interfaces.Timing; -using SS14.Shared.IoC; -using SS14.Shared.Map; -using SS14.Shared.Maths; -using SS14.Shared.Players; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.Interfaces.Player; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.EntitySystemMessages; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Input; +using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.Interfaces.Timing; +using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Players; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/MoverSystem.cs b/Content.Server/GameObjects/EntitySystems/MoverSystem.cs index 60e5558fe7..37d36a582a 100644 --- a/Content.Server/GameObjects/EntitySystems/MoverSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/MoverSystem.cs @@ -5,21 +5,21 @@ using Content.Server.Interfaces.GameObjects.Components.Movement; using Content.Shared.Audio; using Content.Shared.Maps; using JetBrains.Annotations; -using SS14.Server.GameObjects; -using SS14.Server.GameObjects.EntitySystems; -using SS14.Server.Interfaces.Player; -using SS14.Server.Interfaces.Timing; -using SS14.Shared.Audio; -using SS14.Shared.GameObjects; -using SS14.Shared.GameObjects.Components.Transform; -using SS14.Shared.GameObjects.Systems; -using SS14.Shared.Input; -using SS14.Shared.Interfaces.GameObjects.Components; -using SS14.Shared.IoC; -using SS14.Shared.Map; -using SS14.Shared.Maths; -using SS14.Shared.Players; -using SS14.Shared.Prototypes; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.Interfaces.Player; +using Robust.Server.Interfaces.Timing; +using Robust.Shared.Audio; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Components.Transform; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Input; +using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Players; +using Robust.Shared.Prototypes; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/PowerApcSystem.cs b/Content.Server/GameObjects/EntitySystems/PowerApcSystem.cs index e9dd97a04b..898f16e035 100644 --- a/Content.Server/GameObjects/EntitySystems/PowerApcSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/PowerApcSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Power; -using SS14.Shared.GameObjects; -using SS14.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/PowerSmesSystem.cs b/Content.Server/GameObjects/EntitySystems/PowerSmesSystem.cs index 220dd41c9e..c7ddd45fee 100644 --- a/Content.Server/GameObjects/EntitySystems/PowerSmesSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/PowerSmesSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Power; -using SS14.Shared.GameObjects; -using SS14.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/PowerSystem.cs b/Content.Server/GameObjects/EntitySystems/PowerSystem.cs index 824b406e7b..f165fa865d 100644 --- a/Content.Server/GameObjects/EntitySystems/PowerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/PowerSystem.cs @@ -1,9 +1,9 @@ using Content.Server.GameObjects.Components.Power; -using SS14.Shared.GameObjects.Systems; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.IoC; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; using System.Collections.Generic; -using SS14.Shared.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/StorageSystem.cs b/Content.Server/GameObjects/EntitySystems/StorageSystem.cs index 04e23c6101..8db8cb6bd3 100644 --- a/Content.Server/GameObjects/EntitySystems/StorageSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/StorageSystem.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using SS14.Server.Interfaces.Player; -using SS14.Shared.GameObjects; -using SS14.Shared.GameObjects.EntitySystemMessages; -using SS14.Shared.GameObjects.Systems; -using SS14.Shared.Interfaces.GameObjects; +using Robust.Server.Interfaces.Player; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.EntitySystemMessages; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Interfaces.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/TemperatureSystem.cs b/Content.Server/GameObjects/EntitySystems/TemperatureSystem.cs index 8aa2fb185d..76ddd151e3 100644 --- a/Content.Server/GameObjects/EntitySystems/TemperatureSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/TemperatureSystem.cs @@ -1,5 +1,5 @@ -using SS14.Shared.GameObjects; -using SS14.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/VerbSystem.cs b/Content.Server/GameObjects/EntitySystems/VerbSystem.cs index c7733ecd6e..a1b81b6bbb 100644 --- a/Content.Server/GameObjects/EntitySystems/VerbSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/VerbSystem.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; using Content.Shared.GameObjects; using Content.Shared.GameObjects.EntitySystemMessages; -using SS14.Server.Interfaces.Player; -using SS14.Shared.GameObjects; -using SS14.Shared.GameObjects.Systems; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.IoC; +using Robust.Server.Interfaces.Player; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.IoC; using static Content.Shared.GameObjects.EntitySystemMessages.VerbSystemMessages; namespace Content.Server.GameObjects.EntitySystems diff --git a/Content.Server/GameObjects/EntitySystems/WelderSystem.cs b/Content.Server/GameObjects/EntitySystems/WelderSystem.cs index bf3a99c7a5..fa1c54c7fa 100644 --- a/Content.Server/GameObjects/EntitySystems/WelderSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/WelderSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Interactable.Tools; -using SS14.Shared.GameObjects; -using SS14.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameTicking/GamePresets/PresetTraitor.cs b/Content.Server/GameTicking/GamePresets/PresetTraitor.cs index c78fa8f4b3..787cf8a146 100644 --- a/Content.Server/GameTicking/GamePresets/PresetTraitor.cs +++ b/Content.Server/GameTicking/GamePresets/PresetTraitor.cs @@ -1,4 +1,4 @@ -using SS14.Shared.Log; +using Robust.Shared.Log; namespace Content.Server.GameTicking.GamePresets { diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs index 668bf72e0b..f9691c16c7 100644 --- a/Content.Server/GameTicking/GameTicker.cs +++ b/Content.Server/GameTicking/GameTicker.cs @@ -10,28 +10,28 @@ using Content.Server.Mobs; using Content.Server.Players; using Content.Shared; using Content.Shared.GameObjects.Components.Inventory; -using SS14.Server.Interfaces.Console; -using SS14.Server.Interfaces.Maps; -using SS14.Server.Interfaces.Player; -using SS14.Server.Player; -using SS14.Shared.Configuration; -using SS14.Shared.Console; -using SS14.Shared.Enums; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.Configuration; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Map; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.Interfaces.Timing; -using SS14.Shared.IoC; -using SS14.Shared.Log; -using SS14.Shared.Map; -using SS14.Shared.Maths; -using SS14.Shared.Network; -using SS14.Shared.Timers; -using SS14.Shared.Timing; -using SS14.Shared.Utility; -using SS14.Shared.ViewVariables; +using Robust.Server.Interfaces.Console; +using Robust.Server.Interfaces.Maps; +using Robust.Server.Interfaces.Player; +using Robust.Server.Player; +using Robust.Shared.Configuration; +using Robust.Shared.Console; +using Robust.Shared.Enums; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.Configuration; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Map; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.Interfaces.Timing; +using Robust.Shared.IoC; +using Robust.Shared.Log; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Network; +using Robust.Shared.Timers; +using Robust.Shared.Timing; +using Robust.Shared.Utility; +using Robust.Shared.ViewVariables; namespace Content.Server.GameTicking { diff --git a/Content.Server/Interfaces/Chat/IChatCommand.cs b/Content.Server/Interfaces/Chat/IChatCommand.cs index 6119774abd..09fff49d85 100644 --- a/Content.Server/Interfaces/Chat/IChatCommand.cs +++ b/Content.Server/Interfaces/Chat/IChatCommand.cs @@ -1,5 +1,5 @@ -using SS14.Shared.Console; -using SS14.Shared.Interfaces.Network; +using Robust.Shared.Console; +using Robust.Shared.Interfaces.Network; namespace Content.Server.Interfaces.Chat { diff --git a/Content.Server/Interfaces/Chat/IChatManager.cs b/Content.Server/Interfaces/Chat/IChatManager.cs index 4302454320..7d263ed741 100644 --- a/Content.Server/Interfaces/Chat/IChatManager.cs +++ b/Content.Server/Interfaces/Chat/IChatManager.cs @@ -1,5 +1,5 @@ -using SS14.Server.Interfaces.Player; -using SS14.Shared.Interfaces.GameObjects; +using Robust.Server.Interfaces.Player; +using Robust.Shared.Interfaces.GameObjects; namespace Content.Server.Interfaces.Chat { diff --git a/Content.Server/Interfaces/GameObjects/Components/Damage/IDamageableComponent.cs b/Content.Server/Interfaces/GameObjects/Components/Damage/IDamageableComponent.cs index 14f929f291..193ff683ba 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Damage/IDamageableComponent.cs +++ b/Content.Server/Interfaces/GameObjects/Components/Damage/IDamageableComponent.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects; using Content.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects; using System; namespace Content.Server.Interfaces.GameObjects diff --git a/Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs b/Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs index be0c16a30a..66a2b6d81d 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs +++ b/Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs @@ -1,9 +1,9 @@ using System; using Content.Server.GameObjects; -using SS14.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects; using System.Collections.Generic; -using SS14.Server.GameObjects.Components.Container; -using SS14.Shared.Map; +using Robust.Server.GameObjects.Components.Container; +using Robust.Shared.Map; namespace Content.Server.Interfaces.GameObjects { diff --git a/Content.Server/Interfaces/GameObjects/Components/Movement/IMoverComponent.cs b/Content.Server/Interfaces/GameObjects/Components/Movement/IMoverComponent.cs index ba0776d581..f804144fcb 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Movement/IMoverComponent.cs +++ b/Content.Server/Interfaces/GameObjects/Components/Movement/IMoverComponent.cs @@ -1,4 +1,4 @@ -using SS14.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects; namespace Content.Server.Interfaces.GameObjects.Components.Movement { diff --git a/Content.Server/Interfaces/GameObjects/Components/Temperature/ITemperatureComponent.cs b/Content.Server/Interfaces/GameObjects/Components/Temperature/ITemperatureComponent.cs index 64a7692801..51bc8749cd 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Temperature/ITemperatureComponent.cs +++ b/Content.Server/Interfaces/GameObjects/Components/Temperature/ITemperatureComponent.cs @@ -1,4 +1,4 @@ -using SS14.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects; namespace Content.Server.Interfaces.GameObjects { diff --git a/Content.Server/Interfaces/GameTicking/IGameTicker.cs b/Content.Server/Interfaces/GameTicking/IGameTicker.cs index 0f6cc96be1..892d5dec0b 100644 --- a/Content.Server/Interfaces/GameTicking/IGameTicker.cs +++ b/Content.Server/Interfaces/GameTicking/IGameTicker.cs @@ -1,9 +1,9 @@ using System; using Content.Server.GameTicking; -using SS14.Server.Interfaces.Player; -using SS14.Server.Player; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Timing; +using Robust.Server.Interfaces.Player; +using Robust.Server.Player; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Timing; namespace Content.Server.Interfaces.GameTicking { diff --git a/Content.Server/Materials/Material.cs b/Content.Server/Materials/Material.cs index 9941cfb007..b7de668ba0 100644 --- a/Content.Server/Materials/Material.cs +++ b/Content.Server/Materials/Material.cs @@ -1,8 +1,8 @@ -using SS14.Shared.Interfaces.Serialization; -using SS14.Shared.Maths; -using SS14.Shared.Prototypes; -using SS14.Shared.Serialization; -using SS14.Shared.Utility; +using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.Maths; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; namespace Content.Server.Materials diff --git a/Content.Server/Mobs/Commands.cs b/Content.Server/Mobs/Commands.cs index 4fabec1d00..8458d89946 100644 --- a/Content.Server/Mobs/Commands.cs +++ b/Content.Server/Mobs/Commands.cs @@ -4,11 +4,11 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Content.Server.Players; -using SS14.Server.Interfaces.Console; -using SS14.Server.Interfaces.Player; -using SS14.Shared.Interfaces.Reflection; -using SS14.Shared.IoC; -using SS14.Shared.Network; +using Robust.Server.Interfaces.Console; +using Robust.Server.Interfaces.Player; +using Robust.Shared.Interfaces.Reflection; +using Robust.Shared.IoC; +using Robust.Shared.Network; namespace Content.Server.Mobs { diff --git a/Content.Server/Mobs/Mind.cs b/Content.Server/Mobs/Mind.cs index c134f13d12..3fa7185ca0 100644 --- a/Content.Server/Mobs/Mind.cs +++ b/Content.Server/Mobs/Mind.cs @@ -2,11 +2,11 @@ using System.Collections.Generic; using Content.Server.GameObjects.Components.Mobs; using Content.Server.Players; -using SS14.Server.Interfaces.Player; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.IoC; -using SS14.Shared.Network; -using SS14.Shared.ViewVariables; +using Robust.Server.Interfaces.Player; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Network; +using Robust.Shared.ViewVariables; namespace Content.Server.Mobs { diff --git a/Content.Server/Mobs/Roles/Traitor.cs b/Content.Server/Mobs/Roles/Traitor.cs index b838ffe9d8..8f89530afd 100644 --- a/Content.Server/Mobs/Roles/Traitor.cs +++ b/Content.Server/Mobs/Roles/Traitor.cs @@ -1,6 +1,6 @@ using Content.Server.Interfaces.Chat; -using SS14.Shared.Console; -using SS14.Shared.IoC; +using Robust.Shared.Console; +using Robust.Shared.IoC; namespace Content.Server.Mobs.Roles { diff --git a/Content.Server/Placement/SpawnHelpers.cs b/Content.Server/Placement/SpawnHelpers.cs index 5c2f3bfdb1..0da9f9a700 100644 --- a/Content.Server/Placement/SpawnHelpers.cs +++ b/Content.Server/Placement/SpawnHelpers.cs @@ -1,9 +1,9 @@ -using SS14.Server.Interfaces.GameObjects; -using SS14.Shared.Interfaces.GameObjects.Components; -using SS14.Shared.Interfaces.Map; -using SS14.Shared.IoC; -using SS14.Shared.Map; -using SS14.Shared.Maths; +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.Interfaces.Map; +using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Maths; namespace Content.Server.Placement { diff --git a/Content.Server/Players/PlayerData.cs b/Content.Server/Players/PlayerData.cs index d11ac8942a..cf052759e8 100644 --- a/Content.Server/Players/PlayerData.cs +++ b/Content.Server/Players/PlayerData.cs @@ -1,8 +1,8 @@ using Content.Server.Mobs; -using SS14.Server.Interfaces.Player; -using SS14.Shared.IoC; -using SS14.Shared.Network; -using SS14.Shared.ViewVariables; +using Robust.Server.Interfaces.Player; +using Robust.Shared.IoC; +using Robust.Shared.Network; +using Robust.Shared.ViewVariables; namespace Content.Server.Players { diff --git a/Content.Server/ServerNotifyManager.cs b/Content.Server/ServerNotifyManager.cs index dce9f87465..66eea0f0fa 100644 --- a/Content.Server/ServerNotifyManager.cs +++ b/Content.Server/ServerNotifyManager.cs @@ -1,15 +1,15 @@ using Content.Server.Interfaces; using Content.Shared; using Content.Shared.Interfaces; -using SS14.Server.Interfaces.Console; -using SS14.Server.Interfaces.GameObjects; -using SS14.Server.Interfaces.Player; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.IoC; -using SS14.Shared.Map; -using SS14.Shared.Utility; +using Robust.Server.Interfaces.Console; +using Robust.Server.Interfaces.GameObjects; +using Robust.Server.Interfaces.Player; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Utility; namespace Content.Server { diff --git a/Content.Server/StatusShell.cs b/Content.Server/StatusShell.cs index a3439d3712..78054c8a25 100644 --- a/Content.Server/StatusShell.cs +++ b/Content.Server/StatusShell.cs @@ -2,10 +2,10 @@ using System; using Content.Server.GameTicking; using Content.Server.Interfaces.GameTicking; using Newtonsoft.Json.Linq; -using SS14.Server.Interfaces; -using SS14.Server.Interfaces.Player; -using SS14.Server.Interfaces.ServerStatus; -using SS14.Shared.IoC; +using Robust.Server.Interfaces; +using Robust.Server.Interfaces.Player; +using Robust.Server.Interfaces.ServerStatus; +using Robust.Shared.IoC; namespace Content.Server { diff --git a/Content.Shared/Audio/SoundCollectionPrototype.cs b/Content.Shared/Audio/SoundCollectionPrototype.cs index 8a787821ce..9a0c79e77c 100644 --- a/Content.Shared/Audio/SoundCollectionPrototype.cs +++ b/Content.Shared/Audio/SoundCollectionPrototype.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -using SS14.Shared.Prototypes; -using SS14.Shared.Utility; +using Robust.Shared.Prototypes; +using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; namespace Content.Shared.Audio diff --git a/Content.Shared/Chat/MsgChatMessage.cs b/Content.Shared/Chat/MsgChatMessage.cs index 884b620cc5..47d88ed1fe 100644 --- a/Content.Shared/Chat/MsgChatMessage.cs +++ b/Content.Shared/Chat/MsgChatMessage.cs @@ -1,9 +1,9 @@ using System; using Lidgren.Network; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.Network; -using SS14.Shared.Network.Messages; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.Network; +using Robust.Shared.Network.Messages; namespace Content.Shared.Chat { diff --git a/Content.Shared/Construction/ConstructionPrototype.cs b/Content.Shared/Construction/ConstructionPrototype.cs index fab0e5ce89..3d22568ee8 100644 --- a/Content.Shared/Construction/ConstructionPrototype.cs +++ b/Content.Shared/Construction/ConstructionPrototype.cs @@ -1,9 +1,9 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; -using SS14.Shared.Prototypes; -using SS14.Shared.Serialization; -using SS14.Shared.Utility; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; namespace Content.Shared.Construction diff --git a/Content.Shared/Content.Shared.csproj b/Content.Shared/Content.Shared.csproj index 91895ba684..7daf2b646e 100644 --- a/Content.Shared/Content.Shared.csproj +++ b/Content.Shared/Content.Shared.csproj @@ -113,13 +113,13 @@ {D63D377C-242B-4FC5-8337-35CB87E6C537} Lidgren.Network - - {7DC961F2-A45B-4193-BE7F-77622A231943} - SS14.Shared.Maths + + {93f23a82-00c5-4572-964e-e7c9457726d4} + Robust.Shared.Maths - - {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1} - SS14.Shared + + {0529f740-0000-0000-0000-000000000000} + Robust.Shared diff --git a/Content.Shared/EntryPoint.cs b/Content.Shared/EntryPoint.cs index 8211f38b6c..71494a3aef 100644 --- a/Content.Shared/EntryPoint.cs +++ b/Content.Shared/EntryPoint.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using Content.Shared.Maps; -using SS14.Shared.ContentPack; -using SS14.Shared.Interfaces.Map; -using SS14.Shared.Interfaces.Resources; -using SS14.Shared.IoC; -using SS14.Shared.Prototypes; +using Robust.Shared.ContentPack; +using Robust.Shared.Interfaces.Map; +using Robust.Shared.Interfaces.Resources; +using Robust.Shared.IoC; +using Robust.Shared.Prototypes; namespace Content.Shared { diff --git a/Content.Shared/GameObjects/Components/Construction/SharedConstructorComponent.cs b/Content.Shared/GameObjects/Components/Construction/SharedConstructorComponent.cs index eaad7e6242..4f609f2829 100644 --- a/Content.Shared/GameObjects/Components/Construction/SharedConstructorComponent.cs +++ b/Content.Shared/GameObjects/Components/Construction/SharedConstructorComponent.cs @@ -1,8 +1,8 @@ using System; -using SS14.Shared.GameObjects; -using SS14.Shared.Map; -using SS14.Shared.Maths; -using SS14.Shared.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Construction { diff --git a/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs b/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs index 41ed371db9..4ed7e192d6 100644 --- a/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs +++ b/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs @@ -1,5 +1,5 @@ -using SS14.Shared.GameObjects; -using SS14.Shared.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; using System; using System.Collections.Generic; diff --git a/Content.Shared/GameObjects/Components/Doors/SharedDoorComponent.cs b/Content.Shared/GameObjects/Components/Doors/SharedDoorComponent.cs index 8e19d0c58c..2a1a57ed3a 100644 --- a/Content.Shared/GameObjects/Components/Doors/SharedDoorComponent.cs +++ b/Content.Shared/GameObjects/Components/Doors/SharedDoorComponent.cs @@ -1,5 +1,5 @@ using System; -using SS14.Shared.Serialization; +using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Doors { diff --git a/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs b/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs index 1e627fa1d5..8aa2a8b4eb 100644 --- a/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs +++ b/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using SS14.Shared.Serialization; +using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Inventory { diff --git a/Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs b/Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs index 40335e9749..ea6e71f99b 100644 --- a/Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs +++ b/Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs @@ -1,5 +1,5 @@ -using SS14.Shared.GameObjects; -using SS14.Shared.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; using System; using System.Collections.Generic; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; diff --git a/Content.Shared/GameObjects/Components/Items/ClothingComponentState.cs b/Content.Shared/GameObjects/Components/Items/ClothingComponentState.cs index 39ef0c7f09..72dcad4466 100644 --- a/Content.Shared/GameObjects/Components/Items/ClothingComponentState.cs +++ b/Content.Shared/GameObjects/Components/Items/ClothingComponentState.cs @@ -1,5 +1,5 @@ -using SS14.Shared.GameObjects; -using SS14.Shared.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; using System; namespace Content.Shared.GameObjects.Components.Items diff --git a/Content.Shared/GameObjects/Components/Items/ItemComponentState.cs b/Content.Shared/GameObjects/Components/Items/ItemComponentState.cs index 7af71c3ae2..2e7c720402 100644 --- a/Content.Shared/GameObjects/Components/Items/ItemComponentState.cs +++ b/Content.Shared/GameObjects/Components/Items/ItemComponentState.cs @@ -1,5 +1,5 @@ -using SS14.Shared.GameObjects; -using SS14.Shared.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; using System; namespace Content.Shared.GameObjects.Components.Items diff --git a/Content.Shared/GameObjects/Components/Items/SharedHandsComponent.cs b/Content.Shared/GameObjects/Components/Items/SharedHandsComponent.cs index fb2303abcc..3fe8870b75 100644 --- a/Content.Shared/GameObjects/Components/Items/SharedHandsComponent.cs +++ b/Content.Shared/GameObjects/Components/Items/SharedHandsComponent.cs @@ -1,5 +1,5 @@ -using SS14.Shared.GameObjects; -using SS14.Shared.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; using System; using System.Collections.Generic; diff --git a/Content.Shared/GameObjects/Components/Markers/SharedSpawnPointComponent.cs b/Content.Shared/GameObjects/Components/Markers/SharedSpawnPointComponent.cs index 1347eed344..52dbe0653d 100644 --- a/Content.Shared/GameObjects/Components/Markers/SharedSpawnPointComponent.cs +++ b/Content.Shared/GameObjects/Components/Markers/SharedSpawnPointComponent.cs @@ -1,4 +1,4 @@ -using SS14.Shared.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.Components.Markers { diff --git a/Content.Shared/GameObjects/Components/Mobs/SharedCameraRecoilComponent.cs b/Content.Shared/GameObjects/Components/Mobs/SharedCameraRecoilComponent.cs index 761b1ac692..e3adaff1a8 100644 --- a/Content.Shared/GameObjects/Components/Mobs/SharedCameraRecoilComponent.cs +++ b/Content.Shared/GameObjects/Components/Mobs/SharedCameraRecoilComponent.cs @@ -1,7 +1,7 @@ using System; -using SS14.Shared.GameObjects; -using SS14.Shared.Maths; -using SS14.Shared.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Maths; +using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Mobs { diff --git a/Content.Shared/GameObjects/Components/Mobs/SharedSpeciesComponent.cs b/Content.Shared/GameObjects/Components/Mobs/SharedSpeciesComponent.cs index 68755c36e1..a3e99f4e9f 100644 --- a/Content.Shared/GameObjects/Components/Mobs/SharedSpeciesComponent.cs +++ b/Content.Shared/GameObjects/Components/Mobs/SharedSpeciesComponent.cs @@ -1,6 +1,6 @@ using System; -using SS14.Shared.GameObjects; -using SS14.Shared.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Mobs { diff --git a/Content.Shared/GameObjects/Components/Power/PowerShared.cs b/Content.Shared/GameObjects/Components/Power/PowerShared.cs index abe8f3e8f1..0d27387467 100644 --- a/Content.Shared/GameObjects/Components/Power/PowerShared.cs +++ b/Content.Shared/GameObjects/Components/Power/PowerShared.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using SS14.Shared.Serialization; +using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Power { diff --git a/Content.Shared/GameObjects/Components/Power/SharedApcComponent.cs b/Content.Shared/GameObjects/Components/Power/SharedApcComponent.cs index c97b8a674b..23fa7de9b0 100644 --- a/Content.Shared/GameObjects/Components/Power/SharedApcComponent.cs +++ b/Content.Shared/GameObjects/Components/Power/SharedApcComponent.cs @@ -1,7 +1,7 @@ using System; -using SS14.Shared.GameObjects; -using SS14.Shared.GameObjects.Components.UserInterface; -using SS14.Shared.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Power { diff --git a/Content.Shared/GameObjects/Components/Power/SharedPowerCellComponent.cs b/Content.Shared/GameObjects/Components/Power/SharedPowerCellComponent.cs index ed5f81469b..22b932883a 100644 --- a/Content.Shared/GameObjects/Components/Power/SharedPowerCellComponent.cs +++ b/Content.Shared/GameObjects/Components/Power/SharedPowerCellComponent.cs @@ -1,5 +1,5 @@ using System; -using SS14.Shared.Serialization; +using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Power { diff --git a/Content.Shared/GameObjects/Components/Power/SharedPowerDebugTool.cs b/Content.Shared/GameObjects/Components/Power/SharedPowerDebugTool.cs index 55c3feb69e..b8d97ee30b 100644 --- a/Content.Shared/GameObjects/Components/Power/SharedPowerDebugTool.cs +++ b/Content.Shared/GameObjects/Components/Power/SharedPowerDebugTool.cs @@ -1,6 +1,6 @@ using System; -using SS14.Shared.GameObjects; -using SS14.Shared.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Power { diff --git a/Content.Shared/GameObjects/Components/Power/SharedSmesComponent.cs b/Content.Shared/GameObjects/Components/Power/SharedSmesComponent.cs index 90ae68d11f..f19cb432ee 100644 --- a/Content.Shared/GameObjects/Components/Power/SharedSmesComponent.cs +++ b/Content.Shared/GameObjects/Components/Power/SharedSmesComponent.cs @@ -1,4 +1,4 @@ -using SS14.Shared.Serialization; +using Robust.Shared.Serialization; using System; using System.Collections.Generic; using System.Linq; diff --git a/Content.Shared/GameObjects/Components/Sound/SharedSoundComponent.cs b/Content.Shared/GameObjects/Components/Sound/SharedSoundComponent.cs index 67b9b9fe8e..22d33ebb72 100644 --- a/Content.Shared/GameObjects/Components/Sound/SharedSoundComponent.cs +++ b/Content.Shared/GameObjects/Components/Sound/SharedSoundComponent.cs @@ -2,14 +2,14 @@ using System; using System.Collections.Generic; using System.IO; using Content.Shared.GameObjects; -using SS14.Shared.Audio; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Serialization; -using SS14.Shared.IoC; -using SS14.Shared.Map; -using SS14.Shared.Serialization; -using SS14.Shared.Timers; +using Robust.Shared.Audio; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Serialization; +using Robust.Shared.Timers; namespace Content.Shared.GameObjects.Components.Sound { @@ -119,7 +119,7 @@ namespace Content.Shared.GameObjects.Components.Sound Delay = serializer.ReadDataField("delay", 0u); RandomDelay = serializer.ReadDataField("randomdelay", 0u); Times = serializer.ReadDataField("times", 0); - AudioParams = serializer.ReadDataField("audioparams", SS14.Shared.Audio.AudioParams.Default); + AudioParams = serializer.ReadDataField("audioparams", Robust.Shared.Audio.AudioParams.Default); } } } diff --git a/Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs b/Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs index d3db244861..6ae4f8810c 100644 --- a/Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs +++ b/Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs @@ -1,5 +1,5 @@ -using SS14.Shared.GameObjects; -using SS14.Shared.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; using System; using System.Collections.Generic; diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedBallisticMagazineComponent.cs b/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedBallisticMagazineComponent.cs index b51136fcb1..6d7bb888e1 100644 --- a/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedBallisticMagazineComponent.cs +++ b/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedBallisticMagazineComponent.cs @@ -1,5 +1,5 @@ using System; -using SS14.Shared.Serialization; +using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Weapons.Ranged { diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedBallisticMagazineWeaponComponent.cs b/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedBallisticMagazineWeaponComponent.cs index b4500a7f59..09b4c0b23d 100644 --- a/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedBallisticMagazineWeaponComponent.cs +++ b/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedBallisticMagazineWeaponComponent.cs @@ -1,5 +1,5 @@ using System; -using SS14.Shared.Serialization; +using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Weapons.Ranged { diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedWeaponComponent.cs b/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedWeaponComponent.cs index 0559e4f819..475076d243 100644 --- a/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedWeaponComponent.cs +++ b/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedWeaponComponent.cs @@ -1,7 +1,7 @@ using System; -using SS14.Shared.GameObjects; -using SS14.Shared.Map; -using SS14.Shared.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Map; +using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Weapons.Ranged { diff --git a/Content.Shared/GameObjects/EntitySystemMessages/ExamineSystemMessages.cs b/Content.Shared/GameObjects/EntitySystemMessages/ExamineSystemMessages.cs index e08061e0ed..e95ca5c632 100644 --- a/Content.Shared/GameObjects/EntitySystemMessages/ExamineSystemMessages.cs +++ b/Content.Shared/GameObjects/EntitySystemMessages/ExamineSystemMessages.cs @@ -1,7 +1,7 @@ using System; -using SS14.Shared.GameObjects; -using SS14.Shared.Serialization; -using SS14.Shared.Utility; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; namespace Content.Shared.GameObjects.EntitySystemMessages { diff --git a/Content.Shared/GameObjects/EntitySystemMessages/VerbSystemMessages.cs b/Content.Shared/GameObjects/EntitySystemMessages/VerbSystemMessages.cs index 5c122da1cd..3ba08ebe2b 100644 --- a/Content.Shared/GameObjects/EntitySystemMessages/VerbSystemMessages.cs +++ b/Content.Shared/GameObjects/EntitySystemMessages/VerbSystemMessages.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using SS14.Shared.GameObjects; -using SS14.Shared.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.EntitySystemMessages { diff --git a/Content.Shared/GameObjects/Messages/Mob/HealthHud.cs b/Content.Shared/GameObjects/Messages/Mob/HealthHud.cs index b477d53a9e..b28927f453 100644 --- a/Content.Shared/GameObjects/Messages/Mob/HealthHud.cs +++ b/Content.Shared/GameObjects/Messages/Mob/HealthHud.cs @@ -1,5 +1,5 @@ -using SS14.Shared.GameObjects; -using SS14.Shared.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; using System; namespace Content.Shared.GameObjects diff --git a/Content.Shared/GameObjects/Verb.cs b/Content.Shared/GameObjects/Verb.cs index ea2d423d19..e660324e6f 100644 --- a/Content.Shared/GameObjects/Verb.cs +++ b/Content.Shared/GameObjects/Verb.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using JetBrains.Annotations; -using SS14.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects; namespace Content.Shared.GameObjects { diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs index 22bc4c3ce8..64074f43db 100644 --- a/Content.Shared/Input/ContentKeyFunctions.cs +++ b/Content.Shared/Input/ContentKeyFunctions.cs @@ -1,4 +1,4 @@ -using SS14.Shared.Input; +using Robust.Shared.Input; namespace Content.Shared.Input { diff --git a/Content.Shared/Interfaces/ISharedNotifyManager.cs b/Content.Shared/Interfaces/ISharedNotifyManager.cs index 88624654db..b91c646741 100644 --- a/Content.Shared/Interfaces/ISharedNotifyManager.cs +++ b/Content.Shared/Interfaces/ISharedNotifyManager.cs @@ -1,6 +1,6 @@ -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.IoC; -using SS14.Shared.Map; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Map; namespace Content.Shared.Interfaces { diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs index 255182e7ad..3b939f0f9e 100644 --- a/Content.Shared/Maps/ContentTileDefinition.cs +++ b/Content.Shared/Maps/ContentTileDefinition.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; -using SS14.Shared.Interfaces.Map; -using SS14.Shared.Prototypes; -using SS14.Shared.Utility; +using Robust.Shared.Interfaces.Map; +using Robust.Shared.Prototypes; +using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; namespace Content.Shared.Maps diff --git a/Content.Shared/SharedGameTicker.cs b/Content.Shared/SharedGameTicker.cs index 04b601b7c9..07f7b089e4 100644 --- a/Content.Shared/SharedGameTicker.cs +++ b/Content.Shared/SharedGameTicker.cs @@ -1,11 +1,11 @@ using System; using System.IO; using Lidgren.Network; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.Interfaces.Serialization; -using SS14.Shared.IoC; -using SS14.Shared.Map; -using SS14.Shared.Network; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Network; namespace Content.Shared { diff --git a/Content.Shared/SharedNotifyManager.cs b/Content.Shared/SharedNotifyManager.cs index eaad117368..a928c79aa5 100644 --- a/Content.Shared/SharedNotifyManager.cs +++ b/Content.Shared/SharedNotifyManager.cs @@ -1,10 +1,10 @@ using Content.Shared.Interfaces; using Lidgren.Network; -using SS14.Shared.Interfaces.GameObjects; -using SS14.Shared.Interfaces.Network; -using SS14.Shared.Map; -using SS14.Shared.Network; -using SS14.Shared.Network.Messages; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Network; +using Robust.Shared.Map; +using Robust.Shared.Network; +using Robust.Shared.Network.Messages; namespace Content.Shared { diff --git a/SpaceStation14.sln b/SpaceStation14.sln new file mode 100644 index 0000000000..938c4c20a2 --- /dev/null +++ b/SpaceStation14.sln @@ -0,0 +1,211 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26730.16 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Shared", "Content.Shared\Content.Shared.csproj", "{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Server", "Content.Server\Content.Server.csproj", "{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}" + ProjectSection(ProjectDependencies) = postProject + {59250BAF-0000-0000-0000-000000000000} = {59250BAF-0000-0000-0000-000000000000} + {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5} = {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Client", "Content.Client\Content.Client.csproj", "{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}" + ProjectSection(ProjectDependencies) = postProject + {59250BAF-0000-0000-0000-000000000000} = {59250BAF-0000-0000-0000-000000000000} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Checker", "Build Checker", "{3202E94D-E985-4181-9F69-F458A7F6574F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildChecker", "BuildChecker\BuildChecker.csproj", "{C899FCA4-7037-4E49-ABC2-44DE72487110}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Tests", "Content.Tests\Content.Tests.csproj", "{8EDF4429-251A-416D-BB68-93F227191BCF}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RobustToolbox", "RobustToolbox", "{83B4CBBA-547A-42F0-A7CD-8A67D93196CE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network", "RobustToolbox\Lidgren.Network\Lidgren.Network.csproj", "{59250BAF-0000-0000-0000-000000000000}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Client", "RobustToolbox\Robust.Client\Robust.Client.csproj", "{83429BD6-6358-4B18-BE51-401DF8EA2673}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Client.Godot", "RobustToolbox\Robust.Client.Godot\Robust.Client.Godot.csproj", "{8AF31169-49B1-4A12-B8F4-2A0674A9E7CB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Server", "RobustToolbox\Robust.Server\Robust.Server.csproj", "{B04AAE71-0000-0000-0000-000000000000}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Shared.Maths", "RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj", "{93F23A82-00C5-4572-964E-E7C9457726D4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.UnitTesting", "RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj", "{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Shared", "RobustToolbox\Robust.Shared\Robust.Shared.csproj", "{0529F740-0000-0000-0000-000000000000}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x64.ActiveCfg = Debug|x64 + {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x64.Build.0 = Debug|x64 + {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x86.ActiveCfg = Debug|x86 + {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x86.Build.0 = Debug|x86 + {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|Any CPU.Build.0 = Release|Any CPU + {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x64.ActiveCfg = Release|x64 + {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x64.Build.0 = Release|x64 + {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x86.ActiveCfg = Release|x86 + {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x86.Build.0 = Release|x86 + {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x64.ActiveCfg = Debug|x64 + {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x64.Build.0 = Debug|x64 + {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x86.ActiveCfg = Debug|x86 + {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x86.Build.0 = Debug|x86 + {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|Any CPU.Build.0 = Release|Any CPU + {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x64.ActiveCfg = Release|x64 + {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x64.Build.0 = Release|x64 + {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x86.ActiveCfg = Release|x86 + {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x86.Build.0 = Release|x86 + {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x64.ActiveCfg = Debug|x64 + {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x64.Build.0 = Debug|x64 + {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x86.ActiveCfg = Debug|x86 + {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x86.Build.0 = Debug|x86 + {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|Any CPU.Build.0 = Release|Any CPU + {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x64.ActiveCfg = Release|x64 + {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x64.Build.0 = Release|x64 + {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x86.ActiveCfg = Release|x86 + {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x86.Build.0 = Release|x86 + {C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x64.ActiveCfg = Debug|Any CPU + {C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x86.ActiveCfg = Debug|Any CPU + {C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x86.Build.0 = Debug|Any CPU + {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|Any CPU.Build.0 = Debug|Any CPU + {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x64.ActiveCfg = Debug|Any CPU + {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x64.Build.0 = Debug|Any CPU + {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x86.ActiveCfg = Debug|Any CPU + {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x86.Build.0 = Debug|Any CPU + {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x64.ActiveCfg = Debug|x64 + {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x64.Build.0 = Debug|x64 + {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x86.ActiveCfg = Debug|x86 + {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x86.Build.0 = Debug|x86 + {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|Any CPU.Build.0 = Release|Any CPU + {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x64.ActiveCfg = Release|x64 + {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x64.Build.0 = Release|x64 + {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x86.ActiveCfg = Release|x86 + {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x86.Build.0 = Release|x86 + {59250BAF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {59250BAF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {59250BAF-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|x64 + {59250BAF-0000-0000-0000-000000000000}.Debug|x64.Build.0 = Debug|x64 + {59250BAF-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86 + {59250BAF-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86 + {59250BAF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {59250BAF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {59250BAF-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|x64 + {59250BAF-0000-0000-0000-000000000000}.Release|x64.Build.0 = Release|x64 + {59250BAF-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86 + {59250BAF-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86 + {83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|Any CPU.Build.0 = Debug|Any CPU + {83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|x64.ActiveCfg = Debug|x64 + {83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|x64.Build.0 = Debug|x64 + {83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|x86.ActiveCfg = Debug|x86 + {83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|x86.Build.0 = Debug|x86 + {83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|Any CPU.ActiveCfg = Release|Any CPU + {83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|Any CPU.Build.0 = Release|Any CPU + {83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|x64.ActiveCfg = Release|x64 + {83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|x64.Build.0 = Release|x64 + {83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|x86.ActiveCfg = Release|x86 + {83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|x86.Build.0 = Release|x86 + {8AF31169-49B1-4A12-B8F4-2A0674A9E7CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8AF31169-49B1-4A12-B8F4-2A0674A9E7CB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8AF31169-49B1-4A12-B8F4-2A0674A9E7CB}.Debug|x64.ActiveCfg = Debug|Any CPU + {8AF31169-49B1-4A12-B8F4-2A0674A9E7CB}.Debug|x64.Build.0 = Debug|Any CPU + {8AF31169-49B1-4A12-B8F4-2A0674A9E7CB}.Debug|x86.ActiveCfg = Debug|Any CPU + {8AF31169-49B1-4A12-B8F4-2A0674A9E7CB}.Debug|x86.Build.0 = Debug|Any CPU + {8AF31169-49B1-4A12-B8F4-2A0674A9E7CB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8AF31169-49B1-4A12-B8F4-2A0674A9E7CB}.Release|Any CPU.Build.0 = Release|Any CPU + {8AF31169-49B1-4A12-B8F4-2A0674A9E7CB}.Release|x64.ActiveCfg = Release|Any CPU + {8AF31169-49B1-4A12-B8F4-2A0674A9E7CB}.Release|x64.Build.0 = Release|Any CPU + {8AF31169-49B1-4A12-B8F4-2A0674A9E7CB}.Release|x86.ActiveCfg = Release|Any CPU + {8AF31169-49B1-4A12-B8F4-2A0674A9E7CB}.Release|x86.Build.0 = Release|Any CPU + {B04AAE71-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B04AAE71-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B04AAE71-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|x64 + {B04AAE71-0000-0000-0000-000000000000}.Debug|x64.Build.0 = Debug|x64 + {B04AAE71-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86 + {B04AAE71-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86 + {B04AAE71-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B04AAE71-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {B04AAE71-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|x64 + {B04AAE71-0000-0000-0000-000000000000}.Release|x64.Build.0 = Release|x64 + {B04AAE71-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86 + {B04AAE71-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86 + {93F23A82-00C5-4572-964E-E7C9457726D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {93F23A82-00C5-4572-964E-E7C9457726D4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {93F23A82-00C5-4572-964E-E7C9457726D4}.Debug|x64.ActiveCfg = Debug|x64 + {93F23A82-00C5-4572-964E-E7C9457726D4}.Debug|x64.Build.0 = Debug|x64 + {93F23A82-00C5-4572-964E-E7C9457726D4}.Debug|x86.ActiveCfg = Debug|x86 + {93F23A82-00C5-4572-964E-E7C9457726D4}.Debug|x86.Build.0 = Debug|x86 + {93F23A82-00C5-4572-964E-E7C9457726D4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {93F23A82-00C5-4572-964E-E7C9457726D4}.Release|Any CPU.Build.0 = Release|Any CPU + {93F23A82-00C5-4572-964E-E7C9457726D4}.Release|x64.ActiveCfg = Release|x64 + {93F23A82-00C5-4572-964E-E7C9457726D4}.Release|x64.Build.0 = Release|x64 + {93F23A82-00C5-4572-964E-E7C9457726D4}.Release|x86.ActiveCfg = Release|x86 + {93F23A82-00C5-4572-964E-E7C9457726D4}.Release|x86.Build.0 = Release|x86 + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x64.ActiveCfg = Debug|x64 + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x64.Build.0 = Debug|x64 + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x86.ActiveCfg = Debug|x86 + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x86.Build.0 = Debug|x86 + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|Any CPU.Build.0 = Debug|Any CPU + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x64.ActiveCfg = Debug|x64 + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x64.Build.0 = Debug|x64 + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x86.ActiveCfg = Debug|x86 + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x86.Build.0 = Debug|x86 + {0529F740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0529F740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0529F740-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|x64 + {0529F740-0000-0000-0000-000000000000}.Debug|x64.Build.0 = Debug|x64 + {0529F740-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86 + {0529F740-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86 + {0529F740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0529F740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {0529F740-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|x64 + {0529F740-0000-0000-0000-000000000000}.Release|x64.Build.0 = Release|x64 + {0529F740-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86 + {0529F740-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {C899FCA4-7037-4E49-ABC2-44DE72487110} = {3202E94D-E985-4181-9F69-F458A7F6574F} + {59250BAF-0000-0000-0000-000000000000} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} + {83429BD6-6358-4B18-BE51-401DF8EA2673} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} + {8AF31169-49B1-4A12-B8F4-2A0674A9E7CB} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} + {B04AAE71-0000-0000-0000-000000000000} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} + {93F23A82-00C5-4572-964E-E7C9457726D4} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} + {0529F740-0000-0000-0000-000000000000} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {AA37ED9F-F8D6-468E-A101-658AD605B09A} + EndGlobalSection +EndGlobal diff --git a/SpaceStation14Content.sln b/SpaceStation14Content.sln deleted file mode 100644 index e105851657..0000000000 --- a/SpaceStation14Content.sln +++ /dev/null @@ -1,243 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26730.16 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Shared", "Content.Shared\Content.Shared.csproj", "{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}" - ProjectSection(ProjectDependencies) = postProject - {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1} = {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1} - {7DC961F2-A45B-4193-BE7F-77622A231943} = {7DC961F2-A45B-4193-BE7F-77622A231943} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Server", "Content.Server\Content.Server.csproj", "{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}" - ProjectSection(ProjectDependencies) = postProject - {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1} = {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1} - {FF197E54-2EAE-4A6A-BE19-7BE701F5588A} = {FF197E54-2EAE-4A6A-BE19-7BE701F5588A} - {D63D377C-242B-4FC5-8337-35CB87E6C537} = {D63D377C-242B-4FC5-8337-35CB87E6C537} - {CDD8AD7E-C24E-49C8-97E6-10DB96A9786F} = {CDD8AD7E-C24E-49C8-97E6-10DB96A9786F} - {3F8AA5A7-7198-49D5-B460-4A83A8F1528A} = {3F8AA5A7-7198-49D5-B460-4A83A8F1528A} - {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5} = {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5} - {916C5BF0-74BF-485D-A233-C1AC30007119} = {916C5BF0-74BF-485D-A233-C1AC30007119} - {7DC961F2-A45B-4193-BE7F-77622A231943} = {7DC961F2-A45B-4193-BE7F-77622A231943} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Client", "Content.Client\Content.Client.csproj", "{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}" - ProjectSection(ProjectDependencies) = postProject - {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1} = {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1} - {FF197E54-2EAE-4A6A-BE19-7BE701F5588A} = {FF197E54-2EAE-4A6A-BE19-7BE701F5588A} - {D63D377C-242B-4FC5-8337-35CB87E6C537} = {D63D377C-242B-4FC5-8337-35CB87E6C537} - {CDD8AD7E-C24E-49C8-97E6-10DB96A9786F} = {CDD8AD7E-C24E-49C8-97E6-10DB96A9786F} - {3F8AA5A7-7198-49D5-B460-4A83A8F1528A} = {3F8AA5A7-7198-49D5-B460-4A83A8F1528A} - {916C5BF0-74BF-485D-A233-C1AC30007119} = {916C5BF0-74BF-485D-A233-C1AC30007119} - {7DC961F2-A45B-4193-BE7F-77622A231943} = {7DC961F2-A45B-4193-BE7F-77622A231943} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Checker", "Build Checker", "{3202E94D-E985-4181-9F69-F458A7F6574F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildChecker", "BuildChecker\BuildChecker.csproj", "{C899FCA4-7037-4E49-ABC2-44DE72487110}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Tests", "Content.Tests\Content.Tests.csproj", "{8EDF4429-251A-416D-BB68-93F227191BCF}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RobustToolbox", "RobustToolbox", "{83B4CBBA-547A-42F0-A7CD-8A67D93196CE}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SS14.Client", "RobustToolbox\SS14.Client\SS14.Client.csproj", "{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}" - ProjectSection(ProjectDependencies) = postProject - {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1} = {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1} - {7DC961F2-A45B-4193-BE7F-77622A231943} = {7DC961F2-A45B-4193-BE7F-77622A231943} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SS14.Client.Godot", "RobustToolbox\SS14.Client.Godot\SS14.Client.Godot.csproj", "{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SS14.Server", "RobustToolbox\SS14.Server\SS14.Server.csproj", "{916C5BF0-74BF-485D-A233-C1AC30007119}" - ProjectSection(ProjectDependencies) = postProject - {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1} = {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1} - {7DC961F2-A45B-4193-BE7F-77622A231943} = {7DC961F2-A45B-4193-BE7F-77622A231943} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SS14.Shared", "RobustToolbox\SS14.Shared\SS14.Shared.csproj", "{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}" - ProjectSection(ProjectDependencies) = postProject - {7DC961F2-A45B-4193-BE7F-77622A231943} = {7DC961F2-A45B-4193-BE7F-77622A231943} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SS14.Shared.Maths", "RobustToolbox\SS14.Shared.Maths\SS14.Shared.Maths.csproj", "{7DC961F2-A45B-4193-BE7F-77622A231943}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SS14.UnitTesting", "RobustToolbox\SS14.UnitTesting\SS14.UnitTesting.csproj", "{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}" - ProjectSection(ProjectDependencies) = postProject - {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1} = {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1} - {3F8AA5A7-7198-49D5-B460-4A83A8F1528A} = {3F8AA5A7-7198-49D5-B460-4A83A8F1528A} - {916C5BF0-74BF-485D-A233-C1AC30007119} = {916C5BF0-74BF-485D-A233-C1AC30007119} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network", "RobustToolbox\Lidgren.Network\Lidgren.Network.csproj", "{D63D377C-242B-4FC5-8337-35CB87E6C537}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x64.ActiveCfg = Debug|x64 - {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x64.Build.0 = Debug|x64 - {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x86.ActiveCfg = Debug|x86 - {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x86.Build.0 = Debug|x86 - {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|Any CPU.Build.0 = Release|Any CPU - {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x64.ActiveCfg = Release|x64 - {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x64.Build.0 = Release|x64 - {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x86.ActiveCfg = Release|x86 - {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x86.Build.0 = Release|x86 - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x64.ActiveCfg = Debug|x64 - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x64.Build.0 = Debug|x64 - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x86.ActiveCfg = Debug|x86 - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x86.Build.0 = Debug|x86 - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|Any CPU.Build.0 = Release|Any CPU - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x64.ActiveCfg = Release|x64 - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x64.Build.0 = Release|x64 - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x86.ActiveCfg = Release|x86 - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x86.Build.0 = Release|x86 - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x64.ActiveCfg = Debug|x64 - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x64.Build.0 = Debug|x64 - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x86.ActiveCfg = Debug|x86 - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x86.Build.0 = Debug|x86 - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|Any CPU.Build.0 = Release|Any CPU - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x64.ActiveCfg = Release|x64 - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x64.Build.0 = Release|x64 - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x86.ActiveCfg = Release|x86 - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x86.Build.0 = Release|x86 - {C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x64.ActiveCfg = Debug|Any CPU - {C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x86.ActiveCfg = Debug|Any CPU - {C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x86.Build.0 = Debug|Any CPU - {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|Any CPU.Build.0 = Debug|Any CPU - {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x64.ActiveCfg = Debug|Any CPU - {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x64.Build.0 = Debug|Any CPU - {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x86.ActiveCfg = Debug|Any CPU - {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x86.Build.0 = Debug|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x64.ActiveCfg = Debug|x64 - {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x64.Build.0 = Debug|x64 - {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x86.ActiveCfg = Debug|x86 - {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x86.Build.0 = Debug|x86 - {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|Any CPU.Build.0 = Release|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x64.ActiveCfg = Release|x64 - {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x64.Build.0 = Release|x64 - {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x86.ActiveCfg = Release|x86 - {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x86.Build.0 = Release|x86 - {3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Debug|x64.ActiveCfg = Debug|x64 - {3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Debug|x64.Build.0 = Debug|x64 - {3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Debug|x86.ActiveCfg = Debug|x86 - {3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Debug|x86.Build.0 = Debug|x86 - {3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Release|Any CPU.Build.0 = Release|Any CPU - {3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Release|x64.ActiveCfg = Release|x64 - {3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Release|x64.Build.0 = Release|x64 - {3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Release|x86.ActiveCfg = Release|x86 - {3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Release|x86.Build.0 = Release|x86 - {CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Debug|x64.ActiveCfg = Debug|Any CPU - {CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Debug|x64.Build.0 = Debug|Any CPU - {CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Debug|x86.ActiveCfg = Debug|Any CPU - {CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Debug|x86.Build.0 = Debug|Any CPU - {CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Release|Any CPU.Build.0 = Release|Any CPU - {CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Release|x64.ActiveCfg = Release|Any CPU - {CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Release|x64.Build.0 = Release|Any CPU - {CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Release|x86.ActiveCfg = Release|Any CPU - {CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Release|x86.Build.0 = Release|Any CPU - {916C5BF0-74BF-485D-A233-C1AC30007119}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {916C5BF0-74BF-485D-A233-C1AC30007119}.Debug|Any CPU.Build.0 = Debug|Any CPU - {916C5BF0-74BF-485D-A233-C1AC30007119}.Debug|x64.ActiveCfg = Debug|x64 - {916C5BF0-74BF-485D-A233-C1AC30007119}.Debug|x64.Build.0 = Debug|x64 - {916C5BF0-74BF-485D-A233-C1AC30007119}.Debug|x86.ActiveCfg = Debug|x86 - {916C5BF0-74BF-485D-A233-C1AC30007119}.Debug|x86.Build.0 = Debug|x86 - {916C5BF0-74BF-485D-A233-C1AC30007119}.Release|Any CPU.ActiveCfg = Release|Any CPU - {916C5BF0-74BF-485D-A233-C1AC30007119}.Release|Any CPU.Build.0 = Release|Any CPU - {916C5BF0-74BF-485D-A233-C1AC30007119}.Release|x64.ActiveCfg = Release|x64 - {916C5BF0-74BF-485D-A233-C1AC30007119}.Release|x64.Build.0 = Release|x64 - {916C5BF0-74BF-485D-A233-C1AC30007119}.Release|x86.ActiveCfg = Release|x86 - {916C5BF0-74BF-485D-A233-C1AC30007119}.Release|x86.Build.0 = Release|x86 - {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Debug|x64.ActiveCfg = Debug|x64 - {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Debug|x64.Build.0 = Debug|x64 - {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Debug|x86.ActiveCfg = Debug|x86 - {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Debug|x86.Build.0 = Debug|x86 - {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Release|Any CPU.Build.0 = Release|Any CPU - {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Release|x64.ActiveCfg = Release|x64 - {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Release|x64.Build.0 = Release|x64 - {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Release|x86.ActiveCfg = Release|x86 - {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Release|x86.Build.0 = Release|x86 - {7DC961F2-A45B-4193-BE7F-77622A231943}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7DC961F2-A45B-4193-BE7F-77622A231943}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7DC961F2-A45B-4193-BE7F-77622A231943}.Debug|x64.ActiveCfg = Debug|x64 - {7DC961F2-A45B-4193-BE7F-77622A231943}.Debug|x64.Build.0 = Debug|x64 - {7DC961F2-A45B-4193-BE7F-77622A231943}.Debug|x86.ActiveCfg = Debug|x86 - {7DC961F2-A45B-4193-BE7F-77622A231943}.Debug|x86.Build.0 = Debug|x86 - {7DC961F2-A45B-4193-BE7F-77622A231943}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7DC961F2-A45B-4193-BE7F-77622A231943}.Release|Any CPU.Build.0 = Release|Any CPU - {7DC961F2-A45B-4193-BE7F-77622A231943}.Release|x64.ActiveCfg = Release|x64 - {7DC961F2-A45B-4193-BE7F-77622A231943}.Release|x64.Build.0 = Release|x64 - {7DC961F2-A45B-4193-BE7F-77622A231943}.Release|x86.ActiveCfg = Release|x86 - {7DC961F2-A45B-4193-BE7F-77622A231943}.Release|x86.Build.0 = Release|x86 - {FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Debug|x64.ActiveCfg = Debug|x64 - {FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Debug|x64.Build.0 = Debug|x64 - {FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Debug|x86.ActiveCfg = Debug|x86 - {FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Debug|x86.Build.0 = Debug|x86 - {FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Release|Any CPU.Build.0 = Debug|Any CPU - {FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Release|x64.ActiveCfg = Debug|x64 - {FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Release|x64.Build.0 = Debug|x64 - {FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Release|x86.ActiveCfg = Debug|x86 - {FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Release|x86.Build.0 = Debug|x86 - {D63D377C-242B-4FC5-8337-35CB87E6C537}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D63D377C-242B-4FC5-8337-35CB87E6C537}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D63D377C-242B-4FC5-8337-35CB87E6C537}.Debug|x64.ActiveCfg = Debug|x64 - {D63D377C-242B-4FC5-8337-35CB87E6C537}.Debug|x64.Build.0 = Debug|x64 - {D63D377C-242B-4FC5-8337-35CB87E6C537}.Debug|x86.ActiveCfg = Debug|x86 - {D63D377C-242B-4FC5-8337-35CB87E6C537}.Debug|x86.Build.0 = Debug|x86 - {D63D377C-242B-4FC5-8337-35CB87E6C537}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D63D377C-242B-4FC5-8337-35CB87E6C537}.Release|Any CPU.Build.0 = Release|Any CPU - {D63D377C-242B-4FC5-8337-35CB87E6C537}.Release|x64.ActiveCfg = Release|x64 - {D63D377C-242B-4FC5-8337-35CB87E6C537}.Release|x64.Build.0 = Release|x64 - {D63D377C-242B-4FC5-8337-35CB87E6C537}.Release|x86.ActiveCfg = Release|x86 - {D63D377C-242B-4FC5-8337-35CB87E6C537}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {C899FCA4-7037-4E49-ABC2-44DE72487110} = {3202E94D-E985-4181-9F69-F458A7F6574F} - {3F8AA5A7-7198-49D5-B460-4A83A8F1528A} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} - {CDD8AD7E-C24E-49C8-97E6-10DB96A9786F} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} - {916C5BF0-74BF-485D-A233-C1AC30007119} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} - {5F161008-6C48-4596-A2DE-5E7B0CEB2AA1} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} - {7DC961F2-A45B-4193-BE7F-77622A231943} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} - {FF197E54-2EAE-4A6A-BE19-7BE701F5588A} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} - {D63D377C-242B-4FC5-8337-35CB87E6C537} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {AA37ED9F-F8D6-468E-A101-658AD605B09A} - EndGlobalSection -EndGlobal