Resolves conflicts, cherrypicks my code.
Fixes a runtime I made by improper conflict resolution.
Merge pull request #7094 from Neerti/borg_hud_port_2

Semi-ports /tg/'s cyborg HUD, now with less merge conflict!