tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Typo, redundant string interpolation, namespaces and imports cleanup (#2068)

Browse Source 
* Readonly, typos and redundant string interpolations

* Namespaces

* Optimize imports

* Address reviews

* but actually

* Localize missing strings

* Remove redundant vars
This commit is contained in:
DrSmugleaf
2020-09-13 14:23:52 +02:00
committed by GitHub
parent 2e5838bb62
commit 74943a2770
213 changed files with 465 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Client/Chat/ChatManager.cs
View File

@@ -5,7 +5,6 @@ using Content.Shared.Chat;
using Robust.Client.Console;
using Robust.Client.Interfaces.Graphics.ClientEye;
using Robust.Client.Interfaces.UserInterface;
using Robust.Client.Player;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.GameObjects;

8
Content.Client/GameObjects/Components/ActionBlocking/CuffableComponent.cs
View File

@@ -1,10 +1,8 @@
using Robust.Client.Graphics;
using Robust.Client.Interfaces.ResourceManagement;
using Robust.Shared.IoC;
using Robust.Shared.GameObjects;
using Content.Shared.GameObjects.Components.ActionBlocking;
using Content.Shared.GameObjects.Components.ActionBlocking;
using Content.Shared.Preferences.Appearance;
using Robust.Client.GameObjects;
using Robust.Client.Graphics;
using Robust.Shared.GameObjects;
using Robust.Shared.Utility;
using Robust.Shared.ViewVariables;

7
Content.Client/GameObjects/Components/ActionBlocking/HandcuffComponent.cs
View File

@@ -1,8 +1,7 @@
using Robust.Shared.GameObjects;
using Content.Shared.GameObjects.Components.ActionBlocking;
using Robust.Client.Graphics;
using Content.Shared.GameObjects.Components.ActionBlocking;
using Robust.Client.GameObjects;
using Robust.Shared.Serialization;
using Robust.Client.Graphics;
using Robust.Shared.GameObjects;
namespace Content.Client.GameObjects.Components.ActionBlocking
{

1
Content.Client/GameObjects/Components/Actor/CharacterInterface.cs
View File

@@ -2,7 +2,6 @@
using System.Linq;
using Content.Client.GameObjects.Components.Mobs;
using Content.Client.UserInterface;
using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.Input;
using Robust.Client.GameObjects;
using Robust.Client.Interfaces.Input;

2
Content.Client/GameObjects/Components/Atmos/ExtinguisherVisualizer.cs
View File

@@ -1,4 +1,5 @@
using System;
using Content.Shared.GameObjects.Components;
using JetBrains.Annotations;
using Robust.Client.Animations;
using Robust.Client.GameObjects;
@@ -6,7 +7,6 @@ using Robust.Client.GameObjects.Components.Animations;
using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Shared.Animations;
using Robust.Shared.Maths;
using Content.Shared.GameObjects.Components;
namespace Content.Client.GameObjects.Components.Atmos
{

6
Content.Client/GameObjects/Components/Atmos/PipeVisualizer.cs
View File

@@ -1,15 +1,15 @@
using Content.Shared.GameObjects.Components.Atmos;
using System;
using Content.Shared.GameObjects.Components.Atmos;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Client.Graphics;
using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.ResourceManagement;
using Robust.Shared.GameObjects.Components.Renderable;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Utility;
using System;
using YamlDotNet.RepresentationModel;
namespace Content.Client.GameObjects.Components.Atmos

4
Content.Client/GameObjects/Components/Atmos/PumpVisualizer.cs
View File

@@ -1,4 +1,5 @@
using Content.Shared.GameObjects.Atmos;
using System;
using Content.Shared.GameObjects.Atmos;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Client.Graphics;
@@ -9,7 +10,6 @@ using Robust.Shared.GameObjects.Components.Renderable;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Utility;
using System;
using YamlDotNet.RepresentationModel;
namespace Content.Client.GameObjects.Components.Atmos

1
Content.Client/GameObjects/Components/Body/BodyManagerComponent.cs
View File

@@ -4,7 +4,6 @@ using Content.Client.GameObjects.Components.MedicalScanner;
using Content.Client.Interfaces.GameObjects.Components.Interaction;
using Content.Shared.GameObjects.Components.Body;
using Content.Shared.GameObjects.Components.Damage;
using Content.Shared.GameObjects.Components.Medical;
using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;

1
Content.Client/GameObjects/Components/Body/Scanner/BodyScannerDisplay.cs
View File

@@ -1,5 +1,4 @@
using System.Collections.Generic;
using System.Globalization;
using Content.Shared.Body.Scanner;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;

14
Content.Client/GameObjects/Components/Cargo/CargoConsoleBoundUserInterface.cs
View File

@@ -87,17 +87,17 @@ namespace Content.Client.GameObjects.Components.Cargo
{
base.UpdateState(state);
if (!(state is CargoConsoleInterfaceState cstate))
if (!(state is CargoConsoleInterfaceState cState))
return;
if (RequestOnly != cstate.RequestOnly)
if (RequestOnly != cState.RequestOnly)
{
RequestOnly = cstate.RequestOnly;
RequestOnly = cState.RequestOnly;
_menu.UpdateRequestOnly();
}
BankId = cstate.BankId;
BankName = cstate.BankName;
BankBalance = cstate.BankBalance;
ShuttleCapacity = cstate.ShuttleCapacity;
BankId = cState.BankId;
BankName = cState.BankName;
BankBalance = cState.BankBalance;
ShuttleCapacity = cState.ShuttleCapacity;
_menu.UpdateCargoCapacity();
_menu.UpdateBankData();
}

1
Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs
View File

@@ -5,7 +5,6 @@ using JetBrains.Annotations;
using Robust.Client.GameObjects.Components.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using static Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser.SharedReagentDispenserComponent;

7
Content.Client/GameObjects/Components/CloningPod/CloningPodBoundUserInterface.cs
View File

@@ -1,12 +1,7 @@
using System;
using System.Collections.Generic;
using Content.Shared.GameObjects.Components.Medical;
using System.Collections.Generic;
using JetBrains.Annotations;
using Robust.Client.GameObjects.Components.UserInterface;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using static Content.Shared.GameObjects.Components.Medical.SharedCloningPodComponent;
namespace Content.Client.GameObjects.Components.CloningPod

1
Content.Client/GameObjects/Components/CloningPod/CloningPodVisualizer.cs
View File

@@ -1,5 +1,4 @@
using System;
using Content.Shared.GameObjects.Components.Medical;
using Robust.Client.GameObjects;
using Robust.Client.Interfaces.GameObjects.Components;
using static Content.Shared.GameObjects.Components.Medical.SharedCloningPodComponent;

1
Content.Client/GameObjects/Components/CloningPod/CloningPodWindow.cs
View File

@@ -9,7 +9,6 @@ using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
using Robust.Shared.Localization;
using static Content.Shared.GameObjects.Components.Medical.SharedCloningPodComponent;
namespace Content.Client.GameObjects.Components.CloningPod

1
Content.Client/GameObjects/Components/Disposal/DisposalRouterBoundUserInterface.cs
View File

@@ -2,7 +2,6 @@
using JetBrains.Annotations;
using Robust.Client.GameObjects.Components.UserInterface;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.Localization;
using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalRouterComponent;
namespace Content.Client.GameObjects.Components.Disposal

1
Content.Client/GameObjects/Components/Disposal/DisposalTaggerBoundUserInterface.cs
View File

@@ -2,7 +2,6 @@
using JetBrains.Annotations;
using Robust.Client.GameObjects.Components.UserInterface;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.Localization;
using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalTaggerComponent;
namespace Content.Client.GameObjects.Components.Disposal

1
Content.Client/GameObjects/Components/ExpendableLightVisualizer.cs
View File

@@ -2,7 +2,6 @@
using Content.Shared.GameObjects.Components;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using System;
namespace Content.Client.GameObjects.Components
{

4
Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs
View File

@@ -169,8 +169,8 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
public void SendEquipMessage(Slots slot)
{
var equipmessage = new ClientInventoryMessage(slot, ClientInventoryUpdate.Equip);
SendNetworkMessage(equipmessage);
var equipMessage = new ClientInventoryMessage(slot, ClientInventoryUpdate.Equip);
SendNetworkMessage(equipMessage);
}
public void SendUseMessage(Slots slot)

4
Content.Client/GameObjects/Components/HUD/Inventory/StrippableBoundUserInterface.cs
View File

@@ -6,8 +6,8 @@ using JetBrains.Annotations;
using Robust.Client.GameObjects.Components.UserInterface;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.ViewVariables;
using Robust.Shared.Localization;
using Robust.Shared.ViewVariables;
using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
namespace Content.Client.GameObjects.Components.HUD.Inventory
@@ -56,7 +56,7 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
{
foreach (var (slot, name) in Inventory)
{
_strippingMenu.AddButton(EquipmentSlotDefines.SlotNames[slot], name, (ev) =>
_strippingMenu.AddButton(SlotNames[slot], name, (ev) =>
{
SendMessage(new StrippingInventoryButtonPressed(slot));
});

1
Content.Client/GameObjects/Components/Interactable/ExpendableLightComponent.cs
View File

@@ -1,7 +1,6 @@

using Content.Shared.GameObjects.Components;
using Robust.Shared.GameObjects;
using Robust.Client.GameObjects;
namespace Content.Client.GameObjects.Components.Interactable
{

2
Content.Client/GameObjects/Components/Items/ItemComponent.cs
View File

@@ -10,9 +10,9 @@ using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.Renderable;
using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Serialization;
using Robust.Shared.Utility;
using Robust.Shared.Maths;
using Robust.Shared.ViewVariables;
namespace Content.Client.GameObjects.Components.Items

10
Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs
View File

@@ -77,15 +77,15 @@ namespace Content.Client.GameObjects.Components.Kitchen
protected override void UpdateState(BoundUserInterfaceState state)
{
base.UpdateState(state);
if (!(state is MicrowaveUpdateUserInterfaceState cstate))
if (!(state is MicrowaveUpdateUserInterfaceState cState))
{
return;
}
_menu.ToggleBusyDisableOverlayPanel(cstate.IsMicrowaveBusy);
RefreshContentsDisplay(cstate.ReagentQuantities, cstate.ContainedSolids);
var currentlySelectedTimeButton = (Button) _menu.CookTimeButtonVbox.GetChild(cstate.ActiveButtonIndex);
_menu.ToggleBusyDisableOverlayPanel(cState.IsMicrowaveBusy);
RefreshContentsDisplay(cState.ReagentQuantities, cState.ContainedSolids);
var currentlySelectedTimeButton = (Button) _menu.CookTimeButtonVbox.GetChild(cState.ActiveButtonIndex);
currentlySelectedTimeButton.Pressed = true;
var label = cstate.ActiveButtonIndex <= 0 ? Loc.GetString("INSTANT") : cstate.CurrentCookTime.ToString();
var label = cState.ActiveButtonIndex <= 0 ? Loc.GetString("INSTANT") : cState.CurrentCookTime.ToString();
_menu._cookTimeInfoLabel.Text = $"{Loc.GetString("COOK TIME")}: {label}";
}

8
Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs
View File

@@ -35,11 +35,11 @@ namespace Content.Client.GameObjects.Components.Kitchen
sprite.LayerSetState(MicrowaveVisualizerLayers.BaseUnlit, "mw_running_unlit");
var audioParams = AudioParams.Default;
audioParams.Loop = true;
var schedSound = new ScheduledSound();
schedSound.Filename = "/Audio/Machines/microwave_loop.ogg";
schedSound.AudioParams = audioParams;
var scheduledSound = new ScheduledSound();
scheduledSound.Filename = "/Audio/Machines/microwave_loop.ogg";
scheduledSound.AudioParams = audioParams;
_loopingSoundComponent.StopAllSounds();
_loopingSoundComponent.AddScheduledSound(schedSound);
_loopingSoundComponent.AddScheduledSound(scheduledSound);
break;
default:

3
Content.Client/GameObjects/Components/LanternVisualizer.cs
View File

@@ -1,13 +1,10 @@
using System;
using Content.Shared.GameObjects.Components;
using JetBrains.Annotations;
using Robust.Client.Animations;
using Robust.Client.GameObjects;
using Robust.Client.GameObjects.Components.Animations;
using Robust.Shared.Animations;
using Robust.Shared.GameObjects;
using Robust.Shared.Utility;
using YamlDotNet.RepresentationModel;
namespace Content.Client.GameObjects.Components
{

14
Content.Client/GameObjects/Components/LightBehaviourComponent.cs
View File

@@ -1,19 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Content.Shared.GameObjects.Components;
using Robust.Client.Animations;
using Robust.Client.GameObjects;
using Robust.Client.GameObjects.Components.Animations;
using Robust.Shared.Animations;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.Random;
using Robust.Shared.Interfaces.Serialization;
using Robust.Shared.IoC;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
using Content.Shared.GameObjects.Components;
using Robust.Shared.Log;
using Robust.Shared.Maths;
using Robust.Shared.Interfaces.Serialization;
using Robust.Client.Animations;
using Robust.Client.GameObjects.Components.Animations;
using System.Linq;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
namespace Content.Client.GameObjects.Components
{

4
Content.Client/GameObjects/Components/Mobs/HumanoidAppearanceComponent.cs
View File

@@ -1,9 +1,9 @@
using Content.Shared.GameObjects.Components.Mobs;
using Content.Client.GameObjects.Components.ActionBlocking;
using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.Preferences;
using Content.Shared.Preferences.Appearance;
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;
using Content.Client.GameObjects.Components.ActionBlocking;
namespace Content.Client.GameObjects.Components.Mobs
{

4
Content.Client/GameObjects/Components/Movement/ClimbableComponent.cs
View File

@@ -1,5 +1,5 @@
using Robust.Shared.GameObjects;
using Content.Shared.GameObjects.Components.Movement;
using Content.Shared.GameObjects.Components.Movement;
using Robust.Shared.GameObjects;
namespace Content.Client.GameObjects.Components.Movement
{

6
Content.Client/GameObjects/Components/Movement/ClimbingComponent.cs
View File

@@ -1,8 +1,6 @@
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components;
using Content.Client.Interfaces.GameObjects.Components.Interaction;
using Content.Shared.GameObjects.Components.Movement;
using Content.Client.Interfaces.GameObjects.Components.Interaction;
using Content.Shared.Physics;
using Robust.Shared.GameObjects;
namespace Content.Client.GameObjects.Components.Movement
{

3
Content.Client/GameObjects/Components/PDA/PDABoundUserInterface.cs
View File

@@ -83,9 +83,8 @@ namespace Content.Client.GameObjects.Components.PDA
protected override void UpdateState(BoundUserInterfaceState state)
{
base.UpdateState(state);
DebugTools.Assert((state is PDAUBoundUserInterfaceState));
DebugTools.Assert(state is PDAUBoundUserInterfaceState);
var cstate = (PDAUBoundUserInterfaceState)state;
switch (state)
{
case PDAUpdateState msg:

3
Content.Client/GameObjects/Components/Power/AME/AMEControllerVisualizer.cs
View File

@@ -1,9 +1,6 @@
using Robust.Client.GameObjects;
using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Shared.Interfaces.GameObjects;
using System;
using System.Collections.Generic;
using System.Text;
using static Content.Shared.GameObjects.Components.Power.AME.SharedAMEControllerComponent;
namespace Content.Client.GameObjects.Components.Power.AME

3
Content.Client/GameObjects/Components/Power/AME/AMEVisualizer.cs
View File

@@ -1,9 +1,6 @@
using Robust.Client.GameObjects;
using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Shared.Interfaces.GameObjects;
using System;
using System.Collections.Generic;
using System.Text;
using static Content.Shared.GameObjects.Components.Power.AME.SharedAMEShieldComponent;
namespace Content.Client.GameObjects.Components.Power.AME

3
Content.Client/GameObjects/Components/Power/AME/AMEWindow.cs
View File

@@ -5,9 +5,6 @@ using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using System;
using System.Collections.Generic;
using System.Text;
using static Content.Shared.GameObjects.Components.Power.AME.SharedAMEControllerComponent;
namespace Content.Client.GameObjects.Components.Power.AME

2
Content.Client/GameObjects/Components/Research/ProtolatheDatabaseComponent.cs
View File

@@ -11,7 +11,7 @@ namespace Content.Client.GameObjects.Components.Research
[ComponentReference(typeof(SharedLatheDatabaseComponent))]
public class ProtolatheDatabaseComponent : SharedProtolatheDatabaseComponent
{
[Dependency] private IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
/// <summary>
/// Invoked when the database gets updated.

4
Content.Client/GameObjects/Components/Research/ResearchClientBoundUserInterface.cs
View File

@@ -37,8 +37,8 @@ namespace Content.Client.GameObjects.Components.Research
protected override void UpdateState(BoundUserInterfaceState state)
{
base.UpdateState(state);
if (!(state is SharedResearchClientComponent.ResearchClientBoundInterfaceState rstate)) return;
_menu.Populate(rstate.ServerCount, rstate.ServerNames, rstate.ServerIds, rstate.SelectedServerId);
if (!(state is SharedResearchClientComponent.ResearchClientBoundInterfaceState rState)) return;
_menu.Populate(rState.ServerCount, rState.ServerNames, rState.ServerIds, rState.SelectedServerId);
}
}

34
Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
View File

@@ -66,12 +66,12 @@ namespace Content.Client.GameObjects.Components.Storage
/// <summary>
/// Copies received values from server about contents of storage container
/// </summary>
/// <param name="storagestate"></param>
private void HandleStorageMessage(StorageHeldItemsMessage storagestate)
/// <param name="storageState"></param>
private void HandleStorageMessage(StorageHeldItemsMessage storageState)
{
StoredEntities = new Dictionary<EntityUid, int>(storagestate.StoredEntities);
StorageSizeUsed = storagestate.StorageSizeUsed;
StorageCapacityMax = storagestate.StorageSizeMax;
StoredEntities = new Dictionary<EntityUid, int>(storageState.StoredEntities);
StorageSizeUsed = storageState.StorageSizeUsed;
StorageCapacityMax = storageState.StorageSizeMax;
Window.BuildEntityList();
}
@@ -94,10 +94,10 @@ namespace Content.Client.GameObjects.Components.Storage
/// <summary>
/// Function for clicking one of the stored entity buttons in the UI, tells server to remove that entity
/// </summary>
/// <param name="entityuid"></param>
private void Interact(EntityUid entityuid)
/// <param name="entityUid"></param>
private void Interact(EntityUid entityUid)
{
SendNetworkMessage(new RemoveEntityMessage(entityuid));
SendNetworkMessage(new RemoveEntityMessage(entityUid));
}
/// <summary>
@@ -198,21 +198,21 @@ namespace Content.Client.GameObjects.Components.Storage
{
EntityList.DisposeAllChildren();
var storagelist = StorageEntity.StoredEntities;
var storageList = StorageEntity.StoredEntities;
foreach (var entityuid in storagelist)
foreach (var entityUid in storageList)
{
var entity = IoCManager.Resolve<IEntityManager>().GetEntity(entityuid.Key);
var entity = IoCManager.Resolve<IEntityManager>().GetEntity(entityUid.Key);
var button = new EntityButton()
{
EntityuID = entityuid.Key,
EntityUid = entityUid.Key,
MouseFilter = MouseFilterMode.Stop,
};
button.ActualButton.OnToggled += OnItemButtonToggled;
//Name and Size labels set
button.EntityName.Text = entity.Name;
button.EntitySize.Text = string.Format("{0}", entityuid.Value);
button.EntitySize.Text = string.Format("{0}", entityUid.Value);
//Gets entity sprite and assigns it to button texture
if (entity.TryGetComponent(out ISpriteComponent sprite))
@@ -226,12 +226,12 @@ namespace Content.Client.GameObjects.Components.Storage
//Sets information about entire storage container current capacity
if (StorageEntity.StorageCapacityMax != 0)
{
Information.Text = String.Format("Items: {0}, Stored: {1}/{2}", storagelist.Count,
Information.Text = String.Format("Items: {0}, Stored: {1}/{2}", storageList.Count,
StorageEntity.StorageSizeUsed, StorageEntity.StorageCapacityMax);
}
else
{
Information.Text = String.Format("Items: {0}", storagelist.Count);
Information.Text = String.Format("Items: {0}", storageList.Count);
}
}
@@ -243,7 +243,7 @@ namespace Content.Client.GameObjects.Components.Storage
{
var control = (EntityButton) args.Button.Parent;
args.Button.Pressed = false;
StorageEntity.Interact(control.EntityuID);
StorageEntity.Interact(control.EntityUid);
}
/// <summary>
@@ -265,7 +265,7 @@ namespace Content.Client.GameObjects.Components.Storage
/// </summary>
private class EntityButton : PanelContainer
{
public EntityUid EntityuID { get; set; }
public EntityUid EntityUid { get; set; }
public Button ActualButton { get; }
public SpriteView EntitySpriteView { get; }
public Control EntityControl { get; }

4
Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientBatteryBarrelComponent.cs
View File

@@ -1,4 +1,5 @@
using Content.Client.UserInterface.Stylesheets;
using System;
using Content.Client.UserInterface.Stylesheets;
using Content.Shared.GameObjects;
using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
using Robust.Client.Graphics.Drawing;
@@ -7,7 +8,6 @@ using Robust.Client.UserInterface.Controls;
using Robust.Shared.GameObjects;
using Robust.Shared.Maths;
using Robust.Shared.ViewVariables;
using System;
namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels
{

4
Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientBoltActionBarrelComponent.cs
View File

@@ -1,4 +1,5 @@
using Content.Client.UserInterface.Stylesheets;
using System;
using Content.Client.UserInterface.Stylesheets;
using Content.Client.Utility;
using Content.Shared.GameObjects;
using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
@@ -8,7 +9,6 @@ using Robust.Client.UserInterface.Controls;
using Robust.Shared.GameObjects;
using Robust.Shared.Maths;
using Robust.Shared.ViewVariables;
using System;
namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels
{

6
Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientPumpBarrelComponent.cs
View File

@@ -1,4 +1,5 @@
using Content.Client.UserInterface.Stylesheets;
using System;
using Content.Client.UserInterface.Stylesheets;
using Content.Client.Utility;
using Content.Shared.GameObjects;
using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
@@ -8,9 +9,6 @@ using Robust.Client.UserInterface.Controls;
using Robust.Shared.GameObjects;
using Robust.Shared.Maths;
using Robust.Shared.ViewVariables;
using System;
using System.Collections.Generic;
using System.Text;
namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels
{

7
Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientRevolverBarrelComponent.cs
View File

@@ -1,5 +1,4 @@
using Content.Client.UserInterface.Stylesheets;
using Content.Client.Utility;
using Content.Client.Utility;
using Content.Shared.GameObjects;
using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
using Robust.Client.Graphics;
@@ -8,10 +7,6 @@ using Robust.Client.UserInterface.Controls;
using Robust.Shared.GameObjects;
using Robust.Shared.Maths;
using Robust.Shared.ViewVariables;
using System;
using System.Collections.Generic;
using System.Runtime.InteropServices.ComTypes;
using System.Text;
namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels
{

2
Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs
View File

@@ -13,7 +13,7 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualize
{
base.InitializeEntity(entity);
var sprite = entity.GetComponent<ISpriteComponent>();
sprite.LayerSetState(RangedBarrelVisualLayers.Bolt, $"bolt-open");
sprite.LayerSetState(RangedBarrelVisualLayers.Bolt, "bolt-open");
}
public override void OnChangeData(AppearanceComponent component)

6
Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs
View File

@@ -380,7 +380,7 @@ namespace Content.Client.GameObjects.EntitySystems.AI
{
foreach (var route in AStarRoutes)
{
var highestgScore = route.GScores.Values.Max();
var highestGScore = route.GScores.Values.Max();
foreach (var (tile, score) in route.GScores)
{
@@ -399,8 +399,8 @@ namespace Content.Client.GameObjects.EntitySystems.AI
screenHandle.DrawRect(box, new Color(
0.0f,
score / highestgScore,
1.0f - (score / highestgScore),
score / highestGScore,
1.0f - (score / highestGScore),
0.1f));
}
}

2
Content.Client/GameObjects/EntitySystems/DragDropSystem.cs
View File

@@ -16,7 +16,6 @@ using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Input;
using Robust.Shared.Input.Binding;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Maths;
@@ -35,7 +34,6 @@ namespace Content.Client.GameObjects.EntitySystems
[Dependency] private readonly IInputManager _inputManager = default!;
[Dependency] private readonly IEyeManager _eyeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IMapManager _mapManager = default!;
// drag will be triggered when mouse leaves this deadzone around the click position.
private const float DragDeadzone = 2f;

1
Content.Client/Instruments/InstrumentMenu.cs
View File

@@ -1,7 +1,6 @@
using Content.Client.GameObjects.Components.Instruments;
using Content.Client.UserInterface.Stylesheets;
using Content.Client.Utility;
using Content.Shared.Utility;
using Robust.Client.Audio.Midi;
using Robust.Client.Graphics.Drawing;
using Robust.Client.Interfaces.UserInterface;

4
Content.Client/Interfaces/IClientGameTicker.cs
View File

@@ -1,6 +1,6 @@
using Robust.Shared.Network;
using System;
using System;
using System.Collections.Generic;
using Robust.Shared.Network;
using static Content.Shared.SharedGameTicker;
namespace Content.Client.Interfaces

7
Content.Client/Sandbox/SandboxManager.cs
View File

@@ -1,12 +1,9 @@
using System;
using Content.Client.UserInterface;
using Content.Client.GameObjects.EntitySystems;
using Content.Shared.Input;
using Content.Shared.Sandbox;
using Robust.Client.Console;
using Robust.Client.Interfaces.Console;
using Robust.Client.Interfaces.Input;
using Robust.Client.Interfaces.Graphics.Lighting;
using Robust.Client.Interfaces.Placement;
using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.UserInterface.Controls;
@@ -213,7 +210,7 @@ namespace Content.Client.Sandbox
private void OnToggleSubfloorButtonClicked(BaseButton.ButtonEventArgs args)
{
ToggleSubfloor();
ToggleSubFloor();
}
private void OnShowMarkersButtonClicked(BaseButton.ButtonEventArgs args)
@@ -278,7 +275,7 @@ namespace Content.Client.Sandbox
_console.ProcessCommand("togglelight");
}
private void ToggleSubfloor()
private void ToggleSubFloor()
{
_console.ProcessCommand("showsubfloor");
}

6
Content.Client/State/GameScreenBase.cs
View File

@@ -181,9 +181,9 @@ namespace Content.Client.State
}
*/
var transx = x.clicked.Transform;
var transy = y.clicked.Transform;
val = transx.Coordinates.Y.CompareTo(transy.Coordinates.Y);
var transX = x.clicked.Transform;
var transY = y.clicked.Transform;
val = transX.Coordinates.Y.CompareTo(transY.Coordinates.Y);
if (val != 0)
{
return val;

6
Content.Client/State/LobbyState.cs
View File

@@ -1,4 +1,6 @@
using Content.Client.Interfaces;
using System;
using System.Linq;
using Content.Client.Interfaces;
using Content.Client.Interfaces.Chat;
using Content.Client.UserInterface;
using Content.Shared.Input;
@@ -16,8 +18,6 @@ using Robust.Shared.Localization;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
using Robust.Shared.ViewVariables;
using System;
using System.Linq;
using static Content.Shared.SharedGameTicker;
namespace Content.Client.State

10
Content.Client/State/MainMenu.cs
View File

@@ -36,7 +36,7 @@ namespace Content.Client.State
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
private MainMenuControl _mainMenuControl;
private OptionsMenu OptionsMenu;
private OptionsMenu _optionsMenu;
private bool _isConnecting;
// ReSharper disable once InconsistentNaming
@@ -56,7 +56,7 @@ namespace Content.Client.State
_client.RunLevelChanged += RunLevelChanged;
OptionsMenu = new OptionsMenu();
_optionsMenu = new OptionsMenu();
}
/// <inheritdoc />
@@ -66,7 +66,7 @@ namespace Content.Client.State
_netManager.ConnectFailed -= _onConnectFailed;
_mainMenuControl.Dispose();
OptionsMenu.Dispose();
_optionsMenu.Dispose();
}
private void QuitButtonPressed(BaseButton.ButtonEventArgs args)
@@ -76,7 +76,7 @@ namespace Content.Client.State
private void OptionsButtonPressed(BaseButton.ButtonEventArgs args)
{
OptionsMenu.OpenCentered();
_optionsMenu.OpenCentered();
}
private void DirectConnectButtonPressed(BaseButton.ButtonEventArgs args)
@@ -315,7 +315,7 @@ namespace Content.Client.State
VersionLabel = new Label
{
Text = $"v0.1"
Text = "v0.1"
};
LayoutContainer.SetAnchorPreset(VersionLabel, LayoutContainer.LayoutPreset.BottomRight);

2
Content.Client/StationEvents/RadiationPulseOverlay.cs
View File

@@ -13,7 +13,7 @@ using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC;
using Color = Robust.Shared.Maths.Color;
using Robust.Shared.Maths;
namespace Content.Client.StationEvents
{

4
Content.Client/StationEvents/StationEventManager.cs
View File

@@ -1,9 +1,9 @@
#nullable enable
using System;
using System.Collections.Generic;
using Content.Shared.StationEvents;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC;
using System;
using System.Collections.Generic;
namespace Content.Client.StationEvents
{

4
Content.Client/UserInterface/AdminMenu/AdminMenuManager.cs
View File

@@ -1,11 +1,11 @@
using Content.Shared.Input;
using System.Collections.Generic;
using Content.Shared.Input;
using Robust.Client.Console;
using Robust.Client.Interfaces.Input;
using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.Input.Binding;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC;
using System.Collections.Generic;
namespace Content.Client.UserInterface.AdminMenu
{

44
Content.Client/UserInterface/AdminMenu/AdminMenuWindow.cs
View File

@@ -1,4 +1,7 @@
#nullable enable
using System;
using System.Collections.Generic;
using System.Linq;
using Content.Client.GameObjects.EntitySystems;
using Content.Client.StationEvents;
using Content.Shared.Atmos;
@@ -18,54 +21,51 @@ using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using Robust.Shared.Utility;
using System;
using System.Collections.Generic;
using System.Linq;
using static Robust.Client.UserInterface.Controls.BaseButton;
namespace Content.Client.UserInterface.AdminMenu
{
public class AdminMenuWindow : SS14Window
{
public TabContainer MasterTabContainer;
public VBoxContainer PlayerList;
public Label PlayerCount;
public readonly TabContainer MasterTabContainer;
public readonly VBoxContainer PlayerList;
public readonly Label PlayerCount;
protected override Vector2? CustomSize => (500, 250);
private List<CommandButton> _adminButtons = new List<CommandButton>
private readonly List<CommandButton> _adminButtons = new List<CommandButton>
{
new KickCommandButton(),
new DirectCommandButton("Admin Ghost", "aghost"),
//TODO: teleport
};
private List<CommandButton> _adminbusButtons = new List<CommandButton>
private readonly List<CommandButton> _adminbusButtons = new List<CommandButton>
{
new SpawnEntitiesCommandButton(),
new SpawnTilesCommandButton(),
new StationEventsCommandButton(),
};
private List<CommandButton> _debugButtons = new List<CommandButton>
private readonly List<CommandButton> _debugButtons = new List<CommandButton>
{
new AddAtmosCommandButton(),
new FillGasCommandButton(),
};
private List<CommandButton> _roundButtons = new List<CommandButton>
private readonly List<CommandButton> _roundButtons = new List<CommandButton>
{
new DirectCommandButton("Start Round", "startround"),
new DirectCommandButton("End Round", "endround"),
new DirectCommandButton("Restart Round", "restartround"),
};
private List<CommandButton> _serverButtons = new List<CommandButton>
private readonly List<CommandButton> _serverButtons = new List<CommandButton>
{
new DirectCommandButton("Reboot", "restart"),
new DirectCommandButton("Shutdown", "shutdown"),
};
private static readonly Color SeparatorColor = Color.FromHex("#3D4059");
private class HSeperator : Control
private class HSeparator : Control
{
public HSeperator()
public HSeparator()
{
AddChild(new PanelContainer {
PanelOverride = new StyleBoxFlat
@@ -135,7 +135,7 @@ namespace Content.Client.UserInterface.AdminMenu
header
}
});
PlayerList.AddChild(new HSeperator());
PlayerList.AddChild(new HSeparator());
var useAltColor = false;
foreach (var player in sessions)
@@ -464,7 +464,7 @@ namespace Content.Client.UserInterface.AdminMenu
public override string RequiredCommand => "events";
public override string? SubmitText => "Run";
private CommandUIDropDown _eventsDropDown = new CommandUIDropDown
private readonly CommandUIDropDown _eventsDropDown = new CommandUIDropDown
{
Name = "Event",
GetData = () =>
@@ -487,7 +487,7 @@ namespace Content.Client.UserInterface.AdminMenu
Name = "Pause",
Handler = () =>
{
IoCManager.Resolve<IClientConsole>().ProcessCommand($"events pause");
IoCManager.Resolve<IClientConsole>().ProcessCommand("events pause");
},
},
new CommandUIButton
@@ -495,7 +495,7 @@ namespace Content.Client.UserInterface.AdminMenu
Name = "Resume",
Handler = () =>
{
IoCManager.Resolve<IClientConsole>().ProcessCommand($"events resume");
IoCManager.Resolve<IClientConsole>().ProcessCommand("events resume");
},
},
};
@@ -511,14 +511,14 @@ namespace Content.Client.UserInterface.AdminMenu
public override string Name => "Kick";
public override string RequiredCommand => "kick";
private CommandUIDropDown _playerDropDown = new CommandUIDropDown
private readonly CommandUIDropDown _playerDropDown = new CommandUIDropDown
{
Name = "Player",
GetData = () => IoCManager.Resolve<IPlayerManager>().Sessions.ToList<object>(),
GetDisplayName = (obj) => $"{((IPlayerSession) obj).Name} ({((IPlayerSession) obj).AttachedEntity?.Name})",
GetValueFromData = (obj) => ((IPlayerSession) obj).Name,
};
private CommandUILineEdit _reason = new CommandUILineEdit
private readonly CommandUILineEdit _reason = new CommandUILineEdit
{
Name = "Reason"
};
@@ -540,7 +540,7 @@ namespace Content.Client.UserInterface.AdminMenu
public override string Name => "Add Atmos";
public override string RequiredCommand => "addatmos";
private CommandUIDropDown _grid = new CommandUIDropDown
private readonly CommandUIDropDown _grid = new CommandUIDropDown
{
Name = "Grid",
GetData = () => IoCManager.Resolve<IMapManager>().GetAllGrids().Where(g => (int) g.Index != 0).ToList<object>(),
@@ -564,7 +564,7 @@ namespace Content.Client.UserInterface.AdminMenu
public override string Name => "Fill Gas";
public override string RequiredCommand => "fillgas";
private CommandUIDropDown _grid = new CommandUIDropDown
private readonly CommandUIDropDown _grid = new CommandUIDropDown
{
Name = "Grid",
GetData = () => IoCManager.Resolve<IMapManager>().GetAllGrids().Where(g => (int) g.Index != 0).ToList<object>(),
@@ -572,7 +572,7 @@ namespace Content.Client.UserInterface.AdminMenu
GetValueFromData = (obj) => ((IMapGrid) obj).Index.ToString(),
};
private CommandUIDropDown _gas = new CommandUIDropDown
private readonly CommandUIDropDown _gas = new CommandUIDropDown
{
Name = "Gas",
GetData = () =>

19
Content.Client/UserInterface/KeyRebindControl.cs
View File

@@ -1,19 +0,0 @@
using System;
using System.Collections.Generic;
using Content.Client.UserInterface.Stylesheets;
using Content.Shared.Input;
using Robust.Client.Input;
using Robust.Client.Interfaces.Input;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.Input;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
#nullable enable
namespace Content.Client.UserInterface
{
}

2
Content.Client/UserInterface/LobbyGui.cs
View File

@@ -9,8 +9,6 @@ using Robust.Client.UserInterface.Controls;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using System;
using System.Collections.Generic;
namespace Content.Client.UserInterface
{

16
Content.Client/UserInterface/RoundEndSummaryWindow.cs
View File

@@ -53,9 +53,9 @@ namespace Content.Client.UserInterface
//Round end text
if (!string.IsNullOrEmpty(roundEnd))
{
var roundendLabel = new RichTextLabel();
roundendLabel.SetMarkup(Loc.GetString(roundEnd));
RoundEndSummaryTab.AddChild(roundendLabel);
var roundEndLabel = new RichTextLabel();
roundEndLabel.SetMarkup(Loc.GetString(roundEnd));
RoundEndSummaryTab.AddChild(roundEndLabel);
}
//Duration
@@ -72,27 +72,27 @@ namespace Content.Client.UserInterface
//Put observers at the bottom of the list. Put antags on top.
var manifestSortedList = info.OrderBy(p => p.Observer).ThenBy(p => !p.Antag);
//Create labels for each player info.
foreach (var plyinfo in manifestSortedList)
foreach (var playerInfo in manifestSortedList)
{
var playerInfoText = new RichTextLabel()
{
SizeFlagsVertical = SizeFlags.Fill,
};
if (plyinfo.Observer)
if (playerInfo.Observer)
{
playerInfoText.SetMarkup(
Loc.GetString("[color=gray]{0}[/color] was [color=lightblue]{1}[/color], an observer.",
plyinfo.PlayerOOCName, plyinfo.PlayerICName));
playerInfo.PlayerOOCName, playerInfo.PlayerICName));
}
else
{
//TODO: On Hover display a popup detailing more play info.
//For example: their antag goals and if they completed them sucessfully.
var icNameColor = plyinfo.Antag ? "red" : "white";
var icNameColor = playerInfo.Antag ? "red" : "white";
playerInfoText.SetMarkup(
Loc.GetString("[color=gray]{0}[/color] was [color={1}]{2}[/color] playing role of [color=orange]{3}[/color].",
plyinfo.PlayerOOCName, icNameColor, plyinfo.PlayerICName, Loc.GetString(plyinfo.Role)));
playerInfo.PlayerOOCName, icNameColor, playerInfo.PlayerICName, Loc.GetString(playerInfo.Role)));
}
innerScrollContainer.AddChild(playerInfoText);
}

1
Content.Client/UserInterface/StrippingMenu.cs
View File

@@ -3,7 +3,6 @@ using Content.Client.UserInterface.Stylesheets;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.Map;
using Robust.Shared.Maths;
namespace Content.Client.UserInterface

1
Content.Client/Utility/RangeExtensions.cs
View File

@@ -4,7 +4,6 @@ using Robust.Client.Player;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using static Content.Shared.GameObjects.EntitySystems.SharedInteractionSystem;

1
Content.IntegrationTests/ContentIntegrationTest.cs
View File

@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Threading.Tasks;
using Content.Client;

1
Content.IntegrationTests/Tests/AI/AiControllerTest.cs
View File

@@ -11,7 +11,6 @@ using Robust.Shared.Interfaces.Map;
using Robust.Shared.Interfaces.Reflection;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
namespace Content.IntegrationTests.Tests.AI

2
Content.IntegrationTests/Tests/EntityTest.cs
View File

@@ -10,9 +10,7 @@ using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.Log;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using Logger = Robust.Shared.Log.Logger;
namespace Content.IntegrationTests.Tests
{

16
Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/CuffUnitTest.cs
View File

@@ -1,20 +1,20 @@
#nullable enable
using System.Linq;
using System.Threading.Tasks;
using Content.Client.GameObjects.Components.Items;
using Content.Server.Body;
using Content.Server.GameObjects.Components.ActionBlocking;
using Content.Server.GameObjects.Components.Body;
using Content.Server.Interfaces.GameObjects.Components.Items;
using Content.Shared.Body.Part;
using Content.Shared.GameObjects.Components.Body;
using NUnit.Framework;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Content.Server.GameObjects.Components.ActionBlocking;
using System.Linq;
using Content.Server.GameObjects.Components.Body;
using Content.Shared.Body.Part;
using Content.Shared.GameObjects.Components.Body;
using Content.Server.Interfaces.GameObjects.Components.Items;
using Robust.Shared.Prototypes;
using Content.Server.Body;
using Content.Client.GameObjects.Components.Items;
namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking
{

6
Content.IntegrationTests/Tests/GameObjects/Components/Movement/ClimbUnitTest.cs
View File

@@ -1,14 +1,14 @@
#nullable enable
using System.Threading.Tasks;
using Content.Server.GameObjects.Components.Movement;
using Content.Shared.Physics;
using NUnit.Framework;
using Robust.Shared.GameObjects.Components;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Content.Server.GameObjects.Components.Movement;
using Content.Shared.Physics;
using Robust.Shared.GameObjects.Components;
namespace Content.IntegrationTests.Tests.GameObjects.Components.Movement
{

1
Content.IntegrationTests/Tests/GravityGridTest.cs
View File

@@ -7,7 +7,6 @@ using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
namespace Content.IntegrationTests.Tests
{

2
Content.IntegrationTests/Tests/GridTileLookupTest.cs
View File

@@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
@@ -6,7 +5,6 @@ using NUnit.Framework;
using Robust.Server.GameObjects.EntitySystems.TileLookup;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.Log;
using Robust.Shared.Map;
using Robust.Shared.Maths;

1
Content.IntegrationTests/Tests/InventoryHelpersTest.cs
View File

@@ -3,7 +3,6 @@ using Content.Server.GameObjects.Components.GUI;
using Content.Server.GameObjects.Components.Items.Storage;
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.Utility;
using Content.Shared.GameObjects.Components.Inventory;
using NUnit.Framework;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map;

1
Content.IntegrationTests/Tests/MindEntityDeletionTest.cs
View File

@@ -10,7 +10,6 @@ using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
namespace Content.IntegrationTests.Tests
{

7
Content.IntegrationTests/Tests/PowerTest.cs
View File

@@ -1,14 +1,13 @@
using Content.Server.GameObjects.Components.Power;
using System.Threading.Tasks;
using Content.Server.GameObjects.Components.Power;
using Content.Server.GameObjects.Components.Power.ApcNetComponents;
using Content.Server.GameObjects.Components.Power.PowerNetComponents;
using Content.Shared.Utility;
using NUnit.Framework;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using System.Threading.Tasks;
using Content.Shared.Utility;
namespace Content.IntegrationTests.Tests
{

1
Content.IntegrationTests/Tests/StationEvents/StationEventsSystemTest.cs
View File

@@ -1,5 +1,4 @@
using System.Threading.Tasks;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.GameObjects.EntitySystems.StationEvents;
using NUnit.Framework;
using Robust.Shared.GameObjects.Systems;

1
Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs
View File

@@ -1,7 +1,6 @@
using Content.Server.AI.Utility;
using Content.Server.AI.WorldState.States.Inventory;
using Content.Server.GameObjects.Components.Items.Storage;
using Content.Server.Utility;
using Content.Shared.Interfaces.GameObjects.Components;
using Content.Shared.Utility;
using Robust.Shared.Interfaces.GameObjects;

1
Content.Server/AI/Operators/Inventory/InteractWithEntityOperator.cs
View File

@@ -1,6 +1,5 @@
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.EntitySystems.Click;
using Content.Server.Utility;
using Content.Shared.Utility;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;

1
Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs
View File

@@ -2,7 +2,6 @@
using Content.Server.AI.Utility;
using Content.Server.AI.WorldState.States.Inventory;
using Content.Server.GameObjects.Components.Items.Storage;
using Content.Server.Utility;
using Content.Shared.Interfaces.GameObjects.Components;
using Content.Shared.Utility;
using Robust.Shared.Containers;

1
Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs
View File

@@ -2,7 +2,6 @@
using Content.Server.GameObjects.Components.GUI;
using Content.Server.GameObjects.Components.Items.Storage;
using Content.Server.GameObjects.EntitySystems.Click;
using Content.Server.Utility;
using Content.Shared.Utility;
using Robust.Shared.Containers;
using Robust.Shared.Interfaces.GameObjects;

1
Content.Server/AI/Utility/Actions/Nutrition/Drink/PickUpDrink.cs
View File

@@ -3,7 +3,6 @@ using System.Collections.Generic;
using Content.Server.AI.Operators.Sequences;
using Content.Server.AI.Utility.Considerations;
using Content.Server.AI.Utility.Considerations.Containers;
using Content.Server.AI.Utility.Considerations.Hands;
using Content.Server.AI.Utility.Considerations.Movement;
using Content.Server.AI.Utility.Considerations.Nutrition.Drink;
using Content.Server.AI.WorldState;

1
Content.Server/AI/Utility/Considerations/Combat/TargetHealthCon.cs
View File

@@ -1,6 +1,5 @@
using Content.Server.AI.WorldState;
using Content.Server.AI.WorldState.States;
using Content.Server.GameObjects.Components.Damage;
using Content.Shared.GameObjects.Components.Damage;
namespace Content.Server.AI.Utility.Considerations.Combat

3
Content.Server/AI/Utility/ExpandableActions/Combat/Melee/MeleeAttackNearbyExp.cs
View File

@@ -6,12 +6,9 @@ using Content.Server.AI.Utility.Considerations;
using Content.Server.AI.Utility.Considerations.Combat.Melee;
using Content.Server.AI.WorldState;
using Content.Server.AI.WorldState.States;
using Content.Server.GameObjects.Components.AI;
using Content.Server.GameObjects.Components.Movement;
using Content.Server.GameObjects.EntitySystems.AI;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
namespace Content.Server.AI.Utility.ExpandableActions.Combat.Melee

3
Content.Server/AI/Utility/ExpandableActions/Combat/Melee/UnarmedAttackNearbyPlayerExp.cs
View File

@@ -4,13 +4,10 @@ using Content.Server.AI.Utility.Actions;
using Content.Server.AI.Utility.Actions.Combat.Melee;
using Content.Server.AI.Utility.Considerations;
using Content.Server.AI.Utility.Considerations.Combat.Melee;
using Content.Server.AI.Utils;
using Content.Server.AI.WorldState;
using Content.Server.AI.WorldState.States;
using Content.Server.GameObjects.Components.Movement;
using Content.Server.GameObjects.EntitySystems.AI;
using Content.Shared.GameObjects.Components.Body;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.IoC;

1
Content.Server/Administration/WarpCommand.cs
View File

@@ -9,7 +9,6 @@ using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
namespace Content.Server.Administration
{

2
Content.Server/Atmos/GasMixture.cs
View File

@@ -9,8 +9,6 @@ using Content.Server.Interfaces;
using Content.Shared.Atmos;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.Serialization;
using Robust.Shared.IoC;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;

9
Content.Server/Atmos/GasVaporComponent.cs
View File

@@ -1,5 +1,7 @@
using Content.Shared.Physics;
using Content.Server.Atmos.Reactions;
using Content.Server.Atmos.Reactions;
using Content.Server.Interfaces;
using Content.Shared.Atmos;
using Content.Shared.Physics;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components;
using Robust.Shared.Interfaces.GameObjects;
@@ -8,9 +10,6 @@ using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
using Content.Server.Interfaces;
using Content.Shared.Atmos;
using Robust.Shared.Map;
namespace Content.Server.Atmos
{

3
Content.Server/Atmos/Reactions/PhoronFireReaction.cs
View File

@@ -1,12 +1,9 @@
#nullable enable
using System;
using Content.Server.Interfaces;
using Content.Server.Interfaces.GameObjects.Components.Interaction;
using Content.Shared.Atmos;
using Content.Shared.Maps;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.Map;
using Robust.Shared.Serialization;
namespace Content.Server.Atmos.Reactions

2
Content.Server/Atmos/Reactions/TritiumFireReaction.cs
View File

@@ -1,8 +1,6 @@
#nullable enable
using Content.Server.Interfaces;
using Content.Server.Interfaces.GameObjects.Components.Interaction;
using Content.Shared.Atmos;
using Content.Shared.Maps;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization;

1
Content.Server/Atmos/TileAtmosInfo.cs
View File

@@ -1,6 +1,5 @@
using System;
using Content.Shared.Atmos;
using Robust.Shared.Maths;
using Robust.Shared.ViewVariables;
namespace Content.Server.Atmos

1
Content.Server/Atmos/TileAtmosphere.cs
View File

@@ -10,7 +10,6 @@ using Content.Server.Utility;
using Content.Shared.Atmos;
using Content.Shared.Audio;
using Content.Shared.Maps;
using Content.Shared.Utility;
using JetBrains.Annotations;
using Robust.Server.GameObjects.EntitySystems;
using Robust.Server.GameObjects.EntitySystems.TileLookup;

4
Content.Server/Body/BodyCommands.cs
View File

@@ -1,4 +1,6 @@
#nullable enable
using System;
using System.Linq;
using Content.Server.GameObjects.Components.Body;
using Content.Shared.Body.Part;
using Content.Shared.Damage;
@@ -12,8 +14,6 @@ using Robust.Shared.Interfaces.Random;
using Robust.Shared.IoC;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using System;
using System.Linq;
namespace Content.Server.Body
{

1
Content.Server/Body/Mechanisms/Mechanism.cs
View File

@@ -3,7 +3,6 @@ using System;
using System.Collections.Generic;
using Content.Server.Body.Mechanisms.Behaviors;
using Content.Server.GameObjects.Components.Body;
using Content.Server.GameObjects.Components.Metabolism;
using Content.Shared.Body.Mechanism;
using Content.Shared.GameObjects.Components.Body;
using Robust.Shared.IoC;

2
Content.Server/Chat/ChatCommands.cs
View File

@@ -8,6 +8,7 @@ using Content.Server.Interfaces.GameObjects;
using Content.Server.Observer;
using Content.Server.Players;
using Content.Server.Utility;
using Content.Shared.Damage;
using Content.Shared.GameObjects.Components.Damage;
using Content.Shared.Interfaces;
using Robust.Server.Interfaces.Console;
@@ -16,7 +17,6 @@ using Robust.Shared.Enums;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Content.Shared.Damage;
namespace Content.Server.Chat
{

7
Content.Server/Chat/ChatManager.cs
View File

@@ -1,4 +1,6 @@
using Content.Server.GameObjects.Components.Observer;
using System.Collections.Generic;
using System.Linq;
using Content.Server.GameObjects.Components.Observer;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces;
using Content.Server.Interfaces.Chat;
@@ -11,9 +13,6 @@ using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using System;
using System.Collections.Generic;
using System.Linq;
using static Content.Server.Interfaces.Chat.IChatManager;
namespace Content.Server.Chat

4
Content.Server/EntryPoint.cs
View File

@@ -1,9 +1,10 @@
using Content.Server.AI.Utility.Considerations;
using Content.Server.AI.WorldState;
using Content.Server.Body.Network;
using Content.Server.GameObjects.Components.Mobs.Speech;
using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
using Content.Server.Interfaces;
using Content.Server.Interfaces.Chat;
using Content.Server.Body.Network;
using Content.Server.Interfaces.GameTicking;
using Content.Server.Interfaces.PDA;
using Content.Server.Sandbox;
@@ -15,7 +16,6 @@ using Robust.Shared.Interfaces.Log;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Timing;
using Content.Server.GameObjects.Components.Mobs.Speech;
namespace Content.Server
{

2
Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs
View File

@@ -117,7 +117,7 @@ namespace Content.Server.GameObjects.Components.Access
if (!newAccessList.TrueForAll(x => _prototypeManager.HasIndex<AccessLevelPrototype>(x)))
{
Logger.Warning($"Tried to write unknown access tag.");
Logger.Warning("Tried to write unknown access tag.");
return;
}
var targetIdAccess = targetIdEntity.GetComponent<AccessComponent>();

32
Content.Server/GameObjects/Components/ActionBlocking/CuffableComponent.cs
View File

@@ -1,27 +1,27 @@
using Robust.Server.GameObjects;
using System;
using System.Collections.Generic;
using System.Linq;
using Content.Server.GameObjects.Components.GUI;
using Content.Server.GameObjects.Components.Items.Storage;
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.EntitySystems.DoAfter;
using Content.Server.Interfaces.GameObjects.Components.Items;
using Content.Shared.GameObjects.Components.ActionBlocking;
using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.GameObjects.Verbs;
using Content.Shared.Interfaces;
using Content.Shared.Utility;
using Robust.Server.GameObjects;
using Robust.Server.GameObjects.Components.Container;
using Robust.Server.GameObjects.EntitySystems;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Localization;
using Content.Server.GameObjects.EntitySystems.DoAfter;
using Robust.Shared.ViewVariables;
using Content.Server.Interfaces.GameObjects.Components.Items;
using Content.Shared.GameObjects.Components.ActionBlocking;
using Content.Shared.GameObjects.Verbs;
using Content.Server.GameObjects.Components.Items.Storage;
using Robust.Shared.Log;
using System.Linq;
using Robust.Server.GameObjects.Components.Container;
using Robust.Server.GameObjects.EntitySystems;
using Content.Server.GameObjects.Components.Mobs;
using Content.Shared.GameObjects.Components.Mobs;
using Robust.Shared.Maths;
using System;
using System.Collections.Generic;
using Content.Shared.Utility;
using Content.Server.GameObjects.Components.GUI;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.ActionBlocking
{

21
Content.Server/GameObjects/Components/ActionBlocking/HandcuffComponent.cs
View File

@@ -1,22 +1,21 @@
using Content.Server.GameObjects.EntitySystems.DoAfter;
using System;
using Content.Server.GameObjects.Components.GUI;
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.EntitySystems.DoAfter;
using Content.Shared.GameObjects.Components.ActionBlocking;
using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.Interfaces;
using Content.Shared.Interfaces.GameObjects.Components;
using Content.Shared.Utility;
using Robust.Server.GameObjects.EntitySystems;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Content.Server.GameObjects.Components.GUI;
using Robust.Shared.Serialization;
using Robust.Shared.Log;
using Robust.Shared.Localization;
using Robust.Shared.ViewVariables;
using Robust.Server.GameObjects.EntitySystems;
using Content.Shared.GameObjects.Components.ActionBlocking;
using Content.Server.GameObjects.Components.Mobs;
using Robust.Shared.Log;
using Robust.Shared.Maths;
using System;
using Content.Shared.Utility;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.ActionBlocking
{

1
Content.Server/GameObjects/Components/Atmos/AtmosExposedComponent.cs
View File

@@ -1,6 +1,5 @@
using Content.Server.Atmos;
using Content.Server.GameObjects.Components.Temperature;
using Content.Shared.Atmos;
using Robust.Shared.GameObjects;
namespace Content.Server.GameObjects.Components.Atmos

3
Content.Server/GameObjects/Components/Atmos/BarotraumaComponent.cs
View File

@@ -3,11 +3,10 @@ using System.Runtime.CompilerServices;
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.Interfaces.GameObjects;
using Content.Shared.Atmos;
using Content.Shared.GameObjects.Components.Damage;
using Content.Shared.Damage;
using Content.Shared.GameObjects.Components.Damage;
using Content.Shared.GameObjects.Components.Mobs;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
namespace Content.Server.GameObjects.Components.Atmos
{

8
Content.Server/GameObjects/Components/Atmos/Piping/Pumps/BasePumpComponent.cs
View File

@@ -1,15 +1,15 @@
using Content.Server.Atmos;
using System.Linq;
using Content.Server.Atmos;
using Content.Server.GameObjects.Components.NodeContainer;
using Content.Server.GameObjects.Components.NodeContainer.Nodes;
using Content.Shared.GameObjects.Components.Atmos;
using Content.Shared.GameObjects.Atmos;
using Content.Shared.GameObjects.Components.Atmos;
using Robust.Server.GameObjects;
using Robust.Shared.Log;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
using System.Linq;
namespace Content.Server.GameObjects.Components.Atmos.Piping
namespace Content.Server.GameObjects.Components.Atmos.Piping.Pumps
{
/// <summary>
/// Transfer gas from one <see cref="PipeNode"/> to another.

4
Content.Server/GameObjects/Components/Atmos/Piping/Pumps/PressurePumpComponent.cs
View File

@@ -1,8 +1,8 @@
using Content.Server.Atmos;
using System;
using Content.Server.Atmos;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
using System;
namespace Content.Server.GameObjects.Components.Atmos.Piping.Pumps
{

6
Content.Server/GameObjects/Components/Atmos/Piping/Pumps/VolumePumpComponent.cs
View File

@@ -1,10 +1,8 @@
using Content.Server.Atmos;
using Content.Shared.Atmos;
using System;
using Content.Server.Atmos;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
using System;
using System.Diagnostics;
namespace Content.Server.GameObjects.Components.Atmos.Piping.Pumps
{

10
Content.Server/GameObjects/Components/Atmos/Piping/Scrubbers/BaseSiphonComponent.cs
View File

@@ -1,17 +1,17 @@
using Content.Server.Atmos;
using System.Linq;
using Content.Server.Atmos;
using Content.Server.GameObjects.Components.NodeContainer;
using Content.Server.GameObjects.Components.NodeContainer.Nodes;
using Content.Server.GameObjects.EntitySystems;
using Content.Shared.GameObjects.Atmos;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Log;
using Robust.Shared.ViewVariables;
using System.Linq;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Atmos.Piping
namespace Content.Server.GameObjects.Components.Atmos.Piping.Scrubbers
{
/// <summary>
/// Transfers gas from the tile it is on to a <see cref="PipeNode"/>.

2
Content.Server/GameObjects/Components/Atmos/Piping/Scrubbers/DebugSiphonComponent.cs
View File

@@ -1,7 +1,7 @@
using Content.Server.Atmos;
using Robust.Shared.GameObjects;
namespace Content.Server.GameObjects.Components.Atmos.Piping
namespace Content.Server.GameObjects.Components.Atmos.Piping.Scrubbers
{
/// <summary>
/// Placeholder example of scrubber functionality.

10
Content.Server/GameObjects/Components/Atmos/Piping/Vents/BaseVentComponent.cs
View File

@@ -1,17 +1,17 @@
using Content.Server.Atmos;
using System.Linq;
using Content.Server.Atmos;
using Content.Server.GameObjects.Components.NodeContainer;
using Content.Server.GameObjects.Components.NodeContainer.Nodes;
using Content.Server.GameObjects.EntitySystems;
using Content.Shared.GameObjects.Atmos;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Log;
using Robust.Shared.ViewVariables;
using System.Linq;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Atmos.Piping
namespace Content.Server.GameObjects.Components.Atmos.Piping.Vents
{
/// <summary>
/// Transfers gas from a <see cref="PipeNode"/> to the tile it is on.

2
Content.Server/GameObjects/Components/Atmos/Piping/Vents/DebugVentComponent.cs
View File

@@ -1,7 +1,7 @@
using Content.Server.Atmos;
using Robust.Shared.GameObjects;
namespace Content.Server.GameObjects.Components.Atmos.Piping
namespace Content.Server.GameObjects.Components.Atmos.Piping.Vents
{
/// <summary>
/// Placeholder example of vent functionality.

Some files were not shown because too many files have changed in this diff Show More