From 010f305ee2a8a95faa5ec9ef7aa66331ebac0926 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Mon, 2 Jan 2017 09:07:11 -0500 Subject: [PATCH] Fixes portals moving anchored atoms (#22587) * Fixes portals moving anchored objects * Missing a letter * Mecha --- code/modules/events/wormholes.dm | 2 +- code/modules/mining/equipment.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/events/wormholes.dm b/code/modules/events/wormholes.dm index d141c308775..e90182cb584 100644 --- a/code/modules/events/wormholes.dm +++ b/code/modules/events/wormholes.dm @@ -60,7 +60,7 @@ /obj/effect/portal/wormhole/teleport(atom/movable/M) if(istype(M, /obj/effect)) //sparks don't teleport return - if(M.anchored && istype(M, /obj/mecha)) + if(M.anchored && !istype(M, /obj/mecha)) return if(istype(M, /atom/movable)) diff --git a/code/modules/mining/equipment.dm b/code/modules/mining/equipment.dm index c4c4e55ca8f..5b88a99462e 100644 --- a/code/modules/mining/equipment.dm +++ b/code/modules/mining/equipment.dm @@ -143,7 +143,7 @@ desc = "A stable hole in the universe made by a wormhole jaunter. Turbulent doesn't even begin to describe how rough passage through one of these is, but at least it will always get you somewhere near a beacon." /obj/effect/portal/wormhole/jaunt_tunnel/teleport(atom/movable/M) - if(istype(M, /obj/effect)) + if(M.anchored || istype(M, /obj/effect)) return if(istype(M, /atom/movable))