From dc050cc790e857a2549a64df2ccbad788542e09d Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 3 Oct 2019 22:45:55 -0400 Subject: [PATCH 1/2] Fixes falling phased kin --- code/game/turfs/unsimulated/sky_vr.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/turfs/unsimulated/sky_vr.dm b/code/game/turfs/unsimulated/sky_vr.dm index c7c398b996..a6f4f065eb 100644 --- a/code/game/turfs/unsimulated/sky_vr.dm +++ b/code/game/turfs/unsimulated/sky_vr.dm @@ -27,6 +27,8 @@ return //Don't ghostport, very annoying if(AM.throwing) return //Being thrown over, not fallen yet + if(AM.ability_flags & AB_PHASE_SHIFTED) + return // Phased shifted kin should not fall if(istype(AM, /obj/item/projectile)) return // pewpew should not fall out of the sky. pew. if(istype(AM, /obj/effect/projectile)) From 782b4f3e67d02d74726096636f2972666bf53548 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Thu, 3 Oct 2019 22:52:36 -0400 Subject: [PATCH 2/2] Update sky_vr.dm --- code/game/turfs/unsimulated/sky_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/turfs/unsimulated/sky_vr.dm b/code/game/turfs/unsimulated/sky_vr.dm index a6f4f065eb..c71fa6470a 100644 --- a/code/game/turfs/unsimulated/sky_vr.dm +++ b/code/game/turfs/unsimulated/sky_vr.dm @@ -27,7 +27,7 @@ return //Don't ghostport, very annoying if(AM.throwing) return //Being thrown over, not fallen yet - if(AM.ability_flags & AB_PHASE_SHIFTED) + if(!(AM.can_fall())) return // Phased shifted kin should not fall if(istype(AM, /obj/item/projectile)) return // pewpew should not fall out of the sky. pew.