From a7e3032091083e04554c8ad7a4fcd9193e8fdea0 Mon Sep 17 00:00:00 2001 From: Stobarico Date: Mon, 18 Sep 2017 00:58:09 -0300 Subject: [PATCH] Adds sparks (and cooldown) FINALLY --- code/modules/vore/fluffstuff/custom_items_vr.dm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 6b689f9f42..71d75bc9af 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -608,8 +608,8 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie //Stobarico - Alexis Bloise /obj/item/weapon/cane/wand - name = "cane" - desc = "A cane used by a true gentlemen. Or a clown." + name = "Ancient wand" + desc = "A really old looking wand with floating parts and cyan crystals, wich seem to radiate a cyan glow. The wand has a golden plaque on the side that would say Corncobble, but it is covered by a sticker saying Bloise." icon = 'icons/vore/custom_items_vr.dmi' icon_state = "alexiswand" item_icons = list (slot_r_hand_str = 'icons/vore/custom_items_vr.dmi', slot_l_hand_str = 'icons/vore/custom_items_vr.dmi') @@ -621,6 +621,18 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie matter = list(DEFAULT_WALL_MATERIAL = 50) attack_verb = list("sparkled", "whacked", "twinkled", "radiated", "dazzled", "zapped") hitsound = 'sound/weapons/sparkle.ogg' + var/last_use = 0 + var/cooldown = 30 + +/obj/item/weapon/cane/wand/attack_self(mob/user) + if(last_use + cooldown >= world.time) + return + playsound(loc, 'sound/weapons/sparkle.ogg', 50, 1) + user.visible_message(" [user] swings their wand.") + var/datum/effect/effect/system/spark_spread/s = new + s.set_up(3, 1, src) + s.start() + last_use = world.time /obj/item/weapon/cane/wand/attack_self(mob/user) playsound(loc, 'sound/weapons/sparkle.ogg', 50, 1)