MAPPING: allow mappers to define NPC marines
CRASH: fix a few crashes in the NPC marine code