[MERGED PR] Reworks Human Torch Trait

[zjdtmkhzt]

I'd much prefer just letting people with fire resistance and the trait be on fire forever with no ill effects. No need to always make everything nerfed, I doubt there'd be a lot of people going human torch and then getting fire resistance every round just for two trait points. That's not really worth the effort.