Teleport trap

To. #5745
Previous request # 5821 removed because of my mistakes in working with
git.
Fix typo
Fixed alcohol not affecting your stats at all.

Apprently, alcohol handling was using broken or outdated methods, which
resulted in none of it's effects on your stats working.
Note that alcohol is now EXTREMELY damaging to your stats compared to
what it was before (I don't even know how long this bug was around),
because the debuffs from alcohol stack on top of the debuffs from
alcohol counting as a powerful depressant.
In fact, the debuffs from alcohol being a depressant are more damaging
than the alcohol itself: perhaps alcoholic drinks could be given
slightly higher STIM values to offset this.
Update and Merge all git ignores.
Craftable vehicle batteries

New item "lead plate" and recipes for small storage, motorcycle, car,
and truck batteries.
Change default and minimum terminal height

... from 25 back to 24 lines.

It was changed in #5748 (don't know why).
Some Tweaking

Batteries now need water and acid, plates are made with fabrication
skill, battery cases are made with plastic instead of scrap.
booking recipes

Recipes for batteries are learned from electronics books, same as
regular batteries.  Batteries also require fewer cables.
draw description of stats in the separate window
More tweaks

Add fabrication skill to batteries, take longer to build, requires rags.
keep list of mods on reset of world

fix crash when displaying a specific number of world to pick one
Astyle lightmap.cpp and lightmap.h
Adds two more sizes of craftable waterskins.

Allows the player to save a small amount of weight overhead in the long
run by using more materials when crafting.
Adjust plates

Plates are now bigger, need fewer of them to make batteries,.  Also
adjusted crafting time, water-acid mix, added scrap to recipes, and
added decomp_learn to lead plates.
Fixes dieases: Infection, hallucination, evil
Merge branch 'diseasefix' of https://github.com/9600bauds/Cataclysm-DDA into 9600bauds-diseasefix
Merge pull request #5924 from Rivet-the-Zombie/waterskins

Adds two more sizes of craftable waterskins.
TSM: now rewarding for Cannibals

Fixes #5863.
Merge pull request #5930 from KA101/TSM-Morale

TSM: now rewarding for Cannibals
It's really quite easy to make mayonnaise/aioli/remoulade. Since some
recipes call for it and all the ingredients are already in-game, why not
have a recipe?