bugfix: EMP no longer discharge borgs weaponry (#3864)

ss220-space · Nov 14, 2023 · fe938ce · fe938ce
1 parent abb681e
commit fe938ce
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git 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
@@ -53,3 +53,6 @@
 /obj/item/gun/energy/disabler/cyborg/newshot()
 	..()
 	robocharge()
+
+/obj/item/gun/energy/disabler/cyborg/emp_act(severity)
+	return