More merge conflict fixes.

code/game/objects/items/robot/robot_upgrades.dm

@@ -84,7 +84,7 @@
 
 	R.stat = UNCONSCIOUS
 	R.update_stat()
-	if(R.camera && !R.wires.IsCameraCut())
+	if(R.camera && !R.wires.is_cut(WIRE_CAMERA))
 		R.camera.toggle_cam(R,0)
 	dead_mob_list -= R //please never forget this ever kthx
 	living_mob_list += R
@@ -294,4 +294,4 @@
 			cyborg << "<span class='notice'>Self-repair is active in <span class='boldnotice'>[msgmode]</span> mode.</span>"
 			msg_cooldown = world.time
 	else
-		deactivate()
+		deactivate()