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

Revert "Update submodule to 175.0.0 (#21318)" (#21319)

Browse Source
This commit is contained in:
metalgearsloth
2023-10-29 15:29:30 +11:00
committed by GitHub
parent 4f6ea2aef6
commit 5b8f3c48c4
327 changed files with 437 additions and 891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,8 +8,6 @@ using Content.Shared.Emag.Systems;
using Content.Shared.Examine;
using Content.Shared.Mobs.Components;
using Content.Shared.Stacks;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Containers;
using Robust.Shared.Physics.Events;
using Robust.Shared.Timing;
@@ -50,7 +48,7 @@ public abstract class SharedMaterialReclaimerSystem : EntitySystem
private void OnShutdown(EntityUid uid, MaterialReclaimerComponent component, ComponentShutdown args)
{
_audio.Stop(component.Stream);
component.Stream?.Stop();
}
private void OnUnpaused(EntityUid uid, MaterialReclaimerComponent component, ref EntityUnpausedEvent args)
@@ -118,7 +116,8 @@ public abstract class SharedMaterialReclaimerSystem : EntitySystem
if (Timing.CurTime > component.NextSound)
{
component.Stream = _audio.PlayPredicted(component.Sound, uid, user)?.Entity;
component.Stream = _audio.PlayPredicted(component.Sound, uid, user);
component.NextSound = Timing.CurTime + component.SoundCooldown;
}
@@ -168,11 +167,9 @@ public abstract class SharedMaterialReclaimerSystem : EntitySystem
component.ItemsProcessed++;
if (component.CutOffSound)
{
_audio.Stop(component.Stream);
}
component.Stream?.Stop();
Dirty(uid, component);
Dirty(component);
}
/// <summary>
@@ -184,7 +181,7 @@ public abstract class SharedMaterialReclaimerSystem : EntitySystem
return;
component.Enabled = enabled;
AmbientSound.SetAmbience(uid, enabled && component.Powered);
Dirty(uid, component);
Dirty(component);
}
/// <summary>