shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3754 from Citadel-Station-13/upstream-merge-32282

Browse Source 
[MIRROR] Fix ghosts causing portals to spark
This commit is contained in:
LetterJay
2017-11-02 04:20:43 -05:00
committed by GitHub
parent 4af81f0a3a 2d215cf1fb
commit 18e4c1c6a0
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/portals.dm
+1 -1
View File
@@ -124,7 +124,7 @@
return ..()
/obj/effect/portal/proc/teleport(atom/movable/M)
if(!istype(M) || istype(M, /obj/effect) || (ismecha(M) && !mech_sized) || (!isobj(M) && !ismob(M))) //Things that shouldn't teleport.
if(!istype(M) || istype(M, /obj/effect) || isobserver(M) || (ismecha(M) && !mech_sized) || (!isobj(M) && !ismob(M))) //Things that shouldn't teleport.
return
var/turf/real_target = get_link_target_turf()
if(!istype(real_target))