Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00
parent e6aaad1921 a98178251d
commit 408182758f
284 changed files with 5080 additions and 1897 deletions
@@ -117,7 +117,7 @@
 	job = "AI"

 	eyeobj.ai = src
-	eyeobj.loc = src.loc
+	eyeobj.forceMove(src.loc)
 	rename_self("ai")

 	holo_icon = getHologramIcon(icon('icons/mob/ai.dmi',"default"))