From 3be09cfbd2716eb5f6b62822f7b06c723cbfd7a3 Mon Sep 17 00:00:00 2001 From: Supermichael777 Date: Sat, 12 Sep 2015 12:19:46 -0400 Subject: [PATCH 1/5] lowers detomax cost --- code/datums/uplink_item.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 6010a87271289f..333c008a69d8ce 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -391,10 +391,10 @@ var/list/uplink_items = list() /datum/uplink_item/stealthy_weapons/detomatix name = "Detomatix PDA Cartridge" - desc = "When inserted into a personal digital assistant, this cartridge gives you five opportunities to detonate PDAs of crewmembers who have their message feature enabled. \ + desc = "When inserted into a personal digital assistant, this cartridge gives you four opportunities to detonate PDAs of crewmembers who have their message feature enabled. \ The concussive effect from the explosion will knock the recipient out for a short period, and deafen them for longer. It has a chance to detonate your PDA." item = /obj/item/weapon/cartridge/syndicate - cost = 6 + cost = 4 /datum/uplink_item/stealthy_weapons/suppressor name = "Universal Suppressor" From a9e4af81468232fe5f4791d969e9bb1734b820d4 Mon Sep 17 00:00:00 2001 From: Supermichael777 Date: Sat, 12 Sep 2015 12:23:03 -0400 Subject: [PATCH 2/5] it will no longer explode randomy but has a higher chance to bounce --- code/game/objects/items/devices/PDA/PDA.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index f012afd839e0d2..5120b32327b1c0 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -703,12 +703,8 @@ var/global/list/obj/item/device/pda/PDAs = list() else difficulty += 2 - if(prob(difficulty * 12) || (P.hidden_uplink)) + if(prob(difficulty * 15) || (P.hidden_uplink)) U.show_message("An error flashes on your [src].", 1) - else if (prob(difficulty * 3)) - U.show_message("Energy feeds back into your [src]!", 1) - U << browse(null, "window=pda") - explode() else U.show_message("Success!", 1) P.explode() From 6c5d8656dd51c981e1f78215fd3a6356421836c0 Mon Sep 17 00:00:00 2001 From: Supermichael777 Date: Sat, 12 Sep 2015 12:36:06 -0400 Subject: [PATCH 3/5] Create Supermichael777-pr-#11738.yml --- html/changelogs/Supermichael777-pr-#11738.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/Supermichael777-pr-#11738.yml diff --git a/html/changelogs/Supermichael777-pr-#11738.yml b/html/changelogs/Supermichael777-pr-#11738.yml new file mode 100644 index 00000000000000..0f449983ccb6ae --- /dev/null +++ b/html/changelogs/Supermichael777-pr-#11738.yml @@ -0,0 +1,6 @@ +author: Supermichael777 + +delete-after: True + +changes: + - tweak: "The detomax pda cartrege no longer blows its user up." From fc070178140f70ff649621b1d777d5c47bc45c18 Mon Sep 17 00:00:00 2001 From: Supermichael777 Date: Sat, 12 Sep 2015 12:37:45 -0400 Subject: [PATCH 4/5] it still costs 6 --- code/datums/uplink_item.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 333c008a69d8ce..387badc8c8b100 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -394,7 +394,7 @@ var/list/uplink_items = list() desc = "When inserted into a personal digital assistant, this cartridge gives you four opportunities to detonate PDAs of crewmembers who have their message feature enabled. \ The concussive effect from the explosion will knock the recipient out for a short period, and deafen them for longer. It has a chance to detonate your PDA." item = /obj/item/weapon/cartridge/syndicate - cost = 4 + cost = 6 /datum/uplink_item/stealthy_weapons/suppressor name = "Universal Suppressor" From 2c2f20a98ff9e8a866464a01a3c6434d3e08165c Mon Sep 17 00:00:00 2001 From: Supermichael777 Date: Sat, 12 Sep 2015 13:04:50 -0400 Subject: [PATCH 5/5] my enemy english --- html/changelogs/Supermichael777-pr-#11738.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/changelogs/Supermichael777-pr-#11738.yml b/html/changelogs/Supermichael777-pr-#11738.yml index 0f449983ccb6ae..bf59db5bb982d3 100644 --- a/html/changelogs/Supermichael777-pr-#11738.yml +++ b/html/changelogs/Supermichael777-pr-#11738.yml @@ -3,4 +3,4 @@ author: Supermichael777 delete-after: True changes: - - tweak: "The detomax pda cartrege no longer blows its user up." + - tweak: "The detomax pda cartridge no longer blows its user up."