Changed my mind about Shooter collision detection.
I made collision detection in the Shooter scenes work the same as in Rpg; entities colliding with the player will instead be accomplished by update scripts.  This lets me put side walls, etc. on the Shooter scene maps without making everything really funky (bump into a wall tile entity and it disappears, etc.)