diff --git a/code/modules/multiz/movement_vr.dm b/code/modules/multiz/movement_vr.dm index cc9e28b2b9..cba6ebb6c5 100644 --- a/code/modules/multiz/movement_vr.dm +++ b/code/modules/multiz/movement_vr.dm @@ -7,15 +7,17 @@ if(!A.CanPass(src, src.loc, 1, 0)) return FALSE Move(landing) - if(pulling) - pulling.forceMove(landing) + if(isliving(src)) + var/mob/living/L = src + if(L.pulling) + L.pulling.forceMove(landing) return 1 for(var/obj/O in loc) if(!O.CanFallThru(src, landing)) return 1 - if(drop_mob && !(drop_mob == src) && ismob(drop_mob) && isliving(drop_mob)) //Shitload of checks. This is because the game finds various ways to screw me over. + if(drop_mob && !(drop_mob == src)) //Shitload of checks. This is because the game finds various ways to screw me over. var/mob/living/drop_living = drop_mob if(drop_living.dropped_onto(src)) return