From be48a25c14e00f1fc95aed819d8031ee040240a1 Mon Sep 17 00:00:00 2001 From: RemberBL Date: Sun, 27 Dec 2020 10:30:47 +0100 Subject: [PATCH] Sound effect plays when an item is thrown (#2767) * Adds toss.ogg to the project's resources * Thrown items will now play a sound effect --- .../Projectiles/ThrownItemComponent.cs | 6 +++++- Resources/Audio/Effects/toss.ogg | Bin 0 -> 7917 bytes 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 Resources/Audio/Effects/toss.ogg diff --git a/Content.Server/GameObjects/Components/Projectiles/ThrownItemComponent.cs b/Content.Server/GameObjects/Components/Projectiles/ThrownItemComponent.cs index a7e0423f97..8caf6ca3c6 100644 --- a/Content.Server/GameObjects/Components/Projectiles/ThrownItemComponent.cs +++ b/Content.Server/GameObjects/Components/Projectiles/ThrownItemComponent.cs @@ -1,8 +1,9 @@ -using Content.Server.GameObjects.EntitySystems.Click; +using Content.Server.GameObjects.EntitySystems.Click; using Content.Shared.Damage; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Damage; using Content.Shared.Physics; +using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components; using Robust.Shared.GameObjects.Components.Timers; @@ -98,6 +99,9 @@ namespace Content.Server.GameObjects.Components.Projectiles var controller = comp.EnsureController(); controller.Push(direction, speed); + EntitySystem.Get() + .PlayFromEntity("/Audio/Effects/toss.ogg", Owner); + StartStopTimer(); } diff --git a/Resources/Audio/Effects/toss.ogg b/Resources/Audio/Effects/toss.ogg new file mode 100644 index 0000000000000000000000000000000000000000..62388259818b833988478f5399749dfd0b762138 GIT binary patch literal 7917 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 ArT_o{ literal 0 HcmV?d00001