Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Airlock Crushing Animation #34523

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −1
Open

Fix Airlock Crushing Animation #34523

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Content.Shared/Doors/Systems/SharedDoorSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,10 +777,13 @@ private void NextState(Entity<DoorComponent> ent, TimeSpan time)
var door = ent.Comp;
door.NextStateChange = null;

if (door.CurrentlyCrushing.Count > 0)
if (door.CurrentlyCrushing.Count > 0 && door.State != DoorState.Opening)
{
// This is a closed door that is crushing people and needs to auto-open. Note that we don't check "can open"
// here. The door never actually finished closing and we don't want people to get stuck inside of doors.
StartOpening(ent, door);
return;
}

switch (door.State)
{
Expand Down
Loading