Merge pull request #5134 from CHOMPStation2/BlackMajor-patch-2

Fixes some small transit bug.

code/game/objects/effects/map_effects/portal.dm

@@ -51,7 +51,7 @@ when portals are shortly lived, or when portals are made to be obvious with spec
 	plane = TURF_PLANE
 	layer = ABOVE_TURF_LAYER
 	appearance_flags = NONE
-	
+
 	var/obj/effect/map_effect/portal/counterpart = null // The portal line or master that this is connected to, on the 'other side'.
 
 	// Information used to apply `pixel_[x|y]` offsets so that the visuals line up.
@@ -71,8 +71,8 @@ when portals are shortly lived, or when portals are made to be obvious with spec
 
 // Called when something touches the portal, and usually teleports them to the other side.
 /obj/effect/map_effect/portal/Crossed(atom/movable/AM)
-	if(AM.is_incorporeal())
-		return
+	/*if(AM.is_incorporeal())
+		return CHOMPEdit: This is why phased critters couldn't enter z transits */
 	..()
 	if(!AM)
 		return

code/game/objects/effects/step_triggers.dm

@@ -13,13 +13,11 @@
 	return 0
 
 /obj/effect/step_trigger/Crossed(atom/movable/H as mob|obj)
-	if(H.is_incorporeal())
-		return
+	if((istype(H, /mob/observer) && !affect_ghosts) || (!istype(H, /mob/observer) && H.is_incorporeal() && !affect_ghosts))
+		return	//CHOMPEdit: Fixing some step trigger stuff to coincide with incorporeal check changes
 	..()
 	if(!H)
 		return
-	if(istype(H, /mob/observer) && !affect_ghosts)
-		return
 	Trigger(H)
 
 

modular_chomp/code/modules/mob/living/living.dm

@@ -1,2 +1,2 @@
 /mob/living/proc/vs_animate(var/belly_to_animate)
-    return
+	return

modular_chomp/code/modules/mob/mob.dm

@@ -5,4 +5,4 @@
 /mob/is_incorporeal()
 	if(incorporeal_move)
 		return 1
-	..()
+	..()