Merge remote-tracking branch 'upstream/master' into airlockQDEL

This commit is contained in:
xxalpha
2015-08-27 18:44:06 +01:00
5 changed files with 461 additions and 115 deletions
+1 -1
View File
@@ -72,7 +72,7 @@
//Wrapper procs that handle sanity and user feedback
/obj/proc/user_buckle_mob(mob/living/M, mob/user)
if(!user.Adjacent(M) || user.restrained() || user.lying || user.stat)
if(!user.Adjacent(M) || user.lying || user.incapacitated())
return
add_fingerprint(user)