From 610c88afd7d05dd89bdddf3028d4f611b19998a4 Mon Sep 17 00:00:00 2001
From: ATH1909 <42606352+ATH1909@users.noreply.github.com>
Date: Wed, 3 Feb 2021 17:34:35 -0600
Subject: [PATCH]  cyborg disablers and cyborg t*sers are now emp-proof like
 the other cyborg-mounted energy-based guns are (#56481)

---
 code/modules/projectiles/guns/energy/stun.dm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 4eea745ba71..40d8c64cbd3 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -29,6 +29,9 @@
 	can_charge = FALSE
 	use_cyborg_cell = TRUE
 
+/obj/item/gun/energy/e_gun/advtaser/cyborg/emp_act()
+	return
+
 /obj/item/gun/energy/disabler
 	name = "disabler"
 	desc = "A self-defense weapon that exhausts organic targets, weakening them until they collapse."
@@ -45,3 +48,6 @@
 	desc = "An integrated disabler that draws from a cyborg's power cell. This weapon contains a limiter to prevent the cyborg's power cell from overheating."
 	can_charge = FALSE
 	use_cyborg_cell = TRUE
+
+/obj/item/gun/energy/disabler/cyborg/emp_act()
+	return