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

6
Content.Server/Kitchen/Components/KitchenSpikeComponent.cs
View File

@@ -73,7 +73,7 @@ namespace Content.Server.Kitchen.Components
}
}
private bool Spikeable(IEntity user, IEntity victim, [NotNullWhen(true)] out SharedButcherableComponent? butcherable)
private bool Spikeable(EntityUid user, EntityUid victim, [NotNullWhen(true)] out SharedButcherableComponent? butcherable)
{
butcherable = null;
@@ -95,7 +95,7 @@ namespace Content.Server.Kitchen.Components
return true;
}
public async void TrySpike(IEntity victim, IEntity user)
public async void TrySpike(EntityUid victim, EntityUiduser)
{
var victimUid = (EntityUid) victim;
if (_beingButchered.Contains(victimUid)) return;
@@ -159,7 +159,7 @@ namespace Content.Server.Kitchen.Components
SoundSystem.Play(Filter.Pvs(Owner), SpikeSound.GetSound(), Owner);
}
SuicideKind ISuicideAct.Suicide(IEntity victim, IChatManager chat)
SuicideKind ISuicideAct.Suicide(EntityUid victim, IChatManager chat)
{
var othersMessage = Loc.GetString("comp-kitchen-spike-suicide-other", ("victim", victim));
victim.PopupMessageOtherClients(othersMessage);

14
Content.Server/Kitchen/Components/MicrowaveComponent.cs
View File

@@ -14,7 +14,6 @@ using Content.Shared.Acts;
using Content.Shared.Body.Components;
using Content.Shared.Body.Part;
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.Reagent;
using Content.Shared.FixedPoint;
using Content.Shared.Interaction;
using Content.Shared.Kitchen;
@@ -29,7 +28,6 @@ using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
@@ -189,7 +187,7 @@ namespace Content.Server.Kitchen.Components
UserInterface?.SetState(new MicrowaveUpdateUserInterfaceState
(
solution.Contents.ToArray(),
_storage.ContainedEntities.Select(item => (EntityUid) item).ToArray(),
_storage.ContainedEntities.Select(item => item).ToArray(),
_busy,
_currentCookTimeButtonIndex,
_currentCookTimerTime
@@ -411,7 +409,7 @@ namespace Content.Server.Kitchen.Components
{
var item = _storage.ContainedEntities.ElementAt(i);
_storage.Remove(item);
IoCManager.Resolve<IEntityManager>().DeleteEntity((EntityUid) item);
IoCManager.Resolve<IEntityManager>().DeleteEntity(item);
}
}
@@ -433,7 +431,7 @@ namespace Content.Server.Kitchen.Components
private void SubtractContents(FoodRecipePrototype recipe)
{
var solutionUid = (EntityUid) Owner;
var solutionUid = Owner;
if (!EntitySystem.Get<SolutionContainerSystem>().TryGetSolution(Owner, SolutionName, out var solution))
{
return;
@@ -459,7 +457,7 @@ namespace Content.Server.Kitchen.Components
if (IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(item).EntityPrototype.ID == recipeSolid.Key)
{
_storage.Remove(item);
IoCManager.Resolve<IEntityManager>().DeleteEntity((EntityUid) item);
IoCManager.Resolve<IEntityManager>().DeleteEntity(item);
break;
}
}
@@ -469,7 +467,7 @@ namespace Content.Server.Kitchen.Components
private MicrowaveSuccessState CanSatisfyRecipe(FoodRecipePrototype recipe, Dictionary<string, int> solids)
{
if (_currentCookTimerTime != (uint) recipe.CookTime)
if (_currentCookTimerTime != recipe.CookTime)
{
return MicrowaveSuccessState.RecipeFail;
}
@@ -513,7 +511,7 @@ namespace Content.Server.Kitchen.Components
SoundSystem.Play(Filter.Pvs(Owner), _clickSound.GetSound(), Owner, AudioParams.Default.WithVolume(-2f));
}
SuicideKind ISuicideAct.Suicide(IEntity victim, IChatManager chat)
SuicideKind ISuicideAct.Suicide(EntityUid victim, IChatManager chat)
{
var headCount = 0;

26
Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
View File

@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using Content.Server.Chemistry.EntitySystems;
using Content.Server.Hands.Components;
@@ -22,7 +21,6 @@ using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Log;
using Robust.Shared.Player;
using Robust.Shared.Utility;
namespace Content.Server.Kitchen.EntitySystems
{
@@ -62,7 +60,7 @@ namespace Content.Server.Kitchen.EntitySystems
return;
}
IEntity heldEnt = args.Used;
EntityUidheldEnt = args.Used;
// First, check if user is trying to insert a beaker.
// No promise it will be a beaker right now, but whatever.
@@ -196,7 +194,7 @@ namespace Content.Server.Kitchen.EntitySystems
if (component.Chamber.ContainedEntities.TryFirstOrDefault(x => x == msg.EntityID, out var ent))
{
component.Chamber.Remove(ent);
ent.RandomOffset(0.4f);
SharedEntityExtensions.RandomOffset(ent, 0.4f);
EnqueueUiUpdate(component);
ClickSound(component);
}
@@ -242,7 +240,7 @@ namespace Content.Server.Kitchen.EntitySystems
IoCManager.Resolve<IEntityManager>().TryGetComponent(comp.Owner, out ApcPowerReceiverComponent? receiver) && receiver.Powered,
canJuice,
canGrind,
comp.Chamber.ContainedEntities.Select(item => (EntityUid) item).ToArray(),
comp.Chamber.ContainedEntities.Select(item => item).ToArray(),
//Remember the beaker can be null!
comp.HeldBeaker?.Contents.ToArray()
));
@@ -253,7 +251,7 @@ namespace Content.Server.Kitchen.EntitySystems
/// Tries to eject whatever is in the beaker slot. Puts the item in the user's hands or failing that on top
/// of the grinder.
/// </summary>
private void EjectBeaker(ReagentGrinderComponent component, IEntity? user)
private void EjectBeaker(ReagentGrinderComponent component, EntityUid user)
{
if (component.BeakerContainer.ContainedEntity == null || component.HeldBeaker == null || component.Busy)
return;
@@ -282,7 +280,7 @@ namespace Content.Server.Kitchen.EntitySystems
/// The wzhzhzh of the grinder. Processes the contents of the grinder and puts the output in the beaker.
/// </summary>
/// <param name="isJuiceIntent">true for wanting to juice, false for wanting to grind.</param>
private void DoWork(ReagentGrinderComponent component, IEntity user,
private void DoWork(ReagentGrinderComponent component, EntityUid user,
SharedReagentGrinderComponent.GrinderProgram program)
{
//Have power, are we busy, chamber has anything to grind, a beaker for the grounds to go?
@@ -304,7 +302,7 @@ namespace Content.Server.Kitchen.EntitySystems
SoundSystem.Play(Filter.Pvs(component.Owner), component.GrindSound.GetSound(), component.Owner, AudioParams.Default);
// Get each item inside the chamber and get the reagents it contains.
// Transfer those reagents to the beaker, given we have one in.
component.Owner.SpawnTimer(component.WorkTime, (Action) (() =>
component.Owner.SpawnTimer(component.WorkTime, () =>
{
foreach (var item in component.Chamber.ContainedEntities.ToList())
{
@@ -319,18 +317,18 @@ namespace Content.Server.Kitchen.EntitySystems
solution.ScaleSolution(juiceEvent.Scalar);
_solutionsSystem.TryAddSolution(beakerEntity, component.HeldBeaker, solution);
_solutionsSystem.RemoveAllSolution(beakerEntity, solution);
IoCManager.Resolve<IEntityManager>().DeleteEntity((EntityUid) item);
IoCManager.Resolve<IEntityManager>().DeleteEntity(item);
}
component.Busy = false;
EnqueueUiUpdate(component);
bui?.SendMessage(new SharedReagentGrinderComponent.ReagentGrinderWorkCompleteMessage());
}));
});
break;
case SharedReagentGrinderComponent.GrinderProgram.Juice:
SoundSystem.Play(Filter.Pvs(component.Owner), component.JuiceSound.GetSound(), component.Owner, AudioParams.Default);
component.Owner.SpawnTimer(component.WorkTime, (Action) (() =>
component.Owner.SpawnTimer(component.WorkTime, () =>
{
foreach (var item in component.Chamber.ContainedEntities.ToList())
{
@@ -351,13 +349,13 @@ namespace Content.Server.Kitchen.EntitySystems
component.HeldBeaker.MaxVolume) continue;
juiceMe.JuiceSolution.ScaleSolution(juiceEvent.Scalar);
_solutionsSystem.TryAddSolution(beakerEntity, component.HeldBeaker, juiceMe.JuiceSolution);
IoCManager.Resolve<IEntityManager>().DeleteEntity((EntityUid) item);
IoCManager.Resolve<IEntityManager>().DeleteEntity(item);
}
bui?.SendMessage(new SharedReagentGrinderComponent.ReagentGrinderWorkCompleteMessage());
component.Busy = false;
EnqueueUiUpdate(component);
}));
});
break;
}
}