Merge branch 'melee-weapon-degradation' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into Rivet-the-Zombie-melee-weapon-degradation
Check __WIN32__ in string_format, too.

Also increase the buffer size to make vsnprint succeed more likely.
Remove debug message from vstring_format,

The returned string should indicate the problematic format string.
Powertool durability.
Diamond katana flag fix.
Roll back the unneeded API changes.
Make part_removal_cleanup a bit more robust.
Tweaks.
One more fix.
Formatting.
ranged.cpp reversion
Fix overmap performance issue -- make checking if the player has a pda a whole lot faster.
Fiddly little braces.
Offspring-in-progress

WIP, but committing to merge the computer PR.
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
added userdir. still very dirty
Made fullscreen mode automatically set terminal size to desktop resolution.
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.