From: Tayrtahn <tayrtahn@gmail.com>
Date: Thu, 8 Jan 2026 21:18:23 +0000 (-0500)
Subject: Fix broken state when attempting to escape a locker while cuffed (#42313)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f8ff3a92aa97a5a13d32296c7606698cb464769e;p=space-station-14.git

Fix broken state when attempting to escape a locker while cuffed (#42313)

Check that the DoAfter starts successfully instead of just assuming it does.
---

diff --git a/Content.Server/Resist/ResistLockerSystem.cs b/Content.Server/Resist/ResistLockerSystem.cs
index 3698306b31..df77dcb272 100644
--- a/Content.Server/Resist/ResistLockerSystem.cs
+++ b/Content.Server/Resist/ResistLockerSystem.cs
@@ -57,9 +57,12 @@ public sealed class ResistLockerSystem : EntitySystem
             NeedHand = false, //No hands 'cause we be kickin'
         };
 
+        // Make sure the do after is able to start
+        if (!_doAfterSystem.TryStartDoAfter(doAfterEventArgs))
+            return;
+
         resistLockerComponent.IsResisting = true;
         _popupSystem.PopupEntity(Loc.GetString("resist-locker-component-start-resisting"), user, user, PopupType.Large);
-        _doAfterSystem.TryStartDoAfter(doAfterEventArgs);
     }
 
     private void OnDoAfter(EntityUid uid, ResistLockerComponent component, DoAfterEvent args)