From 7f778714768ef196a0eb5a15167aedf20647b0bd Mon Sep 17 00:00:00 2001 From: monster860 Date: Mon, 2 Dec 2019 23:52:52 -0500 Subject: [PATCH 1/2] adds a 10% chance of getting a bluespace emag if you emag an emag --- yogstation/code/game/objects/items/cards_ids.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/yogstation/code/game/objects/items/cards_ids.dm b/yogstation/code/game/objects/items/cards_ids.dm index 10446752955d..2e4d0a022f10 100644 --- a/yogstation/code/game/objects/items/cards_ids.dm +++ b/yogstation/code/game/objects/items/cards_ids.dm @@ -70,6 +70,12 @@ var/otherEmag = user.get_active_held_item() if(!otherEmag) return + if(prob(10)) + to_chat(user, "By some ungodly miracle, the emag gains new functionality instead of being destroyed.") + playsound(src.loc, "sparks", 50, 1) + qdel(otherEmag) + color = rgb(40, 130, 255) + prox_check = FALSE to_chat(user, "The cyptographic sequencers attempt to override each other before destroying themselves.") playsound(src.loc, "sparks", 50, 1) qdel(otherEmag) @@ -82,4 +88,4 @@ /obj/item/card/id/gasclerk/New() ..() - registered_account = new("Clerk", FALSE) \ No newline at end of file + registered_account = new("Clerk", FALSE) From 315281c681965dbd2a19a829a26dda57dd8da81a Mon Sep 17 00:00:00 2001 From: monster860 Date: Mon, 2 Dec 2019 23:54:22 -0500 Subject: [PATCH 2/2] oops --- yogstation/code/game/objects/items/cards_ids.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/yogstation/code/game/objects/items/cards_ids.dm b/yogstation/code/game/objects/items/cards_ids.dm index 2e4d0a022f10..b5ca6d76ec34 100644 --- a/yogstation/code/game/objects/items/cards_ids.dm +++ b/yogstation/code/game/objects/items/cards_ids.dm @@ -76,6 +76,7 @@ qdel(otherEmag) color = rgb(40, 130, 255) prox_check = FALSE + return to_chat(user, "The cyptographic sequencers attempt to override each other before destroying themselves.") playsound(src.loc, "sparks", 50, 1) qdel(otherEmag)