Bugfixes:

- Security cyborgs' handcuffs now act as dispensers. This means they no longer transfer to the target when you attempt to handcuff them, instead, it creates new handcuffs and attaches them to the target.
     - Cyborgs can no longer put their module items onto people.
     - People in the starting screen can no longer see/hear admin dead-chatter.
     - Fixed some bugs with cyborg modules not deactivating properly in the HUD if you lost power or got locked down.
     - Final fix for Metroids.
     

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1986 316c924e-a436-60f5-8080-3fe189b3f50e

code/modules/mob/living/silicon/robot/life.dm

@@ -42,6 +42,7 @@
 
 			if (src.cell)
 				if(src.cell.charge <= 0)
+					uneq_all()
 					src.stat = 1
 				else if (src.cell.charge <= 100)
 					src.module_active = null
@@ -67,6 +68,7 @@
 					src.blinded = 0
 					src.stat = 0
 			else
+				uneq_all()
 				src.stat = 1
 
 
@@ -312,10 +314,7 @@
 
 		process_locks()
 			if(weapon_lock)
-				src.module_active = null
-				src.module_state_1 = null
-				src.module_state_2 = null
-				src.module_state_3 = null
+				uneq_all()
 				weaponlock_time --
 				if(weaponlock_time <= 0)
 					if(src.client)

code/modules/mob/living/silicon/robot/robot.dm

@@ -469,7 +469,7 @@
 				sleep(5)
 				src << "\red Would you like to send a report to NanoTraSoft? Y/N"
 				sleep(10)
-				src << "\red N"
+				src << "\red > N"
 				sleep(20)
 				src << "\red ERRORERRORERROR"
 				src << "\red \b ALERT: [usr] is your new master. Obey your new laws and his commands."
@@ -843,6 +843,35 @@
 		module_state_3 = null
 		inv3.icon_state = "inv3"
 
+/mob/living/silicon/robot/proc/uneq_all()
+	module_active = null
+
+	if(module_state_1)
+		if(istype(module_state_1,/obj/item/weapon/borg/sight))
+			sight_mode &= ~module_state_1:sight_mode
+		if (client)
+			client.screen -= module_state_1
+		contents -= module_state_1
+		module_state_1 = null
+		inv1.icon_state = "inv1"
+	if(module_state_2)
+		if(istype(module_state_2,/obj/item/weapon/borg/sight))
+			sight_mode &= ~module_state_2:sight_mode
+		if (client)
+			client.screen -= module_state_2
+		contents -= module_state_2
+		module_state_2 = null
+		inv2.icon_state = "inv2"
+	if(module_state_3)
+		if(istype(module_state_3,/obj/item/weapon/borg/sight))
+			sight_mode &= ~module_state_3:sight_mode
+		if (client)
+			client.screen -= module_state_3
+		contents -= module_state_3
+		module_state_3 = null
+		inv3.icon_state = "inv3"
+
+
 /mob/living/silicon/robot/proc/activated(obj/item/O)
 	if(module_state_1 == O)
 		return 1

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -186,7 +186,7 @@ obj/item/weapon/robot_module/syndicate
 /obj/item/weapon/robot_module/security/New()
 	..()
 	src.modules += new /obj/item/weapon/melee/baton(src)
-	src.modules += new /obj/item/weapon/handcuffs(src)
+	src.modules += new /obj/item/weapon/handcuffs/cyborg(src)
 	src.modules += new /obj/item/weapon/gun/energy/taser/cyborg(src)
 	src.emag = new /obj/item/weapon/gun/energy/laser/cyborg(src)