]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
remove doorslam sound (#25737)
authorNemanja <98561806+EmoGarbage404@users.noreply.github.com>
Fri, 1 Mar 2024 00:58:52 +0000 (19:58 -0500)
committerGitHub <noreply@github.com>
Fri, 1 Mar 2024 00:58:52 +0000 (11:58 +1100)
Content.Shared/Doors/Components/DoorComponent.cs
Content.Shared/Doors/Systems/SharedDoorSystem.cs

index d1b93d845d7340649bc3bbd0d209074392892f7e..21fad142b3a2d0641f37f58b673b643d56db83d5 100644 (file)
@@ -96,12 +96,6 @@ public sealed partial class DoorComponent : Component
     [DataField("denySound")]
     public SoundSpecifier? DenySound;
 
-    /// <summary>
-    /// Sound to play when a disarmed (hands comp with 0 hands) entity opens the door. What?
-    /// </summary>
-    [DataField("tryOpenDoorSound")]
-    public SoundSpecifier TryOpenDoorSound = new SoundCollectionSpecifier("MetalSlam");
-
     /// <summary>
     /// Sound to play when door has been emagged or possibly electrically tampered
     /// </summary>
index 6a2a25f614b927ad97a170392329efddcb559371..da6a91aff2deb2047bc0e18c9b23e881b37b6f32 100644 (file)
@@ -370,12 +370,6 @@ public abstract partial class SharedDoorSystem : EntitySystem
 
         if (lastState == DoorState.Emagging && TryComp<DoorBoltComponent>(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));
     }
 
     /// <summary>