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

Fix stacks only recycling one instead of the stack amount (#38433)

Browse Source 
* fix

* Fixes
This commit is contained in:
beck-thompson
2025-06-18 14:14:01 -07:00
committed by GitHub
parent 3a611859f9
commit 72ea94a233
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ using Content.Shared.Materials;
using Content.Shared.Mind; using Content.Shared.Mind;
using Content.Shared.Nutrition.EntitySystems; using Content.Shared.Nutrition.EntitySystems;
using Content.Shared.Power; using Content.Shared.Power;
using Content.Shared.Stacks;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Shared.Player; using Robust.Shared.Player;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
@@ -214,9 +215,12 @@ public sealed class MaterialReclaimerSystem : SharedMaterialReclaimerSystem
if (!Resolve(item, ref composition, false)) if (!Resolve(item, ref composition, false))
return; return;
// If more of these checks are needed, use an event instead
var modifier = CompOrNull<StackComponent>(item)?.Count ?? 1.0f;
foreach (var (material, amount) in composition.MaterialComposition) foreach (var (material, amount) in composition.MaterialComposition)
{ {
var outputAmount = (int) (amount * efficiency); var outputAmount = (int) (amount * efficiency * modifier);
_materialStorage.TryChangeMaterialAmount(reclaimer, material, outputAmount, storage); _materialStorage.TryChangeMaterialAmount(reclaimer, material, outputAmount, storage);
} }