Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Make doorbumps quiet (#8812)

Browse Source
This commit is contained in:
metalgearsloth
2022-06-15 15:14:15 +10:00
committed by GitHub
parent 6cbf705290
commit c243edbf33
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Doors/Systems/DoorSystem.cs
View File

@@ -305,7 +305,7 @@ public sealed class DoorSystem : SharedDoorSystem
foreach (var other in PhysicsSystem.GetCollidingEntities(body)) foreach (var other in PhysicsSystem.GetCollidingEntities(body))
{ {
if (Tags.HasTag(other.Owner, "DoorBumpOpener") && if (Tags.HasTag(other.Owner, "DoorBumpOpener") &&
TryOpen(component.Owner, component, other.Owner)) break; TryOpen(component.Owner, component, other.Owner, false, quiet: true)) break;
} }
} }
} }

4
Content.Shared/Doors/Systems/SharedDoorSystem.cs
View File

@@ -219,12 +219,12 @@ public abstract class SharedDoorSystem : EntitySystem
#endregion #endregion
#region Opening #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)) if (!Resolve(uid, ref door))
return false; return false;
if (!CanOpen(uid, door, user, false)) if (!CanOpen(uid, door, user, quiet))
return false; return false;
StartOpening(uid, door, user, predicted); StartOpening(uid, door, user, predicted);