diff --git a/Content.Server/Materials/MaterialReclaimerSystem.cs b/Content.Server/Materials/MaterialReclaimerSystem.cs index e46e82de02..367daf3f0a 100644 --- a/Content.Server/Materials/MaterialReclaimerSystem.cs +++ b/Content.Server/Materials/MaterialReclaimerSystem.cs @@ -160,6 +160,8 @@ public sealed class MaterialReclaimerSystem : SharedMaterialReclaimerSystem if (!Resolve(uid, ref component)) return; + base.Reclaim(uid, item, completion, component); + var xform = Transform(uid); SpawnMaterialsFromComposition(uid, item, completion * component.Efficiency, xform: xform); diff --git a/Content.Shared/Materials/MaterialReclaimerComponent.cs b/Content.Shared/Materials/MaterialReclaimerComponent.cs index 283ade2cd9..b29776a851 100644 --- a/Content.Shared/Materials/MaterialReclaimerComponent.cs +++ b/Content.Shared/Materials/MaterialReclaimerComponent.cs @@ -3,7 +3,6 @@ using Content.Shared.Construction.Prototypes; using Content.Shared.Whitelist; using Robust.Shared.Audio; using Robust.Shared.GameStates; -using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; diff --git a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs index 18a744e80d..8d8784a173 100644 --- a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs +++ b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs @@ -34,6 +34,7 @@ public abstract class SharedMaterialReclaimerSystem : EntitySystem { SubscribeLocalEvent(OnGetState); SubscribeLocalEvent(OnHandleState); + SubscribeLocalEvent(OnShutdown); SubscribeLocalEvent(OnUnpaused); SubscribeLocalEvent(OnExamined); SubscribeLocalEvent(OnEmagged); @@ -60,6 +61,11 @@ public abstract class SharedMaterialReclaimerSystem : EntitySystem component.ItemsProcessed = state.ItemsProcessed; } + private void OnShutdown(EntityUid uid, MaterialReclaimerComponent component, ComponentShutdown args) + { + component.Stream?.Stop(); + } + private void OnUnpaused(EntityUid uid, MaterialReclaimerComponent component, ref EntityUnpausedEvent args) { component.NextSound += args.PausedTime; diff --git a/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml b/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml index 26d4adf09d..a7d637af72 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml @@ -76,6 +76,7 @@ - IdCard tags: - HighRiskItem + soundCooldown: 0 sound: path: /Audio/Ambience/Objects/crushing.ogg params: