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:
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

View File

@@ -1,11 +1,11 @@
using Robust.Server.GameObjects.Components.UserInterface;
using System.Collections.Generic;
using Content.Shared.Health.BodySystem.BodyScanner;
using Content.Shared.Interfaces.GameObjects.Components;
using Robust.Server.GameObjects.Components.UserInterface;
using Robust.Server.Interfaces.GameObjects;
using Robust.Shared.GameObjects;
using System.Collections.Generic;
using Content.Shared.BodySystem;
using Content.Shared.Interfaces.GameObjects.Components;
namespace Content.Server.BodySystem
namespace Content.Server.Health.BodySystem.BodyScanner
{
[RegisterComponent]
[ComponentReference(typeof(IActivate))]
@@ -45,7 +45,7 @@ namespace Content.Server.BodySystem
/// <summary>
/// Copy BodyTemplate and BodyPart data into a common data class that the client can read.
/// </summary>
private BodyScannerInterfaceState PrepareBodyScannerInterfaceState(BodyTemplate template, Dictionary<string, BodyPart> bodyParts)
private BodyScannerInterfaceState PrepareBodyScannerInterfaceState(BodyTemplate.BodyTemplate template, Dictionary<string, BodyPart.BodyPart> bodyParts)
{
Dictionary<string, BodyScannerBodyPartData> partsData = new Dictionary<string, BodyScannerBodyPartData>();
foreach (var(slotname, bpart) in bodyParts) {