-fixed bug where dynamic zombie groups were being flagged as hordes, causing them to wander and be visible on the overmap
Merge remote-tracking branch 'dda/pr/6258' into dda-master

* dda/pr/6258:
  fix waterskin2, should have different volume, not bash modi
  made the RIGID flag work for containers

Conflicts:
	src/item.h
Merge remote-tracking branch 'dda/pr/7414' into dda-master

* dda/pr/7414:
  -fixed bug where dynamic zombie groups were being flagged as hordes, causing them to wander and be visible on the overmap
Don't autopickup ammo, fixes #7384.
Remove random unused function prototype.
More price fixes.
Fixes bio_storage capacity.
Remove wierd symbols
pot update
Small additions fix. Added quoses to gettext comment
The laptop and the recipe
iuse function
Made docile monsters display differently
Changed references of g->zombie(mondex) into z->
Made strings translatable
Make the overmap flash again.

- Removed the first call to timeout, is already done inside the loop.
- Use the return value of input_context::get_direction, instead of magic values.
- toggle blinking on timeout. TIMEOUT is a different event than ANY_INPUT.
Squash two bugs

One involved the No robots under your command message not displaying
correctly.

The other one involved the fact that [GetMType(mondex)->difficulty] was
not the correct difficulty of the selected monster
Cant hack things you cant see

Neither can you code if you cant read

Spell check a few strings.
Add body part side to the add_disease call in player::deal_damage for bleeding
Active items with mod need an Active UPS.
Added items to spawn list. Recipe for mod.