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

Fix master (#15256)

Browse Source
This commit is contained in:
metalgearsloth
2023-04-10 15:47:51 +10:00
committed by GitHub
parent 8e817e2b97
commit aebe31cfde
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Materials/MaterialReclaimerSystem.cs
View File

@@ -32,7 +32,7 @@ public sealed class MaterialReclaimerSystem : SharedMaterialReclaimerSystem
[Dependency] private readonly PopupSystem _popup = default!; [Dependency] private readonly PopupSystem _popup = default!;
[Dependency] private readonly SolutionContainerSystem _solutionContainer = default!; [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
[Dependency] private readonly SharedBodySystem _body = default!; //bobby [Dependency] private readonly SharedBodySystem _body = default!; //bobby
[Dependency] private readonly SpillableSystem _spillable = default!; [Dependency] private readonly PuddleSystem _puddle = default!;
[Dependency] private readonly StackSystem _stack = default!; [Dependency] private readonly StackSystem _stack = default!;
/// <inheritdoc/> /// <inheritdoc/>
@@ -255,7 +255,7 @@ public sealed class MaterialReclaimerSystem : SharedMaterialReclaimerSystem
if (overflow.Volume > 0) if (overflow.Volume > 0)
{ {
_spillable.SpillAt(reclaimer, overflow, reclaimerComponent.PuddleId, transformComponent: xform); _puddle.TrySpillAt(reclaimer, overflow, out _, transformComponent: xform);
} }
} }
} }

5
Content.Server/Spreader/SpreaderSystem.cs
View File

@@ -157,10 +157,7 @@ public sealed class SpreaderSystem : EntitySystem
// of an edge so we'll let them handle it. // of an edge so we'll let them handle it.
if (!groupUpdates.TryGetValue(node.NodeGroup, out var updates)) if (!groupUpdates.TryGetValue(node.NodeGroup, out var updates))
{ {
var spreadEv = new SpreadGroupUpdateRate() var spreadEv = new SpreadGroupUpdateRate(node.Name);
{
Name = node.Name,
};
RaiseLocalEvent(ref spreadEv); RaiseLocalEvent(ref spreadEv);
updates = (int) (spreadEv.UpdatesPerSecond * SpreadCooldown / TimeSpan.FromSeconds(1)); updates = (int) (spreadEv.UpdatesPerSecond * SpreadCooldown / TimeSpan.FromSeconds(1));
} }

6
Content.Shared/Materials/MaterialReclaimerComponent.cs
View File

@@ -84,12 +84,6 @@ public sealed class MaterialReclaimerComponent : Component
[DataField("solutionContainerId"), ViewVariables(VVAccess.ReadWrite)] [DataField("solutionContainerId"), ViewVariables(VVAccess.ReadWrite)]
public string SolutionContainerId = "output"; public string SolutionContainerId = "output";
/// <summary>
/// The prototype for the puddle
/// </summary>
[DataField("puddleId", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>)), ViewVariables(VVAccess.ReadWrite)]
public string PuddleId = "PuddleSmear";
/// <summary> /// <summary>
/// The solution itself. /// The solution itself.
/// </summary> /// </summary>