From 56020099bca7e6902fb19c6ba160c6b29a9b3c78 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Thu, 16 Jun 2016 03:48:16 -0400 Subject: [PATCH] saner --- code/game/objects/items/weapons/misc.dm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm index 5b5e11952d8..b3c7f738391 100644 --- a/code/game/objects/items/weapons/misc.dm +++ b/code/game/objects/items/weapons/misc.dm @@ -134,12 +134,9 @@ w_class = 2 attack_verb = list("called", "rang") hitsound = 'sound/weapons/ring.ogg' - var/on_cooldown = 0 + var/cooldown = 0 /obj/item/weapon/phone/attack_self(mob/user) - if(!on_cooldown) - on_cooldown = 1 - playsound(loc, 'sound/weapons/ring.ogg', 50, 1) - add_fingerprint(user) - spawn(20) - on_cooldown = 0 \ No newline at end of file + if(cooldown < world.time - 20) + playsound(user.loc, 'sound/weapons/ring.ogg', 50, 1) + cooldown = world.time \ No newline at end of file