Merge remote-tracking branch 'upstream/dev-freeze' into dev

.travis.yml

@@ -19,4 +19,5 @@ install:
 script:
   - shopt -s globstar
   - (! grep 'step_[xy]' maps/**/*.dmm)
+  - (! find nano/templates/ -type f -exec md5sum {} + | sort | uniq -D -w 32 | grep nano)
   - DreamMaker baystation12.dme

code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm

@@ -34,7 +34,7 @@
 				sparks.set_up(3, 0, get_turf(M))
 				sparks.start()
 				//
-				M.loc = pick(orange(get_turf(T), 50))
+				M.Move(pick(trange(50, get_turf(holder))))
 				sparks = new /datum/effect/effect/system/spark_spread()
 				sparks.set_up(3, 0, get_turf(M))
 				sparks.start()

html/changelogs/PsiOmegaDelta-ArtifactTele-150516.yml

@@ -0,0 +1,5 @@
+author: PsiOmegaDelta
+delete-after: True
+
+changes: 
+  - bugfix: "Teleporter artifacts should no longer teleport mobs inside objects."