Makes electrical resistance protect the player from angry computers.
Fix overmap performance issue -- make checking if the player has a pda a whole lot faster.
Fiddly little braces.
Merge branch 'console-trap-fix' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into Rivet-the-Zombie-console-trap-fix
don't display npc skill level increase messages
Add fusion blaster fake gun to trader avoid.

Thanks to IRCer cosmodius95 for playing with NPCs on and reporting
oddities!
Per request, also add finger laser and lightning.

Thank you, @John-Candlebury.
Merge pull request #6553 from dvolk/suppress_npc_levels

don't display npc skill level increase messages
Merge pull request #6556 from narc0tiq/no-fusion-arms-on-npcs

Add fusion blaster fake gun to trader avoid.
Merge pull request #6547 from BevapDin/fix-string-format

Fix the "invalid input to string_format function!" message
remove map::traps vector and use g->traps instead
add constant access to field iterator
add some actions to shift the view vertically
add some terrain types for z-leves above 0
make critter position functions const

add Creature::pos, returning a tripoint
implement them for monster, npc, player
change creature_tracker to use tripoints
make wrapper for rl_dist that take tripoint and point
make map::drawsq and map::draw expect a tripoint as center
replace INBOUNDS macro with inbounds function

make inbounds const, add wrapper for tripoint
move call to map::build_map_cache outside of game::draw_ter

Instead of calling it (which will take a long time with z-levels) from draw_ter, call it before calling draw_ter.

In some places a call to build_map_cache is not needed at all!
extend tripoint to be json compatible
remove the monsters-on-stairs system, not needed for z-levels