Dev-freeze into dev.

Would appreciate it if someone could check over blast doors, I had to remove several lines to get it to compile locally.