Bugfixes

Created by: clusterfack

Fixes #2920 (closed), you should be able to pat mommis again. Fixes #2905 (closed), vox raider objectives should work properly now. Code required to do it made more simple and shortened immensely