Draft: Infection Resist/Immune

Should work, but Cata fails to load.  Committing to change branches and
test-compile the master branch.
Revert "Draft: Infection Resist/Immune"

This reverts commit f120633d3a9c2287f23882358018cdf60d2db825.
Changes as requested