Migrate FSM-based kill events to Core FSM util OnStateEntered events

[BadMagic100]

This is a lot of work for nonfunctional improvements, and might break stuff, and needs a dependency. not doing this in hindsignt