Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54

code/modules/spells/spell_types/area_teleport.dm

@@ -58,7 +58,7 @@
 		var/success = 0
 		while(tempL.len)
 			attempt = pick(tempL)
-			target.Move(attempt)
+			do_teleport(target, attempt, channel = TELEPORT_CHANNEL_MAGIC)
 			if(get_turf(target) == attempt)
 				success = 1
 				break
@@ -66,7 +66,7 @@
 				tempL.Remove(attempt)
 
 		if(!success)
-			target.forceMove(L)
+			do_teleport(target, L, forceMove = TRUE, channel = TELEPORT_CHANNEL_MAGIC)
 			playsound(get_turf(user), sound2, 50,1)
 
 	return

code/modules/spells/spell_types/turf_teleport.dm

@@ -40,6 +40,5 @@
 		if(!picked || !isturf(picked))
 			return
 
-		if(!target.Move(picked))
-			target.forceMove(picked)
-			playsound(get_turf(user), sound2, 50,1)
+		if(do_teleport(user, picked, forceMove = TRUE, channel = TELEPORT_CHANNEL_MAGIC))
+			playsound(get_turf(user), sound1, 50,1)