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

Fix warnings and code cleanup/fixes (#13570)

Browse Source
This commit is contained in:
Visne
2023-01-19 03:56:45 +01:00
committed by GitHub
parent 3ca5a0224b
commit c6d3e4f3bd
265 changed files with 499 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Power/EntitySystems/ApcSystem.cs
View File

@@ -199,7 +199,7 @@ namespace Content.Server.Power.EntitySystems
{
if (!EntityManager.TryGetComponent(args.Used, out ToolComponent? tool))
return;
if (_toolSystem.UseTool(args.Used, args.User, uid, 0f, ScrewTime, new string[] { "Screwing" }, doAfterCompleteEvent: new ApcToolFinishedEvent(uid), toolComponent: tool))
if (_toolSystem.UseTool(args.Used, args.User, uid, 0f, ScrewTime, new[] { "Screwing" }, doAfterCompleteEvent: new ApcToolFinishedEvent(uid), toolComponent: tool))
{
args.Handled = true;
}

4
Content.Server/Power/EntitySystems/ChargerSystem.cs
View File

@@ -50,7 +50,7 @@ internal sealed class ChargerSystem : EntitySystem
TransferPower(charger.Owner, slot.Item!.Value, charger, frameTime);
}
}
private void OnPowerChanged(EntityUid uid, ChargerComponent component, ref PowerChangedEvent args)
{
UpdateStatus(uid, component);
@@ -63,7 +63,7 @@ internal sealed class ChargerSystem : EntitySystem
if (args.Container.ID != component.SlotId)
return;
UpdateStatus(uid, component);
}

9
Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs
View File

@@ -51,13 +51,12 @@ internal sealed class PowerMonitoringConsoleSystem : EntitySystem
var netQ = ncComp.GetNode<Node>("hv").NodeGroup as PowerNet;
if (netQ != null)
{
var net = netQ!;
foreach (PowerConsumerComponent pcc in net.Consumers)
foreach (PowerConsumerComponent pcc in netQ.Consumers)
{
loads.Add(LoadOrSource(pcc, pcc.DrawRate, false));
totalLoads += pcc.DrawRate;
}
foreach (BatteryChargerComponent pcc in net.Chargers)
foreach (BatteryChargerComponent pcc in netQ.Chargers)
{
if (!TryComp(pcc.Owner, out PowerNetworkBatteryComponent? batteryComp))
{
@@ -67,12 +66,12 @@ internal sealed class PowerMonitoringConsoleSystem : EntitySystem
loads.Add(LoadOrSource(pcc, rate, true));
totalLoads += rate;
}
foreach (PowerSupplierComponent pcc in net.Suppliers)
foreach (PowerSupplierComponent pcc in netQ.Suppliers)
{
sources.Add(LoadOrSource(pcc, pcc.MaxSupply, false));
totalSources += pcc.MaxSupply;
}
foreach (BatteryDischargerComponent pcc in net.Dischargers)
foreach (BatteryDischargerComponent pcc in netQ.Dischargers)
{
if (!TryComp(pcc.Owner, out PowerNetworkBatteryComponent? batteryComp))
{