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

10
Content.Client/Health/BodySystem/BodyScanner/BodyScannerBoundUserInterface.cs
View File

@@ -1,12 +1,10 @@
using Content.Client.UserInterface;
using Content.Shared.BodySystem;
using System.Collections.Generic;
using Content.Shared.Health.BodySystem.BodyScanner;
using Robust.Client.GameObjects.Components.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.ViewVariables;
using System.Collections.Generic;
namespace Content.Client.BodySystem
namespace Content.Client.Health.BodySystem.BodyScanner
{
public class BodyScannerBoundUserInterface : BoundUserInterface
{
@@ -40,7 +38,7 @@ namespace Content.Client.BodySystem
_template = scannerState.Template;
_parts = scannerState.Parts;
_display.UpdateDisplay(_template, _parts);
}

18
Content.Client/Health/BodySystem/BodyScanner/BodyScannerDisplay.cs
View File

@@ -1,20 +1,14 @@
using Content.Client.BodySystem;
using Content.Shared.BodySystem;
using Robust.Client.Graphics.Drawing;
using Robust.Client.Interfaces.ResourceManagement;
using System.Collections.Generic;
using System.Globalization;
using Content.Shared.Health.BodySystem.BodyScanner;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.Utility;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Utility;
using System;
using System.Collections.Generic;
using System.Globalization;
using static Robust.Client.UserInterface.Controls.ItemList;
namespace Content.Client.UserInterface
namespace Content.Client.Health.BodySystem.BodyScanner
{
public sealed class BodyScannerDisplay : SS14Window
{
@@ -33,7 +27,7 @@ namespace Content.Client.UserInterface
private BodyScannerTemplateData _template;
private Dictionary<string, BodyScannerBodyPartData> _parts;
private List<string> _slots;
private List<string> _slots;
private BodyScannerBodyPartData _currentBodyPart;
@@ -100,7 +94,7 @@ namespace Content.Client.UserInterface
public void UpdateDisplay(BodyScannerTemplateData template, Dictionary<string, BodyScannerBodyPartData> parts)
{
_template = template;
_template = template;
_parts = parts;
_slots = new List<string>();
BodyPartList.Clear();

11
Content.Client/Health/BodySystem/Surgery/GenericSurgeryBoundUserInterface.cs
View File

@@ -1,15 +1,8 @@
using System;
using System.Collections.Generic;
using Content.Shared.Health.BodySystem.Surgery;
using Robust.Client.GameObjects.Components.UserInterface;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.IoC;
using Robust.Shared.Prototypes;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.Players;
using Content.Shared.BodySystem;
namespace Content.Client.BodySystem
namespace Content.Client.Health.BodySystem.Surgery
{
//TODO : Make window close if target or surgery tool gets too far away from user.

11
Content.Client/Health/BodySystem/Surgery/GenericSurgeryWindow.cs
View File

@@ -1,14 +1,13 @@
using Robust.Client.UserInterface;
using System;
using System.Collections.Generic;
using System.Globalization;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Text;
namespace Content.Client.BodySystem
namespace Content.Client.Health.BodySystem.Surgery
{
public class GenericSurgeryWindow : SS14Window
{