click dem floors as fast as you can boys

This commit is contained in:
Chris
2014-12-02 14:23:40 -06:00
parent f2a3b3b298
commit ad0aec56cc

View File

@@ -109,7 +109,7 @@
*/
var/resolved = A.attackby(W,src)
if(ismob(A) || istype(A, /obj/mecha) || isturf(A) || istype(W, /obj/item/weapon/grab))
if(ismob(A) || istype(A, /obj/mecha) || istype(W, /obj/item/weapon/grab))
changeNext_move(10)
if(!resolved && A && W)
W.afterattack(A,src,1,params) // 1 indicates adjacency
@@ -133,7 +133,7 @@
next_move += 5
*/
// Return 1 in attackby() to prevent afterattack() effects (when safely moving items for example)
if(ismob(A) || istype(A, /obj/mecha) || isturf(A) || istype(W, /obj/item/weapon/grab))
if(ismob(A) || istype(A, /obj/mecha) || istype(W, /obj/item/weapon/grab))
changeNext_move(10)
var/resolved = A.attackby(W,src)
if(!resolved && A && W)