Merge pull request #6023 from Novacat/nova-basicfixes

Fixes falling phased kin
This commit is contained in:
Novacat
2019-10-03 23:01:41 -04:00
committed by GitHub
+2
View File
@@ -27,6 +27,8 @@
return //Don't ghostport, very annoying
if(AM.throwing)
return //Being thrown over, not fallen yet
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.
if(istype(AM, /obj/effect/projectile))