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

Fix 3000 errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 18:09:01 +01:00
parent 2bfec7ec62
commit 2a3b7d809d
569 changed files with 2979 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Power/Components/BaseCharger.cs
View File

@@ -88,7 +88,7 @@ namespace Content.Server.Power.Components
/// This will remove the item directly into the user's hand / floor
/// </summary>
/// <param name="user"></param>
public void RemoveItem(IEntity user)
public void RemoveItem(EntityUiduser)
{
var heldItem = Container.ContainedEntity;
if (heldItem == null)
@@ -134,7 +134,7 @@ namespace Content.Server.Power.Components
return CellChargerStatus.Charging;
}
public bool TryInsertItem(IEntity entity)
public bool TryInsertItem(EntityUid entity)
{
if (!IsEntityCompatible(entity) || HasCell)
{
@@ -152,9 +152,9 @@ namespace Content.Server.Power.Components
/// <summary>
/// If the supplied entity should fit into the charger.
/// </summary>
public abstract bool IsEntityCompatible(IEntity entity);
public abstract bool IsEntityCompatible(EntityUid entity);
protected abstract BatteryComponent? GetBatteryFrom(IEntity entity);
protected abstract BatteryComponent? GetBatteryFrom(EntityUid entity);
private void UpdateStatus()
{

4
Content.Server/Power/Components/CableComponent.cs
View File

@@ -2,10 +2,8 @@ using System.Threading.Tasks;
using Content.Server.Electrocution;
using Content.Server.Stack;
using Content.Server.Tools;
using Content.Server.Tools.Components;
using Content.Shared.Interaction;
using Content.Shared.Tools;
using Content.Shared.Tools.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Serialization.Manager.Attributes;
@@ -47,7 +45,7 @@ namespace Content.Server.Power.Components
if (EntitySystem.Get<ElectrocutionSystem>().TryDoElectrifiedAct(Owner, eventArgs.User)) return false;
IoCManager.Resolve<IEntityManager>().DeleteEntity((EntityUid) Owner);
IoCManager.Resolve<IEntityManager>().DeleteEntity(Owner);
var droppedEnt = IoCManager.Resolve<IEntityManager>().SpawnEntity(_cableDroppedOnCutPrototype, eventArgs.ClickLocation);
// TODO: Literally just use a prototype that has a single thing in the stack, it's not that complicated...