Merge pull request #4921 from Heroman3003/fade-fix

Fixes some mob bugs

code/modules/mob/living/simple_mob/simple_mob_vr.dm

@@ -121,6 +121,8 @@
 			return EatTarget(L)
 		else
 			return ..()
+	else
+		return ..()
 
 
 /mob/living/simple_mob/proc/CanPounceTarget(var/mob/living/M) //returns either FALSE or a %chance of success

code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm

@@ -1,7 +1,7 @@
 // Phase shifting procs (and related procs)
 /mob/living/simple_mob/shadekin/proc/phase_shift()
 	var/turf/T = get_turf(src)
-	if(!T.CanPass(null,T) || loc != T)
+	if(!T.CanPass(src,T) || loc != T)
 		to_chat(src,"<span class='warning'>You can't use that here!</span>")
 		return FALSE
 

vorestation.dme

@@ -144,6 +144,7 @@
 #include "code\_onclick\hud\robot.dm"
 #include "code\_onclick\hud\robot_vr.dm"
 #include "code\_onclick\hud\screen_objects.dm"
+#include "code\_onclick\hud\screen_objects_vr.dm"
 #include "code\_onclick\hud\spell_screen_objects.dm"
 #include "code\ATMOSPHERICS\_atmos_setup.dm"
 #include "code\ATMOSPHERICS\_atmospherics_helpers.dm"