Merge Conflict fix redo

I used a newer version of the map as a base and redid the changes Mostly
similary, but fixed some derps I made. Prior commits already added the
cautery+fixovein to robotics so I didn't mess with that bit.