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

Adds sound to fire extinguisher safety (#4494)

Browse Source
This commit is contained in:
Swept
2021-08-19 22:37:16 -07:00
committed by GitHub
parent 39571697a5
commit 8df0766e8d
2 changed files with 64 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Fluids/Components/SprayComponent.cs
View File

@@ -79,6 +79,9 @@ namespace Content.Server.Fluids.Components
[DataField("spraySound", required: true)] [DataField("spraySound", required: true)]
public SoundSpecifier SpraySound { get; } = default!; public SoundSpecifier SpraySound { get; } = default!;
[DataField("safetySound")]
public SoundSpecifier SafetySound { get; } = new SoundPathSpecifier("/Audio/Machines/button.ogg");
public ReagentUnit CurrentVolume => Owner.GetComponentOrNull<SolutionContainerComponent>()?.CurrentVolume ?? ReagentUnit.Zero; public ReagentUnit CurrentVolume => Owner.GetComponentOrNull<SolutionContainerComponent>()?.CurrentVolume ?? ReagentUnit.Zero;
protected override void Initialize() protected override void Initialize()
@@ -200,6 +203,7 @@ namespace Content.Server.Fluids.Components
private void ToggleSafety(IEntity user) private void ToggleSafety(IEntity user)
{ {
SoundSystem.Play(Filter.Pvs(Owner), SafetySound.GetSound(), Owner, AudioHelpers.WithVariation(0.125f).WithVolume(-4f));
SetSafety(user, !_safety); SetSafety(user, !_safety);
} }

1
Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
View File

@@ -5,6 +5,7 @@
description: It extinguishes fires. description: It extinguishes fires.
components: components:
- type: Sprite - type: Sprite
netsync: false
sprite: Objects/Misc/fire_extinguisher.rsi sprite: Objects/Misc/fire_extinguisher.rsi
layers: layers:
- state: fire_extinguisher_closed - state: fire_extinguisher_closed