Fixes and stuff [CHANGELOG][DO NOT MERGE YET]

Fixes #1572
Fixes #1605

and also makes the captain convertible during cult.

Thanks to jordie, aranclanos, giacom, dr singh from goon, and a bunch of other folks for helping me out, both with finding shit, and actually working git. Holy fuck.

Also those small little comments were because I was testing how to commit without any actual changes to the code so I had to add comments to the side to get them to commit. Sorry about that.

I added a changelog, but if you don't want it, you can remove it and stuff, yada yada.