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
@@ -234,7 +234,7 @@
/obj/effect/plant/attackby(var/obj/item/weapon/W, var/mob/user)
user.changeNextMove(8)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
plant_controller.add_plant(src)
if(istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/weapon/scalpel))
+1 -1
View File
@@ -545,7 +545,7 @@
A.hydrotray_type = src.type
qdel(src)
else if(O.force && seed)
user.changeNextMove(8)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
user.visible_message("<span class='danger'>\The [seed.display_name] has been attacked by [user] with \the [O]!</span>")
if(!dead)
health -= O.force
@@ -1308,7 +1308,7 @@
if(!isliving(usr) || !usr.canClick())
return
usr.changeNextMove(20)
usr.setClickCooldown(20)
if(usr.stat > 0)
usr << "You are unconcious and cannot do that!"
+3 -3
View File
@@ -31,7 +31,7 @@
//These two lines represent a significant buff to grabs...
if(!canClick()) return
changeNextMove(100)
setClickCooldown(100)
if(can_break_cuffs()) //Don't want to do a lot of logic gating here.
break_handcuffs()
@@ -65,7 +65,7 @@
if(!canClick())
return
changeNextMove(100)
setClickCooldown(100)
if(can_break_cuffs()) //Don't want to do a lot of logic gating here.
break_legcuffs()
@@ -153,7 +153,7 @@
if(!canClick())
return
changeNextMove(100)
setClickCooldown(100)
if(!buckled) return
if(!restrained())
+1 -1
View File
@@ -575,7 +575,7 @@ default behaviour is:
set category = "IC"
if(can_resist())
changeNextMove(20)
setClickCooldown(20)
process_resist()
/mob/living/proc/can_resist()
@@ -290,7 +290,7 @@
//TODO: refactor mob attackby(), attacked_by(), and friends.
/mob/living/simple_animal/proc/attacked_with_item(var/obj/item/O, var/mob/user)
user.changeNextMove(8)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(!O.force)
visible_message("<span class='notice'>[user] gently taps [src] with \the [O].</span>")
return
+1 -1
View File
@@ -843,7 +843,7 @@ mob/proc/yank_out_object()
if(!isliving(usr) || !usr.canClick())
return
usr.changeNextMove(20)
usr.setClickCooldown(20)
if(usr.stat == 1)
usr << "You are unconcious and cannot do that!"
+1 -1
View File
@@ -259,7 +259,7 @@
assailant.attack_log += "\[[time_stamp()]\] <font color='red'>Strangled (kill intent) [affecting.name] ([affecting.ckey])</font>"
msg_admin_attack("[key_name(assailant)] strangled (kill intent) [key_name(affecting)]")
affecting.changeNextMove(10)
affecting.setClickCooldown(10)
affecting.losebreath += 1
affecting.set_dir(WEST)
adjust_position()
+2 -2
View File
@@ -169,7 +169,7 @@
var/_move_delay = firemode.move_delay
var/shoot_time = (_burst - 1)*_burst_delay
user.changeNextMove(shoot_time)
user.setClickCooldown(shoot_time)
if(user.client) user.client.move_delay = world.time + shoot_time //no moving while shooting either
next_fire_time = world.time + shoot_time
@@ -202,7 +202,7 @@
update_held_icon()
//update timing
user.changeNextMove(4)
user.setClickCooldown(4)
if(user.client) user.client.move_delay = world.time + _move_delay
next_fire_time = world.time + _fire_delay
@@ -39,7 +39,7 @@
playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
user.changeNextMove(4)
user.setClickCooldown(4)
if(reagents.has_reagent("sacid"))
message_admins("[key_name_admin(user)] fired sulphuric acid from \a [src].")