Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Content audio (#20862)

Browse Source
This commit is contained in:
metalgearsloth
2023-10-29 14:58:23 +11:00
committed by GitHub
parent cd280eef6b
commit 9b1b3e03ed
326 changed files with 890 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Storage/EntitySystems/CursedEntityStorageSystem.cs
View File

@@ -5,6 +5,9 @@ using Content.Shared.Storage.Components;
using Robust.Shared.Audio;
using Robust.Shared.Player;
using Robust.Shared.Random;
using System.Linq;
using Content.Shared.Storage.Components;
using Robust.Shared.Audio.Systems;
namespace Content.Server.Storage.EntitySystems;
@@ -12,6 +15,7 @@ public sealed class CursedEntityStorageSystem : EntitySystem
{
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly EntityStorageSystem _entityStorage = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
public override void Initialize()
{
@@ -47,6 +51,7 @@ public sealed class CursedEntityStorageSystem : EntitySystem
storage.Contents.Remove(entity);
_entityStorage.AddToContents(entity, lockerEnt);
}
SoundSystem.Play(component.CursedSound.GetSound(), Filter.Pvs(uid), uid, AudioHelpers.WithVariation(0.125f, _random));
_audio.PlayPvs(component.CursedSound, uid, AudioHelpers.WithVariation(0.125f, _random));
}
}

6
Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
View File

@@ -5,6 +5,7 @@ using Content.Shared.Database;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Interaction.Events;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Map;
using Robust.Shared.Player;
using Robust.Shared.Random;
@@ -18,6 +19,7 @@ namespace Content.Server.Storage.EntitySystems
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
[Dependency] private readonly SharedHandsSystem _hands = default!;
[Dependency] private readonly PricingSystem _pricing = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
public override void Initialize()
{
@@ -79,7 +81,9 @@ namespace Content.Server.Storage.EntitySystems
}
if (component.Sound != null)
SoundSystem.Play(component.Sound.GetSound(), Filter.Pvs(uid), uid);
{
_audio.PlayPvs(component.Sound, uid);
}
component.Uses--;

2
Content.Server/Storage/EntitySystems/StorageSystem.cs
View File

@@ -93,7 +93,7 @@ public sealed partial class StorageSystem : SharedStorageSystem
UpdateStorageVisualization(uid, storageComp);
if (storageComp.StorageCloseSound is not null)
Audio.Play(storageComp.StorageCloseSound, Filter.Pvs(uid, entityManager: EntityManager), uid, true, storageComp.StorageCloseSound.Params);
Audio.PlayEntity(storageComp.StorageCloseSound, Filter.Pvs(uid, entityManager: EntityManager), uid, true, storageComp.StorageCloseSound.Params);
}
}