From 2852483b5caf02c9f6688395fc97b170e6d84e82 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Thu, 29 Feb 2024 19:58:52 -0500 Subject: [PATCH] remove doorslam sound (#25737) --- Content.Shared/Doors/Components/DoorComponent.cs | 6 ------ Content.Shared/Doors/Systems/SharedDoorSystem.cs | 6 ------ 2 files changed, 12 deletions(-) diff --git a/Content.Shared/Doors/Components/DoorComponent.cs b/Content.Shared/Doors/Components/DoorComponent.cs index d1b93d845d..21fad142b3 100644 --- a/Content.Shared/Doors/Components/DoorComponent.cs +++ b/Content.Shared/Doors/Components/DoorComponent.cs @@ -96,12 +96,6 @@ public sealed partial class DoorComponent : Component [DataField("denySound")] public SoundSpecifier? DenySound; - /// - /// Sound to play when a disarmed (hands comp with 0 hands) entity opens the door. What? - /// - [DataField("tryOpenDoorSound")] - public SoundSpecifier TryOpenDoorSound = new SoundCollectionSpecifier("MetalSlam"); - /// /// Sound to play when door has been emagged or possibly electrically tampered /// diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs index 6a2a25f614..da6a91aff2 100644 --- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs +++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs @@ -370,12 +370,6 @@ public abstract partial class SharedDoorSystem : EntitySystem if (lastState == DoorState.Emagging && TryComp(uid, out var doorBoltComponent)) SetBoltsDown((uid, doorBoltComponent), !doorBoltComponent.BoltsDown, user, true); - - // I'm not sure what the intent here is/was? It plays a sound if the user is opening a door with a hands - // component, but no actual hands!? What!? Is this the sound of them head-butting the door to get it to open?? - // I'm 99% sure something is wrong here, but I kind of want to keep it this way. - if (user != null && (!TryComp(user.Value, out HandsComponent? hands) || hands.Hands.Count == 0)) - Audio.PlayPredicted(door.TryOpenDoorSound, uid, user, AudioParams.Default.WithVolume(-2)); } /// -- 2.51.2