diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 7bf0681ae9c..a2cf4cb71ed 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -130,6 +130,10 @@ desc = "A label on it reads: Warning: Activating this device will send a high-ordinance explosive to your location." droptype = /obj/machinery/syndicatebomb +/obj/item/sbeacondrop/emp + desc = "A label on it reads: Warning: Activating this device will send a high-powered electromagnetic device to your location." + droptype = /obj/machinery/syndicatebomb/emp + /obj/item/sbeacondrop/powersink desc = "A label on it reads: Warning: Activating this device will send a power draining device to your location." droptype = /obj/item/powersink diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 54f0643a89a..caa2ced3e4d 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -219,6 +219,11 @@ desc = "A salvaged syndicate device gutted of its explosives to be used as a training aid for aspiring bomb defusers." payload = /obj/item/bombcore/training +/obj/machinery/syndicatebomb/emp + name = "EMP Bomb" + desc = "A modified bomb designed to release a crippling electromagnetic pulse instead of explode" + payload = /obj/item/bombcore/emp + /obj/machinery/syndicatebomb/badmin name = "generic summoning badmin bomb" desc = "Oh god what is in this thing?" @@ -489,8 +494,20 @@ qdel(G) +/obj/item/bombcore/emp + name = "EMP payload" + desc = "A set of superconducting electromagnetic coils designed to release a powerful pulse to destroy electronics and scramble circuits" + range_heavy = 15 + range_medium = 25 +/obj/item/bombcore/emp/detonate() + if(adminlog) + message_admins(adminlog) + log_game(adminlog) + empulse(src, range_heavy, range_medium) + + qdel(src) ///Syndicate Detonator (aka the big red button)/// diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index e5b846d01f3..714d5e8dc3e 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1049,6 +1049,12 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) item = /obj/item/sbeacondrop/bomb cost = 11 +/datum/uplink_item/explosives/syndicate_bomb/emp + name = "Syndicate EMP Bomb" + desc = "A variation of the syndicate bomb designed to produce a large EMP effect." + item = /obj/item/sbeacondrop/emp + cost = 7 + /datum/uplink_item/explosives/syndicate_detonator name = "Syndicate Detonator" desc = "The Syndicate detonator is a companion device to the Syndicate bomb. Simply press the included button \ @@ -2028,4 +2034,3 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) include_modes = list(/datum/game_mode/nuclear/clown_ops) illegal_tech = FALSE -