Reincarnated fixes
Merge branch 'unstable' of github.com:viveret/Survivor_Universe into unstable