added actual objects, fixed moved deathstate into popups
Merge branch 'master' of https://github.com/ChocMaltHoney/Neuroleptic