Fixes portals moving anchored atoms (tgstation#22587)

* Fixes portals moving anchored objects * Missing a letter * Mecha
AdamAlake · Jan 2, 2017 · 010f305 · 010f305
1 parent 5628bbe
commit 010f305
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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))