From be1a388a6e0b44264986e8552d308a14fa4997a0 Mon Sep 17 00:00:00 2001 From: Regen Date: Tue, 15 Dec 2015 20:33:26 +0100 Subject: [PATCH 1/6] Nerfs the bag of holding + bag of holding effect It will now take a small amount of time before creating a singularity, to warn people around the user, and give people time to stop themselves in case they missclicked. --- .../objects/items/weapons/storage/backpack.dm | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 37f7fccbc94..edbab5075e2 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -41,14 +41,18 @@ user << "\red The Bluespace generator isn't working." return if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail) - investigate_log("has become a singularity. Caused by [user.key]","singulo") - user << "\red The Bluespace interfaces of the two devices catastrophically malfunction!" - qdel(W) - var/obj/singularity/singulo = new /obj/singularity (get_turf(src)) - singulo.energy = 300 //should make it a bit bigger~ - message_admins("[key_name_admin(user)] detonated a bag of holding") - log_game("[key_name(user)] detonated a bag of holding") - qdel(src) + 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) + 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") + qdel(W) + var/obj/singularity/singulo = new /obj/singularity(get_turf(user)) + singulo.energy = 300 //To give it a small boost + spawn(30) //Just enough to do some damage, but not kill everything + qdel(singulo) + message_admins("[key_name_admin(user)] detonated a bag of holding") + log_game("[key_name(user)] detonated a bag of holding") + qdel(src) return ..() From ad5256b78866bf115e5b677fc95ba2bd28def6f9 Mon Sep 17 00:00:00 2001 From: Regen Date: Tue, 15 Dec 2015 22:55:27 +0100 Subject: [PATCH 2/6] 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 ..() From b26491617f2df09097fdd505630c6e8c362d9ef0 Mon Sep 17 00:00:00 2001 From: Regen Date: Thu, 17 Dec 2015 10:14:03 +0100 Subject: [PATCH 3/6] Adds confirmation alert, changes some values --- .../objects/items/weapons/storage/backpack.dm | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index d019d36055a..7c93fbed7f7 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -41,21 +41,25 @@ user << "\red The Bluespace generator isn't working." 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!") - 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"," 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 - spawn(30) //Just enough to do some damage, but not kill everything - qdel(singulo) - message_admins("[key_name_admin(user)] detonated a bag of holding") - log_game("[key_name(user)] detonated a bag of holding") - qdel(src) + var/response = alert(user, "Are you sure you want to put the bag of holding inside another bag of holding?","Are you sure you want to die?","Yes","No") + if(response == "Yes") + 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!") + if(do_after(user,30,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"," 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 + spawn(35) //Just enough to do some damage, but not kill everything + qdel(singulo) + 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 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 + return ..() From 5c891fab41017b3e0190e3dbf4d619a68be67d07 Mon Sep 17 00:00:00 2001 From: Regen Date: Fri, 18 Dec 2015 16:08:37 +0100 Subject: [PATCH 4/6] Makes code look neat-er Probably smoother as well, idk, I did what tiger asked me --- code/game/objects/items/weapons/storage/backpack.dm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 7c93fbed7f7..a901e92bec2 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -40,7 +40,7 @@ if(crit_fail) user << "\red The Bluespace generator isn't working." return - if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail) + else if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail) var/response = alert(user, "Are you sure you want to put the bag of holding inside another bag of holding?","Are you sure you want to die?","Yes","No") if(response == "Yes") 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!") @@ -57,11 +57,8 @@ 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 - else - return - - ..() + else + . = ..() proc/failcheck(mob/user as mob) if (prob(src.reliability)) return 1 //No failure From a244b3695205db78dcb1e85900f6a1dc2086bd1f Mon Sep 17 00:00:00 2001 From: Regen Date: Fri, 18 Dec 2015 16:24:49 +0100 Subject: [PATCH 5/6] Adds jump to the admin message --- code/game/objects/items/weapons/storage/backpack.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index a901e92bec2..abd35d940e6 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -52,7 +52,7 @@ singulo.energy = 300 //To give it a small boost spawn(35) //Just enough to do some damage, but not kill everything qdel(singulo) - message_admins("[key_name_admin(user)] detonated a bag of holding") + message_admins("[key_name_admin(user)] detonated a bag of holding JMP)") log_game("[key_name(user)] detonated a bag of holding") qdel(src) else From 7a51db1f2f278aa4d83797459e4c252843a8660b Mon Sep 17 00:00:00 2001 From: Regen Date: Tue, 29 Dec 2015 17:58:19 +0100 Subject: [PATCH 6/6] keep the !!FUN!!, remove !!ACCIDENT!! --- code/game/objects/items/weapons/storage/backpack.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index abd35d940e6..8a0480dce88 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -50,8 +50,6 @@ qdel(W) var/obj/singularity/singulo = new /obj/singularity(get_turf(user)) singulo.energy = 300 //To give it a small boost - spawn(35) //Just enough to do some damage, but not kill everything - qdel(singulo) message_admins("[key_name_admin(user)] detonated a bag of holding JMP)") log_game("[key_name(user)] detonated a bag of holding") qdel(src)