Merge branch 'master' into upstream-merge-31737

2017-10-28 02:20:25 -04:00
parent 79d6f42dfd f0ae396a65
commit 0e553b26db
291 changed files with 204450 additions and 223168 deletions
@@ -22,7 +22,7 @@
 	if(replaced)
 		replaced.Remove(M, special = 1)
 		if(drop_if_replaced)
-			replaced.forceMove(get_turf(src))
+			replaced.forceMove(get_turf(M))
 		else
 			qdel(replaced)