Merge pull request #8073 from KA101/fixfix

Fix fix
consumes water properly from toilets
Introduce end-of-line normalization
Trying my hand at map making.
Fix loop condition, should check for end, not start

remove call to item_controller, the id of the returned item type is always the same as the parameter,
e.g. "item_controller->find_template(X)->id == X" is always true
check for valid iterator, use default (first) entry if iterator is invalid
Added conversation for the Old Guard representative and mercenary
Added conversation tactics and merchant restocking
Added shop_restock()
Added new npcs to the json spawning
Added merchant/shop restocking

100 needs to be reset to 14400 * 3 after testing
Filling with a few more npcs and a few structural changes...
Partially revert "initialize vehicle direction in its constructor"

Set direction of new vehicle to the requested values.
Merge remote-tracking branch 'dda/pr/8071' into dda-master

* dda/pr/8071: (22 commits)
  formatting
  format
  format
  formatting
  format
  format
  format
  formatting
  форматирование
  test
  ready
  почти готово
  готово?
  и ещё
  пара улучшений
  создал мод, как полагается
  дальше
  Успех, мои бомбы наконец-то взрываются!
  More radio items!
  iuse
  ...

Conflicts:
	src/crafting.cpp
	src/game.cpp
	src/iuse.cpp
Merge remote-tracking branch 'dda/pr/8076' into dda-master

* dda/pr/8076:
  Fix loop condition, should check for end, not start
Merge remote-tracking branch 'dda/pr/8079' into dda-master

* dda/pr/8079:
  Partially revert "initialize vehicle direction in its constructor"
Fixes freaky shotgun voodoo.

Currently you can saw down either of the pump-action shotguns and it
will mystically transform them into a sawed-off double barrel shotgun.
The simplest solution to this weirdness seems to be simply limiting the
recipe to only use a double-barrel shotgun to begin with.
Fixed silo, bunker, lab, and temple with a more permanant zlevel=0 instead of a t_above=="open_air" or "".
Merge remote-tracking branch 'dda/pr/8072' into dda-master

* dda/pr/8072:
  Remove mapbuffer::submap_list
  Avoid possible memory leaks with std::unique_ptr
  Enhance class submap:
  Remove the enum mapgen_function_type.
  Remove world coordinates from map::shift.
  Add map::load_abs, using absolute coordinates.
  Remove all parameters from map::save

Conflicts:
	src/game.cpp
Merge remote-tracking branches 'dda/pr/8075' and 'dda/pr/8080' into dda-master

* dda/pr/8075:
  Trying my hand at map making.

* dda/pr/8080:
  Fixed silo, bunker, lab, and temple with a more permanant zlevel=0 instead of a t_above=="open_air" or "".
NPCs actually care if you shoot at them...