Fixes

1. Fetish SP effects don't separate trigger and effect, vanilla has to override the entire trigger. Fixes #2430 (closed)
2. Fix genemod BC so immortality is always defined. Fixes #2435 (closed)