From ad5256b78866bf115e5b677fc95ba2bd28def6f9 Mon Sep 17 00:00:00 2001 From: Regen Date: Tue, 15 Dec 2015 22:55:27 +0100 Subject: [PATCH] Fixes and more text --- code/game/objects/items/weapons/storage/backpack.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index edbab5075e2..d019d36055a 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -42,9 +42,9 @@ return if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail) user.visible_message("[user] grins as he begins to put a Bag of Holding into a Bag of Holding!", "You begin to put the Bag of Holding into the Bag of Holding!") - spawn(20) + if(do_after(user,20,target=src)) investigate_log("has become a singularity. Caused by [user.key]","singulo") - user.visible_message("[user] erupts in evil laughter as he puts the Bag of Holding into another Bag of Holding", "You can't help yourself from laughing as you put the Bag of Holding into another Bag of Holding, complete darkness surrounding you") + user.visible_message("[user] erupts in evil laughter as he puts the Bag of Holding into another Bag of Holding!", "You can't help yourself from laughing as you put the Bag of Holding into another Bag of Holding, complete darkness surrounding you"," You hear the sound of scientific evil brewing! ") qdel(W) var/obj/singularity/singulo = new /obj/singularity(get_turf(user)) singulo.energy = 300 //To give it a small boost @@ -53,6 +53,8 @@ message_admins("[key_name_admin(user)] detonated a bag of holding") log_game("[key_name(user)] detonated a bag of holding") qdel(src) + else + user.visible_message("After careful consideration, [user] has decided that putting a Bag of Holding inside another Bag of Holding would not yield the ideal outcome","You come to the realization that this might not be the greatest idea") return ..()