merge [f12e7524b4 - http://git.to/1b5xo] Tfear is relatively functional, but incredibly glitchy and only has half his weapons.