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

Inline Delete

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 11:43:03 +01:00
parent f10ed6c0c3
commit e3227546b3
53 changed files with 80 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -154,7 +154,7 @@ namespace Content.Server.Kitchen.Components
Owner.PopupMessageEveryone(Loc.GetString("comp-kitchen-spike-kill", ("user", user), ("victim", victim)));
// TODO: Need to be able to leave them on the spike to do DoT, see ss13.
victim.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(victim.Uid);
SoundSystem.Play(Filter.Pvs(Owner), SpikeSound.GetSound(), Owner);
}

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

@@ -411,7 +411,7 @@ namespace Content.Server.Kitchen.Components
{
var item = _storage.ContainedEntities.ElementAt(i);
_storage.Remove(item);
item.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(item.Uid);
}
}
@@ -459,7 +459,7 @@ namespace Content.Server.Kitchen.Components
if (IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(item.Uid).EntityPrototype.ID == recipeSolid.Key)
{
_storage.Remove(item);
item.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(item.Uid);
break;
}
}

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

@@ -319,7 +319,7 @@ namespace Content.Server.Kitchen.EntitySystems
solution.ScaleSolution(juiceEvent.Scalar);
_solutionsSystem.TryAddSolution(beakerEntity.Uid, component.HeldBeaker, solution);
_solutionsSystem.RemoveAllSolution(beakerEntity.Uid, solution);
item.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(item.Uid);
}
component.Busy = false;
@@ -351,7 +351,7 @@ namespace Content.Server.Kitchen.EntitySystems
component.HeldBeaker.MaxVolume) continue;
juiceMe.JuiceSolution.ScaleSolution(juiceEvent.Scalar);
_solutionsSystem.TryAddSolution(beakerEntity.Uid, component.HeldBeaker, juiceMe.JuiceSolution);
item.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(item.Uid);
}
bui?.SendMessage(new SharedReagentGrinderComponent.ReagentGrinderWorkCompleteMessage());