Fixed death and the non-interactive null cardbox
Merge branch 'post_jam_stabbing'