Gives changeNextMove() a better name, default define

This commit is contained in:
mwerezak
2015-06-28 23:07:58 -04:00
parent 087a978d56
commit 32b95445e3
27 changed files with 46 additions and 43 deletions
@@ -349,7 +349,7 @@
if(!escapee.canClick())
return
escapee.changeNextMove(100)
escapee.setClickCooldown(100)
//okay, so the closet is either welded or locked... resist!!!
escapee << "<span class='warning'>You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)</span>"
+2 -2
View File
@@ -30,7 +30,7 @@
/obj/structure/grille/attack_hand(mob/user as mob)
user.changeNextMove(8)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
user.do_attack_animation(src)
@@ -156,7 +156,7 @@
//window placing end
else if(!(W.flags & CONDUCT) || !shock(user, 70))
user.changeNextMove(8)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
user.do_attack_animation(src)
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
switch(W.damtype)
+3 -3
View File
@@ -171,7 +171,7 @@
playsound(loc, 'sound/effects/Glasshit.ogg', 50, 1)
/obj/structure/window/attack_hand(mob/user as mob)
user.changeNextMove(8)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(HULK in user.mutations)
user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))
user.visible_message("<span class='danger'>[user] smashes through [src]!</span>")
@@ -199,7 +199,7 @@
return
/obj/structure/window/attack_generic(var/mob/user, var/damage)
user.changeNextMove(8)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(!damage)
return
if(damage >= 10)
@@ -269,7 +269,7 @@
new glasstype(loc)
qdel(src)
else
user.changeNextMove(8)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(W.damtype == BRUTE || W.damtype == BURN)
user.do_attack_animation(src)
hit(W.force)