From: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Mon, 21 Jul 2025 18:20:39 +0000 (-0700)
Subject: P0 BUGFIX: Master doesn't build because of uncaught git merge conflict. (#39116)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=ed6ed6c5f3c0e96eff44c583c8fa9e151df9f9f0;p=space-station-14.git

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>
---

diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs
index 61803d7c7d..e4732f82f9 100644
--- a/Content.Shared/Bed/Sleep/SleepingSystem.cs
+++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs
@@ -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);
     }