Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

2
Content.Server/Weapons/Melee/Balloon/BalloonPopperSystem.cs
View File

@@ -4,6 +4,8 @@ using Content.Shared.IdentityManagement;
using Content.Shared.Popups;
using Content.Shared.Tag;
using Content.Shared.Weapons.Melee.Events;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
namespace Content.Server.Weapons.Melee.Balloon;

6
Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs
View File

@@ -12,6 +12,8 @@ using Content.Shared.Weapons.Melee;
using Content.Shared.Weapons.Melee.Events;
using Content.Shared.Wieldable;
using Content.Shared.Wieldable.Components;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Player;
using Robust.Shared.Random;
@@ -116,7 +118,7 @@ public sealed class EnergySwordSystem : EntitySystem
if (comp.IsSharp)
RemComp<SharpComponent>(uid);
_audio.Play(comp.DeActivateSound, Filter.Pvs(uid, entityManager: EntityManager), uid, true, comp.DeActivateSound.Params);
_audio.PlayEntity(comp.DeActivateSound, Filter.Pvs(uid, entityManager: EntityManager), uid, true, comp.DeActivateSound.Params);
comp.Activated = false;
}
@@ -143,7 +145,7 @@ public sealed class EnergySwordSystem : EntitySystem
malus.Malus += comp.LitDisarmMalus;
}
_audio.Play(comp.ActivateSound, Filter.Pvs(uid, entityManager: EntityManager), uid, true, comp.ActivateSound.Params);
_audio.PlayEntity(comp.ActivateSound, Filter.Pvs(uid, entityManager: EntityManager), uid, true, comp.ActivateSound.Params);
comp.Activated = true;
}

2
Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomSystem.cs
View File

@@ -1,6 +1,8 @@
using Content.Shared.Weapons.Melee.Events;
using Robust.Shared.Random;
using Content.Shared.Cluwne;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
namespace Content.Server.Weapons.Melee.WeaponRandom;