cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +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

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

@@ -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)