[FIX] combat

lists are NoneTypes now, but other than that we're good.