P0 BUGFIX: Master doesn't build because of uncaught git merge conflict. (#39116)
Quick before someone notices Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
e85bc1bb8c
commit
ed6ed6c5f3
@@ -128,7 +128,7 @@ public sealed partial class SleepingSystem : EntitySystem
|
||||
}
|
||||
|
||||
_stun.TryUnstun(ent.Owner);
|
||||
_stun.TryStanding(ent.Owner, out _);
|
||||
_stun.TryStanding(ent.Owner);
|
||||
|
||||
RemComp<SpamEmitSoundComponent>(ent);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user