From 64d5eabeac0d2b9ff27ba6b78b7fd28573038a05 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sun, 12 Jun 2016 13:26:26 -0400 Subject: [PATCH 1/3] Telephone is More...Ring-y --- code/game/objects/items/weapons/misc.dm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm index 15048ae13b5..5b5e11952d8 100644 --- a/code/game/objects/items/weapons/misc.dm +++ b/code/game/objects/items/weapons/misc.dm @@ -127,10 +127,19 @@ icon = 'icons/obj/items.dmi' icon_state = "red_phone" flags = CONDUCT - force = 3.0 - throwforce = 2.0 + force = 0 + throwforce = 2 throw_speed = 1 throw_range = 4 w_class = 2 attack_verb = list("called", "rang") - hitsound = 'sound/weapons/ring.ogg' \ No newline at end of file + hitsound = 'sound/weapons/ring.ogg' + var/on_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 From 56020099bca7e6902fb19c6ba160c6b29a9b3c78 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Thu, 16 Jun 2016 03:48:16 -0400 Subject: [PATCH 2/3] 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 From 4c01733bcccc1d111374befdd2c22d32ac5ac4ea Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Thu, 16 Jun 2016 11:37:15 -0400 Subject: [PATCH 3/3] phone force --- code/game/objects/items/weapons/misc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm index b3c7f738391..ebe8ecb421d 100644 --- a/code/game/objects/items/weapons/misc.dm +++ b/code/game/objects/items/weapons/misc.dm @@ -127,7 +127,7 @@ icon = 'icons/obj/items.dmi' icon_state = "red_phone" flags = CONDUCT - force = 0 + force = 3 throwforce = 2 throw_speed = 1 throw_range = 4