Merge pull request #3077 from Citadel-Station-13/upstream-merge-31192

[MIRROR] ismecha define
2017-10-02 21:11:59 -04:00
parent 891f89e49a 39ef613076
commit 2c219ba814
30 changed files with 1166 additions and 1172 deletions
@@ -96,7 +96,7 @@
 	if(!modifiers["catcher"] && A.IsObscured())
 		return

-	if(istype(loc, /obj/mecha))
+	if(ismecha(loc))
 		var/obj/mecha/M = loc
 		return M.click_action(A,src,params)