Gun combat messages

When the guns were renamed, the combat messages were not updated.

The messages still refer to the old gun names. For example, "Seburo 6mm".

I did a quick check of the others. They're all either correct names or use gun/pistol in place of the object name except for the Nine17 which has PPK/s messaging still.