From ad4dd335b8037e8b73f4bba77c4e3a8baea54193 Mon Sep 17 00:00:00 2001 From: py01 <60152240+collinlunn@users.noreply.github.com> Date: Sat, 22 Feb 2020 17:39:00 -0600 Subject: [PATCH] Sound for burning your hand on a powered light (#733) --- .../Components/Power/PoweredLightComponent.cs | 7 +++++++ Resources/Audio/effects/lightburn.ogg | Bin 0 -> 9963 bytes 2 files changed, 7 insertions(+) create mode 100644 Resources/Audio/effects/lightburn.ogg diff --git a/Content.Server/GameObjects/Components/Power/PoweredLightComponent.cs b/Content.Server/GameObjects/Components/Power/PoweredLightComponent.cs index fc66958ece..b6f9607890 100644 --- a/Content.Server/GameObjects/Components/Power/PoweredLightComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PoweredLightComponent.cs @@ -4,6 +4,7 @@ using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; +using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; @@ -26,6 +27,10 @@ namespace Content.Server.GameObjects.Components.Power private TimeSpan _lastThunk; +#pragma warning disable 649 + [Dependency] private readonly IEntitySystemManager _entitySystemManager; +#pragma warning restore 649 + private LightBulbType BulbType = LightBulbType.Tube; [ViewVariables] private ContainerSlot _lightBulbContainer; @@ -74,6 +79,8 @@ namespace Content.Server.GameObjects.Components.Power void Burn() { damageableComponent.TakeDamage(DamageType.Heat, 20, Owner); + var audioSystem = _entitySystemManager.GetEntitySystem(); + audioSystem.Play("/Audio/effects/lightburn.ogg", Owner); } void Eject() diff --git a/Resources/Audio/effects/lightburn.ogg b/Resources/Audio/effects/lightburn.ogg new file mode 100644 index 0000000000000000000000000000000000000000..4946fc8924f0f30794f77efc22ae3854c809d222 GIT binary patch literal 9963 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 KEC*|O!2bcb`~Cp{ literal 0 HcmV?d00001