From 94ef52e1cdf79ec67b85ec0a95ec26f9d2dcc945 Mon Sep 17 00:00:00 2001 From: JJRcop Date: Mon, 6 Jan 2014 16:46:12 -0500 Subject: [PATCH] Adds new nuke toy, plays nuke sound when attack_self'd Cooldown of 5 minutes --- code/game/machinery/computer/arcade.dm | 5 +++-- code/game/objects/items/toys.dm | 18 +++++++++++++++++- icons/obj/toy.dmi | Bin 6611 -> 6885 bytes 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index fb922c6fb9a..39e5691e208 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -23,7 +23,8 @@ /obj/item/toy/prize/mauler = 1, /obj/item/toy/prize/odysseus = 1, /obj/item/toy/prize/phazon = 1, - /obj/item/toy/cards = 2 + /obj/item/toy/cards = 2, + /obj/item/toy/nuke = 2 ) /obj/machinery/computer/arcade/New() @@ -546,4 +547,4 @@ /obj/machinery/computer/arcade/orion_trail/proc/win() playing = 0 - prizevend() + prizevend() diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index edf84e2cd08..eecf7513610 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -851,7 +851,23 @@ obj/item/toy/singlecard/attack_self(mob/user) Flip() - +/obj/item/toy/nuke + name = "\improper Nuclear Fission Explosive toy" + desc = "A plastic model of a Nuclear Fission Explosive." + icon = 'icons/obj/toy.dmi' + icon_state = "nuketoyidle" + w_class = 2.0 + var/cooldown = 0 + +/obj/item/toy/nuke/attack_self(mob/user) + if (cooldown < world.time) + cooldown = world.time + 3000 //5 minutes + icon_state = "nuketoy" + for (var/mob/M in hearers(world.view, user)) //I'm doing this because playsound's dampening/stereo ruins the effect + if (M.client && !M.ear_deaf) + M << 'sound/machines/Alarm.ogg' + sleep(135) + icon_state = "nuketoyidle" diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index b0a8df3b071885947753d9ec907b0bd9027246dc..9c50a17391e5621df2bb55d83bb4b1664e72676b 100644 GIT binary patch delta 6306 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