From 0d3e9383b36641f589b37a3b9f52f19abe8695f8 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 6 Apr 2019 16:25:56 +1000 Subject: [PATCH 1/2] Fixes some shadekin bugs --- .../living/simple_mob/subtypes/vore/shadekin/ability_procs.dm | 2 +- vorestation.dme | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm index 0be707f852e..21e0683b3c7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm +++ b/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,"You can't use that here!") return FALSE diff --git a/vorestation.dme b/vorestation.dme index 2d5e18e5aff..c8091d70a20 100644 --- a/vorestation.dme +++ b/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" From ed813429817a16ab2cc973caf08e63f64db8a249 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 6 Apr 2019 17:35:47 +1000 Subject: [PATCH 2/2] Also fixes the mobs attacking non-mob stuff --- code/modules/mob/living/simple_mob/simple_mob_vr.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm index 11c3a9827dd..d388d1ec885 100644 --- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm +++ b/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