* runtime fix for borgs cryoing with upgrade modules + no more mmi laying around after they cryo, and various other runtime fixes
* Fixing conflicts
Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
* Makes research done from the tablet tracked for the R&D server controller and admin logs (#58328)
* Makes research done from the tablet tracked for the R&D server controller and admin logs
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>