From d52d54646331f0363c450557d7ffedc020e723af Mon Sep 17 00:00:00 2001
From: Tad Hardesty <tad@platymuus.com>
Date: Fri, 24 Nov 2017 20:29:43 -0800
Subject: [PATCH] Deny buckling when the user is inside lockers, mechs, etc.
 (#33015)

---
 code/game/objects/buckling.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index 2cf463e46c..0c72e63feb 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -99,7 +99,7 @@
 
 //Wrapper procs that handle sanity and user feedback
 /atom/movable/proc/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE)
-	if(!in_range(user, src) || user.stat || user.restrained())
+	if(!in_range(user, src) || !isturf(user.loc) || user.incapacitated())
 		return FALSE
 
 	add_fingerprint(user)