Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

2
Content.Server/Recycling/Components/RecyclableComponent.cs
View File

@@ -38,7 +38,7 @@ namespace Content.Server.Recycling.Components
}
IoCManager.Resolve<IEntityManager>().QueueDeleteEntity((EntityUid) Owner);
IoCManager.Resolve<IEntityManager>().QueueDeleteEntity(Owner);
}
}
}

4
Content.Server/Recycling/Components/RecyclerComponent.cs
View File

@@ -1,14 +1,12 @@
using Content.Server.Act;
using Content.Server.Chat.Managers;
using Content.Server.GameTicking;
using Content.Server.Mind.Components;
using Content.Server.Players;
using Content.Server.Popups;
using Content.Shared.Body.Components;
using Content.Shared.Popups;
using Content.Shared.Recycling;
using Robust.Server.GameObjects;
using Robust.Server.Player;
using Robust.Shared.Analyzers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
@@ -47,7 +45,7 @@ namespace Content.Server.Recycling.Components
}
}
SuicideKind ISuicideAct.Suicide(IEntity victim, IChatManager chat)
SuicideKind ISuicideAct.Suicide(EntityUid victim, IChatManager chat)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(victim, out ActorComponent? actor) && actor.PlayerSession.ContentData()?.Mind is {} mind)
{

7
Content.Server/Recycling/RecyclerSystem.cs
View File

@@ -1,13 +1,10 @@
using System.Collections.Generic;
using Content.Server.Power.Components;
using Content.Server.Recycling.Components;
using Content.Shared.Body.Components;
using Content.Shared.Recycling;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Physics;
using Robust.Shared.Physics.Dynamics;
using Robust.Shared.Utility;
namespace Content.Server.Recycling
{
@@ -24,7 +21,7 @@ namespace Content.Server.Recycling
Recycle(component, args.OtherFixture.Body.Owner);
}
private void Recycle(RecyclerComponent component, IEntity entity)
private void Recycle(RecyclerComponent component, EntityUid entity)
{
// TODO: Prevent collision with recycled items
@@ -42,7 +39,7 @@ namespace Content.Server.Recycling
recyclable.Recycle(component.Efficiency);
}
private bool CanGib(RecyclerComponent component, IEntity entity)
private bool CanGib(RecyclerComponent component, EntityUid entity)
{
// We suppose this entity has a Recyclable component.
return IoCManager.Resolve<IEntityManager>().HasComponent<SharedBodyComponent>(entity) && !component.Safe &&