Fixed drinking directly from a keg to prevent consuming charges if
player aborts before actually drinking.
Changed keg examine to state current charges and percentage filled
rather than number of 250-ml volume units.
Turret upgrade

It turns out that typical defense turrets were using a SMG ...made from
a pipe and a piece of wood.  No wonder they weren't much of a threat to
endgame armor.

So this upguns the typical lab turret to use an MP5 instead, and creates
the new military-grade M4 turret.  With its upgraded actuators, doubled
ammo capacity, increased HP, deadly-looking green paint job, and ability
to reach out with its 5.56 and touch you 36 tiles away*, these ought to
make miloutposts a little more respectable.

*High-powered lights force night raiders out to range 7.  Helps against
rock-throwing terrorists!
Shortens fluff in description

Ought to help it fit in smaller boxes.
Fixes drops, adds spawn

Almost forgot.
Merge remote-tracking branches 'dda/pr/7748', 'dda/pr/7786' and 'dda/pr/7803' into dda-master

* dda/pr/7748:
  Sort part list when inspecting vehicle.

* dda/pr/7786:
  Make trap detection easier
  remove needless inclusion
  bugfixes
  Change trap detection mechanics

* dda/pr/7803:
  Changed keg examine to state current charges and percentage filled rather than number of 250-ml volume units.
  Fixed drinking directly from a keg to prevent consuming charges if player aborts before actually drinking.
Merge pull request #7804 from KA101/turretupgrade

Turret upgrade
Merge remote-tracking branch 'CleverRaven/master' into FrankenMod

Conflicts:
	src/tile_id_data.h