Bionic UPS and UPS adapter mod
Single use actions now use appropriate UPS charges.
Pending support for things that use per turn.
Fixed improper item spawning upon atomic battery removal.
Fixed silly error
Active items with mod need an Active UPS.
Added items to spawn list. Recipe for mod.
Appease the Grammar Nazi's and Format Fuhrer's
Merge remote-tracking branches 'dda/pr/7434' and 'dda/pr/7435' into dda-master

* dda/pr/7434:
  On weather change: use the next weather segment for weather type *and* deadline.

* dda/pr/7435:
  Move game::msg_buffer to Messages class.
  fix calendar operators to use const references.
Remove unused variable.
allows game::add_msg to specify a message type, which contains a color defintion
Merge remote-tracking branch 'dda/pr/7364' into dda-master

* dda/pr/7364:
  Appease the Grammar Nazi's and Format Fuhrer's
  Active items with mod need an Active UPS. Added items to spawn list. Recipe for mod.
  Fixed silly error
  Fixed improper item spawning upon atomic battery removal.
  Single use actions now use appropriate UPS charges. Pending support for things that use per turn.
  Bionic UPS and UPS adapter mod

Conflicts:
	src/iuse.cpp
	src/player.cpp
No tabs.
Fixes.
Merge remote-tracking branch 'BevapDin/color-coded-messages' into FrankenMod

Conflicts:
	src/creature.h
	src/melee.cpp
	src/messages.cpp
	src/messages.h
	src/npc.cpp
	src/npc.h
	src/player.cpp
	src/player.h
Merge remote-tracking branch 'CleverRaven/master' into FrankenMod

Conflicts:
	src/iuse.cpp
	src/melee.cpp
Assign memorial log in player assignment operator.
Merge remote-tracking branch 'BevapDin/fix-6206' into FrankenMod