Merge pull request #1630 from Markolie/master

Mecha turret fix
This commit is contained in:
Fox-McCloud
2015-08-03 16:37:41 -04:00
+1 -1
View File
@@ -297,7 +297,7 @@
return //cannot shoot yourself
if(istype(A, /obj/item/projectile))
return
if(istype(A, /mob/living))
if(istype(A, /mob/living) || istype(A, /obj/mecha) || istype(A, /obj/spacepod) || istype(A, /obj/vehicle))
result = 2 //We hit someone, return 1!
return
result = 1