CBM reshuffle

Breaks the CBM butchering flag into three groups:
CBM_CIV, found on shockers, drops the common bionics.
CBM_SCI from scientists gives augs slanted toward their needs, and
CBM_OP gives augs that a bionic operator might have.

And yeah, you can have those augs when you cut them out of Cpl. Heston's
Cold Dead Corpse.  Created zombie_bio_op, a buffed soldier zed with
shocker counter and a nasty melee special.
Tweak bio_op, remove template

Dialed down the loot and changed the color scheme.  Let me know if
you've got any better ideas for the contrast on that zed.

(Needed two shotgun blasts to the head in gun-trials.  I like it!)
Conflicts:
	src/mtype.h
	src/tile_id_data.h

Straightforward.
Fix for V search crash issue #6900.
line_to won't crash now when drawing from/to same spot (#6900).
Forgot the return.
Merge pull request #6949 from KA101/CBMReorg

CBM reshuffle