Merge pull request #1173 from Datraen/TraitorBorgFix

Traitor Borg lockdown, blowing-up fixed; can now self-hack.

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

@@ -336,7 +336,7 @@
 			weaponlock_time = 120
 
 /mob/living/silicon/robot/update_canmove()
-	if(paralysis || stunned || weakened || buckled || lockcharge || !is_component_functioning("actuator")) canmove = 0
+	if(paralysis || stunned || weakened || buckled || lockdown || !is_component_functioning("actuator")) canmove = 0
 	else canmove = 1
 	return canmove
 

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

@@ -81,7 +81,8 @@
 	var/weapon_lock = 0
 	var/weaponlock_time = 120
 	var/lawupdate = 1 //Cyborgs will sync their laws with their AI by default
-	var/lockcharge //Used when locking down a borg to preserve cell charge
+	var/lockcharge //Used when looking to see if a borg is locked down.
+	var/lockdown = 0 //Controls whether or not the borg is actually locked down.
 	var/speed = 0 //Cause sec borgs gotta go fast //No they dont!
 	var/scrambledcodes = 0 // Used to determine if a borg shows up on the robotics console.  Setting to one hides them.
 	var/tracking_entities = 0 //The number of known entities currently accessing the internal camera
@@ -864,6 +865,7 @@
 	disconnect_from_ai()
 	lawupdate = 0
 	lockcharge = 0
+	lockdown = 0
 	canmove = 1
 	scrambledcodes = 1
 	//Disconnect it's camera so it's not so easily tracked.
@@ -887,6 +889,7 @@
 	// They stay locked down if their wire is cut.
 	if(wires.LockedCut())
 		state = 1
+	lockdown = state
 	lockcharge = state
 	update_canmove()
 

code/modules/nano/interaction/base.dm

@@ -32,6 +32,6 @@
 	. = STATUS_INTERACTIVE
 	if(cell.charge <= 0)
 		return STATUS_CLOSE
-	if(lockcharge)
+	if(lockdown)
 		. = STATUS_DISABLED
 	return min(., ..())