Correct the policecar's id usage.
fix wrong comparison
Tweaked the Makeshift Knife

Allowed the recipe to use 100 sinew, thread, or plant fiber as well as
two units of six inch string alongside existing materials.
Merge pull request #4897 from EkarusRyndren/TweaksTheKnife

Tweaked the Makeshift Knife
use tag MODE_AUX instead of AUX_MODE
Merge pull request #4896 from BevapDin/fix-unloading

fix wrong comparison
Merge pull request #4898 from BevapDin/fix-loading-with-auxweapon

use tag MODE_AUX instead of AUX_MODE
Merge pull request #4891 from ianestrachan/correct-policecar-id

Correct the policecar's id usage.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into creature-rework
Further melee/ranged refinements

* flaming weapons now apply heat damage instead of always applying onfire
* heat damage has chance of setting on fire, increasing with amount of damage
* added bash/stab crit effects back in (stun and "forced to ground")
* better code architecture with block_hit etc
* mutation special attacks now trigger as separate attack events instead of
just adding damage to current effect