Stomach
Merge branch 'balance' of file:///home/user/git/Cataclysm-DDA/ into balance
Tweaks
No food on ground
Stupid mistake fix
Better differentiates between the light and lightest survivor pack options.
Powdered antiseptic.

This is to disinfectant as hemostatic powder is to bandages.
Merge pull request #8414 from KA101/archercoats

Archercoats
Fixing the derp.
Merge remote-tracking branches 'dda/pr/8390' and 'dda/pr/8405' into dda-master

* dda/pr/8390:
  Fix deletion error
  Hopefully fix lua problem
  Hopefully fix the clang compiler warning
  Small numbers tweak
  Vaccine/vitamin update
  Basic health rewrite

* dda/pr/8405:
  Call reset stats after processing effects
Merge remote-tracking branch 'dda/pr/8395' into dda-master

* dda/pr/8395:
  Simplify translation in game::fling_creature.
  Fix bug in body-part conversion function.
  Change game::fling_player_or_monster to fling_creature
  Remove player::hurt and use player::apply_damage instead.
  Remove monster::hurt and replace it with Creature::apply_damage.
  Remove one player::hurt function.
  Remove monster::hit which is surprisingly not used at all
  Remove the simple monster-specific hurt function
  Remove a monster-specific hurt function.
  Add source parameter to Creature::hurt function

Conflicts:
	src/disease.cpp
Merge branch 'antiseptic-powder' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge
Merge branch 'harness-differentiation' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge
Fix
Merge branch 'seasonal_forage' of https://github.com/Reaper42/Cataclysm-DDA into merge
revert formula change

Number-based balance shift ought to go in a separate PR.  Sorry.
Merge branch 'more-monster-on-death-corrections' of https://github.com/BevapDin/Cataclysm-DDA into merge
Layering fix.
Fix fix.
Fixing things