From 312089d366a916da6fa640ce152fc00bae11dc83 Mon Sep 17 00:00:00 2001
From: Atlantiscze <git@stepanekjakub.cz>
Date: Sat, 20 Sep 2014 03:11:06 +0200
Subject: [PATCH] Emagged Cyborg Fix - Emagged cyborgs now can select their
 special weapon.

---
 code/modules/mob/living/silicon/robot/robot.dm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 45d2d88371e..fb4a5078da3 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1114,7 +1114,10 @@
 
 	if (href_list["act"])
 		var/obj/item/O = locate(href_list["act"])
-		if (!istype(O) || !(O in src.module.modules))
+		if (!istype(O))
+			return
+
+		if(!((O in src.module.modules) || (O == src.module.emag)))
 			return
 
 		if(activated(O))