CleverRaven/Cataclysm-DDA — pull request #4230 by freezerbunny (2013-11-09 05:00:00+00:00)
Title: Changed display for weapon mode, attachment, and combat style.

Changed status display for weapon mode, attachment, and combat style.

http://i.imgur.com/zULo2An.png

Will display the weapon, its ammunition, and firing mode: e.g. "Bushmaster AR (100+4) (Burst)"
When attachment is selected: "masterkey shotgun (4) (Mod)"

Combat style will display:
"Normal" - if any weapon is chosen AND the current style does not allow melee with weapons
Otherwise it displays the active chosen style. If the combat style allows melee, it will show the style instead of "Normal". Otherwise the melee weapon/gun will display "Normal".

Obviously there is some refactoring that can be done (e.g. merging the burst mode text into the weapon name dump).