Fixes missing cooldowns, missing cult blade sound.

Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
This commit is contained in:
mwerezak
2015-09-09 15:13:30 -04:00
committed by HarpyEagle
parent deb215d262
commit 4951790b50
21 changed files with 53 additions and 49 deletions
@@ -38,6 +38,8 @@
/obj/item/clothing/accessory/badge/attack(mob/living/carbon/human/M, mob/living/user)
if(isliving(user))
user.visible_message("<span class='danger'>[user] invades [M]'s personal space, thrusting [src] into their face insistently.</span>","<span class='danger'>You invade [M]'s personal space, thrusting [src] into their face insistently.</span>")
user.do_attack_animation(M)
user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //to prevent spam
//.Holobadges.
/obj/item/clothing/accessory/badge/holo
@@ -127,4 +129,4 @@
new /obj/item/clothing/accessory/badge/holo/hos(src)
new /obj/item/clothing/accessory/badge/holo/cord(src)
..()
return
return
+1
View File
@@ -256,6 +256,7 @@
user.visible_message("<span class='notice'>You open up the book and show it to [M]. </span>", \
"<span class='notice'> [user] opens up a book and shows it to [M]. </span>")
M << browse("<TT><I>Penned by [author].</I></TT> <BR>" + "[dat]", "window=book")
user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //to prevent spam
/*
+2 -2
View File
@@ -214,7 +214,7 @@
admin_attack_log(usr, attacker_message="Fired [src]", admin_message="fired a gun ([src]) (MODE: [src.mode_name]) [reflex ? "by reflex" : "manually"].")
//update timing
user.setClickCooldown(4)
user.setClickCooldown(DEFAULT_QUICK_COOLDOWN)
user.setMoveCooldown(move_delay)
next_fire_time = world.time + fire_delay
@@ -419,4 +419,4 @@
return new_mode
/obj/item/weapon/gun/attack_self(mob/user)
switch_firemodes(user)
switch_firemodes(user)
@@ -37,6 +37,8 @@
user << "<span class='danger'>You cannot inject a robotic limb.</span>"
return
user.setClickCooldown(DEFAULT_QUICK_COOLDOWN)
user.do_attack_animation(M)
user << "<span class='notice'>You inject [M] with [src].</span>"
M << "<span class='notice'>You feel a tiny prick!</span>"
@@ -176,6 +176,9 @@
else
user.visible_message("<span class='warning'>[user] begins hunting for an injection port on [target]'s suit!</span>")
user.setClickCooldown(DEFAULT_QUICK_COOLDOWN)
user.do_attack_animation(target)
if(!do_mob(user, target, injtime))
return