Merge pull request #3806 from Citadel-Station-13/upstream-merge-32381

[MIRROR] Restores buckling sanity.
2017-11-04 22:53:54 -05:00
parent 31e1d277c6 097bef932b
commit 065dcb6eab
2 changed files with 3 additions and 3 deletions
@@ -35,8 +35,8 @@
 		. = ..()


-/obj/vehicle/user_buckle_mob(mob/living/M, mob/user)
-	if(user.incapacitated())
+/obj/vehicle/user_buckle_mob(mob/living/M, mob/living/user)
+	if(!istype(user) || user.incapacitated())
 		return
 	for(var/atom/movable/A in get_turf(src))
 		if(A.density)