Dev melee attacks

merging attack delay changes...