From e235bc94e6c3f604ee6abac9bd7ab574ffb51144 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 Conflicts: code/game/machinery/computer/arcade.dm code/game/objects/items/toys.dm icons/obj/toy.dmi --- code/game/machinery/computer/arcade.dm | 5 +++-- code/game/objects/items/toys.dm | 19 +++++++++++++++++++ icons/obj/toy.dmi | Bin 4967 -> 5195 bytes 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index a0bd6c98ac3..a511ecf6e05 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -23,7 +23,8 @@ /obj/item/toy/prize/seraph = 1, /obj/item/toy/prize/mauler = 1, /obj/item/toy/prize/odysseus = 1, - /obj/item/toy/prize/phazon = 1 + /obj/item/toy/prize/phazon = 1, + /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() \ No newline at end of file + prizevend() diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 991b582dc4f..9c0cd8a2cf5 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -518,6 +518,7 @@ desc = "Mini-Mecha action figure! Collect them all! 11/11." icon_state = "phazonprize" + /obj/item/toy/katana name = "replica katana" desc = "Woefully underpowered in D20." @@ -532,6 +533,24 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced") +/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" + /obj/item/weapon/toddler icon_state = "toddler" name = "toddler" diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index 8e13f54b024d786087762d6aca207e05ace96180..8c1f51a354bc5afd698b094c12857db0f7f9440f 100644 GIT binary patch delta 4995 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 KG^*4d;QtH$FEXG2 delta 4772 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