Fix namespaces and optimize imports (#1651)
* Fix namespaces and optimize imports * Cleanup fixes * Merge conflict fixes * Merge conflict fixes * Merge conflict fixes
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
using Robust.Shared.Interfaces.GameObjects;
|
||||
using Robust.Shared.Interfaces.Serialization;
|
||||
|
||||
namespace Content.Shared.Interfaces
|
||||
namespace Content.Server.Interfaces.Chemistry
|
||||
{
|
||||
/// <summary>
|
||||
/// Chemical reaction effect on the world such as an explosion, EMP, or fire.
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
using System;
|
||||
using Content.Server.GameObjects;
|
||||
using Content.Shared.GameObjects;
|
||||
using Content.Server.GameObjects.Components.Damage;
|
||||
using Content.Shared.GameObjects.Components.Damage;
|
||||
using Robust.Shared.Interfaces.GameObjects;
|
||||
|
||||
namespace Content.Server.Interfaces.GameObjects
|
||||
namespace Content.Server.Interfaces.GameObjects.Components.Damage
|
||||
{
|
||||
public interface IDamageableComponent : IComponent
|
||||
{
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using System;
|
||||
using Content.Server.BodySystem;
|
||||
using Content.Server.Health.BodySystem.BodyPart;
|
||||
|
||||
namespace Content.Server.Interfaces.GameObjects.Components.Interaction
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Content.Server.GameObjects.Components;
|
||||
using Content.Server.GameObjects.Components.Items.Storage;
|
||||
using Content.Shared.GameObjects.Components.Items;
|
||||
using Content.Shared.GameObjects.EntitySystems;
|
||||
using Robust.Server.GameObjects.Components.Container;
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Content.Server.GameObjects;
|
||||
using System.Collections.Generic;
|
||||
using Content.Server.GameObjects.Components.Damage;
|
||||
|
||||
namespace Content.Server.Interfaces
|
||||
namespace Content.Server.Interfaces.GameObjects
|
||||
{
|
||||
/// <summary>
|
||||
/// Any component/entity that has behaviour linked to taking damage should implement this interface.
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
using Content.Server.Interfaces.Chat;
|
||||
using Robust.Shared.Interfaces.GameObjects;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace Content.Server.Interfaces.GameObjects
|
||||
{
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#nullable enable
|
||||
using System;
|
||||
using Content.Server.GameObjects.Components.Access;
|
||||
using System.Collections.Generic;
|
||||
using Content.Server.GameObjects.Components.Access;
|
||||
|
||||
namespace Content.Server.Interfaces
|
||||
{
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
using Content.Server.Atmos;
|
||||
using Content.Server.Atmos.Reactions;
|
||||
using Robust.Shared.Interfaces.Serialization;
|
||||
using Robust.Shared.Map;
|
||||
|
||||
namespace Content.Server.Interfaces
|
||||
{
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
using Robust.Shared.Interfaces.GameObjects;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace Content.Server.Interfaces
|
||||
{
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Content.Shared.GameObjects.Components.PDA;
|
||||
using Content.Shared.Prototypes.PDA;
|
||||
|
||||
namespace Content.Server.Interfaces.PDA
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user