diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 4812eed0d0a..b9b63ee2e9b 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -38,6 +38,9 @@ icon_state = "emittercannon" var/charge_cost = 750 +/obj/item/gun/energy/emittercannon/emp_act(severity) + return + /obj/item/borg/overdrive name = "Overdrive" icon = 'icons/obj/decals.dmi' diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 141366dd5d9..c1aebd7b84f 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -53,3 +53,6 @@ /obj/item/gun/energy/disabler/cyborg/newshot() ..() robocharge() + +/obj/item/gun/energy/disabler/cyborg/emp_act(severity) + return