Merge pull request #5993 from GinjaNinja32/proximity2

More proximity fixes
This commit is contained in:
Chinsky
2014-08-14 22:55:29 +04:00
4 changed files with 14 additions and 6 deletions
@@ -114,7 +114,9 @@
return
..()
/obj/item/weapon/implanter/compressed/afterattack(atom/A, mob/user as mob)
/obj/item/weapon/implanter/compressed/afterattack(atom/A, mob/user as mob, proximity)
if(!proximity)
return
if(istype(A,/obj/item) && imp)
var/obj/item/weapon/implant/compressed/c = imp
if (c.scanned)
+3 -1
View File
@@ -65,7 +65,9 @@
O.show_message(text("\red [] waves [] over []'s head.", user, src, M), 1)
return
/obj/item/weapon/nullrod/afterattack(atom/A, mob/user as mob)
/obj/item/weapon/nullrod/afterattack(atom/A, mob/user as mob, proximity)
if(!proximity)
return
if (istype(A, /turf/simulated/floor))
user << "\blue You hit the floor with the [src]."
call(/obj/effect/rune/proc/revealrunes)(src)