First commit! Fixed issue #2454 (Ian loving people while dead)
Adapted to programming standard
Merge pull request #2586 from GarrusVakarian/issue#2454fix

Fixed issue #2454 (Ian loving people while dead)
do note however, that Ian still loves you very much