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

Fix namespaces and optimize imports (#1651)

Browse Source 
* Fix namespaces and optimize imports

* Cleanup fixes

* Merge conflict fixes

* Merge conflict fixes

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

8
Content.Shared/Health/BodySystem/BodyPart/BodyPartProperties/ArmLength.cs
View File

@@ -1,15 +1,13 @@

using System;
using Robust.Shared.Interfaces.Serialization;
using Robust.Shared.Serialization;
using System;
namespace Content.Shared.BodySystem {
namespace Content.Shared.Health.BodySystem.BodyPart.BodyPartProperties {
[NetSerializable, Serializable]
class ArmLength : IExposeData {
private float _length;
public void ExposeData(ObjectSerializer serializer){
serializer.DataField(ref _length, "length", 2f);
}

19
Content.Shared/Health/BodySystem/BodyPart/BodyPartPrototype.cs
View File

@@ -6,13 +6,12 @@ using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
using YamlDotNet.RepresentationModel;
namespace Content.Shared.BodySystem {
namespace Content.Shared.Health.BodySystem.BodyPart {
/// <summary>
/// Prototype for the BodyPart class.
/// </summary>
/// </summary>
[Prototype("bodyPart")]
[NetSerializable, Serializable]
public class BodyPartPrototype : IPrototype, IIndexedPrototype {
@@ -36,7 +35,7 @@ namespace Content.Shared.BodySystem {
[ViewVariables]
public string Name => _name;
[ViewVariables]
public string Plural => _plural;
@@ -48,19 +47,19 @@ namespace Content.Shared.BodySystem {
[ViewVariables]
public BodyPartType PartType => _partType;
[ViewVariables]
public int Durability => _durability;
[ViewVariables]
public int DestroyThreshold => _destroyThreshold;
public int DestroyThreshold => _destroyThreshold;
[ViewVariables]
public float Resistance => _resistance;
[ViewVariables]
public int Size => _size;
[ViewVariables]
public BodyPartCompatibility Compatibility => _compatibility;

7
Content.Shared/Health/BodySystem/BodyPreset/BodyPresetPrototype.cs
View File

@@ -1,16 +1,15 @@
using System;
using System.Collections.Generic;
using Robust.Shared.Interfaces.Serialization;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
using YamlDotNet.RepresentationModel;
namespace Content.Shared.BodySystem {
namespace Content.Shared.Health.BodySystem.BodyPreset {
/// <summary>
/// Prototype for the BodyPreset class.
/// </summary>
/// </summary>
[Prototype("bodyPreset")]
[NetSerializable, Serializable]
public class BodyPresetPrototype : IPrototype, IIndexedPrototype {
@@ -23,7 +22,7 @@ namespace Content.Shared.BodySystem {
[ViewVariables]
public string Name => _name;
[ViewVariables]
public Dictionary<string, string> PartIDs => _partIDs;

16
Content.Shared/Health/BodySystem/BodyScanner/BodyScannerSharedValues.cs
View File

@@ -1,17 +1,9 @@
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.IoC;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.Serialization;
namespace Content.Shared.BodySystem
namespace Content.Shared.Health.BodySystem.BodyScanner
{

11
Content.Shared/Health/BodySystem/BodyTemplate/BodyTemplatePrototype.cs
View File

@@ -1,16 +1,15 @@
using System;
using System.Collections.Generic;
using Robust.Shared.Interfaces.Serialization;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
using YamlDotNet.RepresentationModel;
namespace Content.Shared.BodySystem {
namespace Content.Shared.Health.BodySystem.BodyTemplate {
/// <summary>
/// Prototype for the BodyTemplate class.
/// </summary>
/// </summary>
[Prototype("bodyTemplate")]
[NetSerializable, Serializable]
public class BodyTemplatePrototype : IPrototype, IIndexedPrototype {
@@ -25,13 +24,13 @@ namespace Content.Shared.BodySystem {
[ViewVariables]
public string Name => _name;
[ViewVariables]
public string CenterSlot => _centerSlot;
[ViewVariables]
public Dictionary<string, BodyPartType> Slots => _slots;
[ViewVariables]
public Dictionary<string, List<string>> Connections => _connections;

2
Content.Shared/Health/BodySystem/BodysystemValues.cs
View File

@@ -1,5 +1,5 @@

namespace Content.Shared.BodySystem
namespace Content.Shared.Health.BodySystem
{
/// <summary>
/// Used to determine whether a BodyPart can connect to another BodyPart.

8
Content.Shared/Health/BodySystem/Mechanism/MechanismPrototype.cs
View File

@@ -1,19 +1,15 @@
using System;
using System.Collections.Generic;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
using YamlDotNet.RepresentationModel;
namespace Content.Shared.BodySystem
namespace Content.Shared.Health.BodySystem.Mechanism
{
/// <summary>
/// Prototype for the Mechanism class.
/// </summary>
/// </summary>
[Prototype("mechanism")]
[NetSerializable, Serializable]
public class MechanismPrototype : IPrototype, IIndexedPrototype

8
Content.Shared/Health/BodySystem/Surgery/GenericSurgeryUIMessages.cs
View File

@@ -1,11 +1,9 @@
using Robust.Shared.GameObjects;
using System;
using System.Collections.Generic;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.Serialization;
using System;
using System.Collections.Generic;
using System.Text;
namespace Content.Shared.BodySystem
namespace Content.Shared.Health.BodySystem.Surgery
{
[Serializable, NetSerializable]

8
Content.Shared/Health/DamageContainer/AbstractDamageContainer.cs
View File

@@ -1,10 +1,10 @@
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
namespace Content.Shared.BodySystem
namespace Content.Shared.Health.DamageContainer
{
public enum DamageClass { Brute, Burn, Toxin, Airloss }
public enum DamageType { Blunt, Piercing, Heat, Disintegration, Cellular, DNA, Airloss }

7
Content.Shared/Health/DamageContainer/BiologicalDamageContainer.cs
View File

@@ -1,9 +1,8 @@
using Robust.Shared.Serialization;
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using Robust.Shared.Serialization;
namespace Content.Shared.BodySystem
namespace Content.Shared.Health.DamageContainer
{
[NetSerializable, Serializable]
public class BiologicalDamageContainer : AbstractDamageContainer