diff --git a/code/datums/uplink_items/uplink_traitor.dm b/code/datums/uplink_items/uplink_traitor.dm index 36d8651651c..7f437119a8b 100644 --- a/code/datums/uplink_items/uplink_traitor.dm +++ b/code/datums/uplink_items/uplink_traitor.dm @@ -673,7 +673,7 @@ /datum/uplink_item/explosives/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. 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." + 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. The concussive effect from the explosion will knock the recipient out for a short period, and deafen them for longer." reference = "DEPC" item = /obj/item/cartridge/syndicate cost = 30 diff --git a/code/modules/pda/messenger_plugins.dm b/code/modules/pda/messenger_plugins.dm index 5c075dcdbac..74b1aabdb57 100644 --- a/code/modules/pda/messenger_plugins.dm +++ b/code/modules/pda/messenger_plugins.dm @@ -42,32 +42,17 @@ name = "*Detonate*" icon = "exclamation-circle" -/datum/data/pda/messenger_plugin/virus/detonate/user_act(mob/user as mob, obj/item/pda/P) - . = ..(user, P) +/datum/data/pda/messenger_plugin/virus/detonate/user_act(mob/user, obj/item/pda/pda_to_detonate) + . = ..() if(.) - var/difficulty = 0 - - if(pda.cartridge) - difficulty += pda.cartridge.programs.len / 2 - else - difficulty += 2 - - if(!P.detonate || P.hidden_uplink) + if(!pda_to_detonate.detonate || pda_to_detonate.hidden_uplink) user.show_message("The target PDA does not seem to respond to the detonation command.", 1) pda.cartridge.charges++ - else if(prob(difficulty * 12)) - user.show_message("An error flashes on your [pda].", 1) - else if(prob(difficulty * 3)) - user.show_message("Energy feeds back into your [pda]!", 1) - pda.close(user) - pda.explode() - log_admin("[key_name(user)] just attempted to blow up [P] with the Detomatix cartridge but failed, blowing themselves up") - message_admins("[key_name_admin(user)] just attempted to blow up [P] with the Detomatix cartridge but failed, blowing themselves up", 1) else user.show_message("Success!", 1) - log_admin("[key_name(user)] just attempted to blow up [P] with the Detomatix cartridge and succeeded") - message_admins("[key_name_admin(user)] just attempted to blow up [P] with the Detomatix cartridge and succeeded", 1) - P.explode() + log_admin("[key_name(user)] just blew up [pda_to_detonate] with the Detomatix cartridge") + message_admins("[key_name_admin(user)] just blew up [pda_to_detonate] with the Detomatix cartridge", 1) + pda_to_detonate.explode() /datum/data/pda/messenger_plugin/virus/frame icon = "exclamation-circle"