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

fix material reclaimer sound issue (#15278)

Browse Source 
* fix material reclaimer sound issue

* this, too
This commit is contained in:
Nemanja
2023-04-10 17:30:33 -04:00
committed by GitHub
parent 8ea9957736
commit 2d78c50f3e
4 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,6 +160,8 @@ public sealed class MaterialReclaimerSystem : SharedMaterialReclaimerSystem
if (!Resolve(uid, ref component)) if (!Resolve(uid, ref component))
return; return;
base.Reclaim(uid, item, completion, component);
var xform = Transform(uid); var xform = Transform(uid);
SpawnMaterialsFromComposition(uid, item, completion * component.Efficiency, xform: xform); SpawnMaterialsFromComposition(uid, item, completion * component.Efficiency, xform: xform);

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

@@ -3,7 +3,6 @@ using Content.Shared.Construction.Prototypes;
using Content.Shared.Whitelist; using Content.Shared.Whitelist;
using Robust.Shared.Audio; using Robust.Shared.Audio;
using Robust.Shared.GameStates; using Robust.Shared.GameStates;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;

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

@@ -34,6 +34,7 @@ public abstract class SharedMaterialReclaimerSystem : EntitySystem
{ {
SubscribeLocalEvent<MaterialReclaimerComponent, ComponentGetState>(OnGetState); SubscribeLocalEvent<MaterialReclaimerComponent, ComponentGetState>(OnGetState);
SubscribeLocalEvent<MaterialReclaimerComponent, ComponentHandleState>(OnHandleState); SubscribeLocalEvent<MaterialReclaimerComponent, ComponentHandleState>(OnHandleState);
SubscribeLocalEvent<MaterialReclaimerComponent, ComponentShutdown>(OnShutdown);
SubscribeLocalEvent<MaterialReclaimerComponent, EntityUnpausedEvent>(OnUnpaused); SubscribeLocalEvent<MaterialReclaimerComponent, EntityUnpausedEvent>(OnUnpaused);
SubscribeLocalEvent<MaterialReclaimerComponent, ExaminedEvent>(OnExamined); SubscribeLocalEvent<MaterialReclaimerComponent, ExaminedEvent>(OnExamined);
SubscribeLocalEvent<MaterialReclaimerComponent, GotEmaggedEvent>(OnEmagged); SubscribeLocalEvent<MaterialReclaimerComponent, GotEmaggedEvent>(OnEmagged);
@@ -60,6 +61,11 @@ public abstract class SharedMaterialReclaimerSystem : EntitySystem
component.ItemsProcessed = state.ItemsProcessed; 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) private void OnUnpaused(EntityUid uid, MaterialReclaimerComponent component, ref EntityUnpausedEvent args)
{ {
component.NextSound += args.PausedTime; component.NextSound += args.PausedTime;

1
Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml
View File

@@ -76,6 +76,7 @@
- IdCard - IdCard
tags: tags:
- HighRiskItem - HighRiskItem
soundCooldown: 0
sound: sound:
path: /Audio/Ambience/Objects/crushing.ogg path: /Audio/Ambience/Objects/crushing.ogg
params: params: