Merge pull request #3273 from Aranclanos/aphrilsfools

Reverts my aphril's fool click delay on mobs stuff
This commit is contained in:
Aranclanos
2014-04-02 01:40:45 -03:00
2 changed files with 7 additions and 7 deletions
+6 -6
View File
@@ -101,8 +101,8 @@
if(!resolved && A && W)
W.afterattack(A,src,1,params) // 1 indicates adjacency
else
//if(ismob(A))
// changeNext_move(8)
if(ismob(A))
changeNext_move(8)
UnarmedAttack(A)
return
@@ -120,8 +120,8 @@
if(!resolved && A && W)
W.afterattack(A,src,1,params) // 1: clicking something Adjacent
else
//if(ismob(A))
// changeNext_move(8)
if(ismob(A))
changeNext_move(8)
UnarmedAttack(A, 1)
return
else // non-adjacent click
@@ -153,8 +153,8 @@
in human click code to allow glove touches only at melee range.
*/
/mob/proc/UnarmedAttack(var/atom/A, var/proximity_flag)
//if(ismob(A))
// changeNext_move(8)
if(ismob(A))
changeNext_move(8)
return
/*
+1 -1
View File
@@ -11,7 +11,7 @@
visible_message("<span class='danger'>[src] has been hit by [user] with [W].</span>")
/mob/living/attackby(obj/item/I, mob/user)
//user.changeNext_move(8)
user.changeNext_move(8)
I.attack(src, user)
/mob/living/proc/attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone)