From 8abf352b2ac28553b4e333fe95447e9137bf7899 Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Mon, 28 Apr 2014 20:09:33 -0400
Subject: [PATCH] Fixes cyborg laser + emp problem

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

diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index f165cc81963..2e76ee01857 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -61,6 +61,8 @@ obj/item/weapon/gun/energy/laser/retro
 			return 1
 	return 0
 
+/obj/item/weapon/gun/energy/laser/cyborg/emp_act()
+	return
 
 
 /obj/item/weapon/gun/energy/lasercannon