TheDarklingWolf/Cataclysm-DDA — pull request #1214 by i2amroy (2013-05-26 03:33:02+00:00)
Title: 2 of the "Easy Fix" bug-fixes

Solves issues #1160 and #272. Also removed some unneeded spaces I stumbled upon.