Merge pull request #4117 from Citadel-Station-13/upstream-merge-33015

[MIRROR] Deny buckling when the user is inside lockers, mechs, etc.
2017-11-25 05:36:22 +00:00
parent ff94b3e1e1 ddfb4c135d
commit 572d14fffd
1 changed files with 1 additions and 1 deletions
@@ -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)