Fixed "Putting on a none would be tricky"
Corrected behavior on wearing with bad input
Remove is_style() since styles aren't ever in the inventory
Block fix
Make healed bites/infections have proper recovery times
Blood would not cover corpse and items

The most complained bug of tiles version from chinese players
Merge remote-tracking branch 'CDDA2/master'
Minor formatting fix to allow compilation without warnings on OSX

Part two of the #3405 bugfix.
Prevent using warning options OSX does not regognize while on OSX, allowing compilation

Updated part 2 of #3405 bugfix.
Fix dermatik attack
Clean up fungaloid mattack function

No actual changes made, simply reformatted for clarity while searching
for a bug.
Make tear gas blind effect based on Eyes rather then breathing.
Fix shockers shooting through glass walls
Fix spitters spitting through glass walls
Mass bugfix merge.
Fix compiling. My bad!
Merge pull request #1 from CleverRaven/master

merge from mainstream