Attempt to fix Robo-Cyphosis and Gangplank

This might fix Robo-Cyphosis's sapper rendering as a engineer box and
going away after weapon switch.
Also might fix Gangplank doing insane damage and gathering ammo.