Add some drinks to the fridge.
Merge pull request #5433 from Izicata/patch-7

Update README.txt
Merge some fixes.
Merge pull request #5428 from KA101/recharger-fix

[Ready] Fix recharger capacity-checking
Adds Deadened mutation

Get this one and you'll never feel pain again.

At least from any source of this world.
Merge some new features and content.
Merge remote-tracking branch 'dda/master' into dda-master
Merge hospital room items.

Conflicts:
	data/json/item_groups.json
As requested
Merge pull request #5423 from kevingranade/no-deafening-chorus-of-engines

No deafening chorus of engines
Merge remote-tracking branch 'upstream/master' into other-crafting-approch

# By Denis Volk (5) and others
# Via Kevin Granade (4) and others
* upstream/master: (30 commits)
  minor typo
  Fixed mutation downgrading applying effects twice
  Fixed purifier serum recipe
  remove pointless \n\n from item descriptions
  give loaded artifact tools their proppr iuse function
  Backer "Viktor Kuropiatnyk" added.
  Indentation fix.
  Input: In get_input(), first check if the key is mapped to a directional action before interpreting it using hard coded key codes.
  doc(output): update comment w/ current usage
  fix(npctalk): show npc dialogue when LOCALIZE=0
  bug(monattack): friendly laser turrets shouldn't shoot you
  cleanup(overmap): remove unused function
  bug(overmap): fix FTBFS on OS X 10.6
  Parks and megastores
  Vending machines, mkII
  Tweak.
  Tweak.
  .
  accessory for men
  fix typo for barrette.
  ...

# Bitte gebe eine Versionsbeschreibung ein um zu erklären, warum diese Zusammenführung erforderlich ist,
# insbesondere wenn es einen aktualisierten, externen Zweig mit einem Thema-Zweig zusammenführt.
#
# Zeilen beginnend mit '#' werden ignoriert, und eine leere Beschreibung bricht die Eintragung ab.
Merge remote-tracking branch 'upstream/master' into other-crafting-approch

* upstream/master: (63 commits)
  Add some drinks to the fridge.
  Add hotdogs to the cart.
  reformat if statement
  fix some irregularities
  functional scrolling
  Add food items to the food cart.
  what
  Update COMPILING_osx.md
  Update README.txt
  Let's just pretend these additional commits didn't exist
  the one time I don't have time to test my changes, everything breaks
  Forgot to add tools "requirement" to fur loincloth
  Changes fur loinclotch to require two pelts instead of one (and removed the strange thread requirement)
  Adds assignment operators for Character and Creature, call those from player::operator=
  Add ALL category to craft menu. I combined CSC_ARMOR_SUIT and CSC_ARMOR_BACK to fit on the screen. Change color of Overweight.
  use_amount_square helper
  Fix recharger capacity-checking
  Decrease the initial player map scope, add options to change it.
  Moves bed-stuff next to the bed
  Restores bed's CONTAINER status
  ...

Conflicts:
	data/json/items/vehicle_parts.json
	data/json/recipes/recipes.json
	src/inventory.cpp
	src/item.cpp
	src/map.cpp
use json to store and load status of convertible vehicles
fix invalid access to non-existing game instance
add more information to the recycler menu
remove some redundancy, make a sound earlier
disable grabbing for furniture with move_str_req < 0
call map::sees with range=-1, instead of 0
fix comment and use -1 as range parameter for map::sees
make a forced move for monsters a free move - applies to displaced vermin