Sort part list when inspecting vehicle.
Halve all armour values

This seems like a good start. At least now when I put on light survivour gear and stand 1 tile away from a turret, I actually die after getting shot a dozen times.
Update layering

Make layering penalties consistent with master branch for testing purposes.
bugfix

I HATE SEMICOLONS
Change trap detection mechanics

Halved perception's influence on trap detection, and added trapping skill into the calculation. Now you'll have to be both perceptive and skilled at traps to notice traps.

I always disliked how you absolutely had to have at least 10 perception if you wanted to be able to see land mines. Now you can make up for lower perception with more trapping skill; you can now see landmines at 10 per and 5 trapping skill, 8 per and 6 trapping skill, 6 per and 7 trapping skill, etc.
bugfixes

It actually works now
remove needless inclusion
Make trap detection easier

From per/2 + traps to per/2 + traps*2.

I like brackets.
Merge fix I forgot to check in.
Fixed drinking directly from a keg to prevent consuming charges if
player aborts before actually drinking.
Make rolling papers a tool so crafting code respects charges.
Changed keg examine to state current charges and percentage filled
rather than number of 250-ml volume units.
Merge pull request #7802 from kevingranade/rolling-paper-fix

Make rolling papers a tool so crafting code respects charges.
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 pull request #7773 from Izicata/patch-4

Halve all armour values
Dried beans and dried rice.

Can't do anything with em yet, this is just the foundation.