cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes some small transit bug.
This commit is contained in:
Razgriz
2022-10-15 23:13:16 -07:00
committed by GitHub
parent 07378cb72d 24c64ae0a6
commit 81da61dd70
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/effects/map_effects/portal.dm
View File

@@ -51,7 +51,7 @@ when portals are shortly lived, or when portals are made to be obvious with spec
plane = TURF_PLANE plane = TURF_PLANE
layer = ABOVE_TURF_LAYER layer = ABOVE_TURF_LAYER
appearance_flags = NONE 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'. 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. // 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. // Called when something touches the portal, and usually teleports them to the other side.
/obj/effect/map_effect/portal/Crossed(atom/movable/AM) /obj/effect/map_effect/portal/Crossed(atom/movable/AM)
if(AM.is_incorporeal()) /*if(AM.is_incorporeal())
return return CHOMPEdit: This is why phased critters couldn't enter z transits */
..() ..()
if(!AM) if(!AM)
return return

6
code/game/objects/effects/step_triggers.dm
View File

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

2
modular_chomp/code/modules/mob/living/living.dm
View File

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

2
modular_chomp/code/modules/mob/mob.dm
View File

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