tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makes tools and welders ECS, add ToolQualityPrototype. (#4741)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-10-07 13:01:27 +02:00
committed by GitHub
parent f2760d0002
commit 365c7da4dc
44 changed files with 1144 additions and 863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Shared/Chemistry/EntitySystems/SolutionContainerSystem.cs
View File

@@ -208,7 +208,7 @@ namespace Content.Shared.Chemistry.EntitySystems
}
public bool TryGetSolution(IEntity? target, string name,
[NotNullWhen(true)] out Solution? solution)
[NotNullWhen(true)] out Solution? solution, SolutionContainerManagerComponent? solutionsMgr = null)
{
if (target == null || target.Deleted)
{
@@ -216,13 +216,12 @@ namespace Content.Shared.Chemistry.EntitySystems
return false;
}
return TryGetSolution(target.Uid, name, out solution);
return TryGetSolution(target.Uid, name, out solution, solutionsMgr);
}
public bool TryGetSolution(EntityUid uid, string name,
[NotNullWhen(true)] out Solution? solution)
public bool TryGetSolution(EntityUid uid, string name, [NotNullWhen(true)] out Solution? solution, SolutionContainerManagerComponent? solutionsMgr = null)
{
if (!EntityManager.TryGetComponent(uid, out SolutionContainerManagerComponent? solutionsMgr))
if (!Resolve(uid, ref solutionsMgr))
{
solution = null;
return false;