Merge pull request #6142 from Soyweiser/bionic_deaf2

bio_noise deafness fix.
Merge branch 'dont-always-hide-constructions' of https://github.com/kevingranade/Cataclysm-DDA into kevingranade-dont-always-hide-constructions

Conflicts:
	src/construction.cpp
Merge branch 'Shoggoth_skin' of https://github.com/Soyweiser/Cataclysm-DDA into Soyweiser-Shoggoth_skin

Conflicts:
	data/json/monsters.json
	doc/JSON_FLAGS.md
	src/monstergenerator.cpp
Merge pull request #6166 from dholmes215/master

Minor content changes
Conflicts:
	data/json/items/tools.json
	data/json/recipes/recipes.json
Merge branch 'clong-vats' of https://github.com/BevapDin/Cataclysm-DDA into BevapDin-clong-vats
Merge pull request #6141 from KA101/FixFungus

(Ready) Fix fungus
Merge branch 'miners-hat' of github.com:BevapDin/Cataclysm-DDA
Merge pull request #6156 from KA101/Proper-growth

Consistency-checking
Merge pull request #6167 from Rivet-the-Zombie/credits-update

Updates the credits screen.
Merge pull request #6147 from BevapDin/fridges

Fixes second part of #6145
Merge pull request #6149 from BevapDin/fridge-2

make items rot even inside fridges
Merge fixes to labs.

Conflicts:
	src/mapgen.cpp
Merge pull request #6174 from Soyweiser/typo_computer

Text fix, as reminded by bugsniper.
Merge pull request #6150 from CIB/attributes_writable

Make player attributes writable by lua.
Merge pull request #6179 from VlasovVitaly/fix-pot-file

Fix pot file
Merge pull request #6176 from Soyweiser/World_Nr

Character # on new character world selection.
Merge pull request #6172 from kevingranade/computer_cleanups

Cleanups to computer.cpp suggested by bug_sniper.
Merge pull request #6171 from kevingranade/fix-world-delete

Fix world delete
Merge pull request #6170 from Rivet-the-Zombie/bubblegum-category-fix

Fixes chewing gum item category.
Merge pull request #6173 from Rivet-the-Zombie/c-4-name-fix

Fixes name of C-4 bomb.