From 24c64ae0a66898d31e8761024848e442e1686e2e Mon Sep 17 00:00:00 2001
From: BlackMajor <henrydyer6@hotmail.com>
Date: Sun, 16 Oct 2022 11:33:57 +1300
Subject: [PATCH] Fixes

---
 code/game/objects/effects/map_effects/portal.dm | 6 +++---
 code/game/objects/effects/step_triggers.dm      | 6 ++----
 modular_chomp/code/modules/mob/living/living.dm | 7 +------
 modular_chomp/code/modules/mob/mob.dm           | 7 ++++++-
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/code/game/objects/effects/map_effects/portal.dm b/code/game/objects/effects/map_effects/portal.dm
index ede5cbdaca..f07ba99767 100644
--- a/code/game/objects/effects/map_effects/portal.dm
+++ b/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
diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm
index 56cc000dc9..9b66d1b3c1 100644
--- a/code/game/objects/effects/step_triggers.dm
+++ b/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)
 
 
diff --git a/modular_chomp/code/modules/mob/living/living.dm b/modular_chomp/code/modules/mob/living/living.dm
index 4fe7c57468..9fef43f42d 100644
--- a/modular_chomp/code/modules/mob/living/living.dm
+++ b/modular_chomp/code/modules/mob/living/living.dm
@@ -1,7 +1,2 @@
 /mob/living/proc/vs_animate(var/belly_to_animate)
-	return
-
-/mob/living/is_incorporeal()
-	if(incorporeal_move)
-		return 1
-	..()
+	return
\ No newline at end of file
diff --git a/modular_chomp/code/modules/mob/mob.dm b/modular_chomp/code/modules/mob/mob.dm
index ba287eada4..6396fabe20 100644
--- a/modular_chomp/code/modules/mob/mob.dm
+++ b/modular_chomp/code/modules/mob/mob.dm
@@ -1,3 +1,8 @@
 /mob
 	var/voice_freq = 42500	// Preference for character voice frequency
-	var/list/voice_sounds_list = list()	// The sound list containing our voice sounds!
\ No newline at end of file
+	var/list/voice_sounds_list = list()	// The sound list containing our voice sounds!
+
+/mob/is_incorporeal()
+	if(incorporeal_move)
+		return 1
+	..()
\ No newline at end of file