From c243edbf33d5f6d3eb7a9c62f8004116d7f0c922 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 15 Jun 2022 15:14:15 +1000 Subject: [PATCH] Make doorbumps quiet (#8812) --- Content.Server/Doors/Systems/DoorSystem.cs | 2 +- Content.Shared/Doors/Systems/SharedDoorSystem.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Content.Server/Doors/Systems/DoorSystem.cs b/Content.Server/Doors/Systems/DoorSystem.cs index f2f635618b..2c7dd7b715 100644 --- a/Content.Server/Doors/Systems/DoorSystem.cs +++ b/Content.Server/Doors/Systems/DoorSystem.cs @@ -305,7 +305,7 @@ public sealed class DoorSystem : SharedDoorSystem foreach (var other in PhysicsSystem.GetCollidingEntities(body)) { if (Tags.HasTag(other.Owner, "DoorBumpOpener") && - TryOpen(component.Owner, component, other.Owner)) break; + TryOpen(component.Owner, component, other.Owner, false, quiet: true)) break; } } } diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs index d91185ac17..06baab6635 100644 --- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs +++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs @@ -219,12 +219,12 @@ public abstract class SharedDoorSystem : EntitySystem #endregion #region Opening - public bool TryOpen(EntityUid uid, DoorComponent? door = null, EntityUid? user = null, bool predicted = false) + public bool TryOpen(EntityUid uid, DoorComponent? door = null, EntityUid? user = null, bool predicted = false, bool quiet = false) { if (!Resolve(uid, ref door)) return false; - if (!CanOpen(uid, door, user, false)) + if (!CanOpen(uid, door, user, quiet)) return false; StartOpening(uid, door, user, predicted);