balance tweaks
Merge pull request #6087 from Rivet-the-Zombie/window-fix

Fixes reinforced window recipes.
Conflicts:
	data/json/recipes/recipes.json
Merge pull request #6086 from Rivet-the-Zombie/bio_face_mask-fix

Makes bio_face_mask a passive bionic.
Conflicts:
	data/json/bionics.json
	data/json/items/bionics.json
	src/npctalk.cpp
Merge branch 'CBM_Lightning_Upgrade' of https://github.com/Soyweiser/Cataclysm-DDA into Soyweiser-CBM_Lightning_Upgrade

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

Conflicts:
	src/monattack.cpp