[N1] - More values pulled out to DEFINEs, improved the survivor pickup to check each buddy tank rather than closest object, etc.