Merge branch 'master' into upstream-merge-29839

2017-09-11 18:03:51 -05:00
parent 7b157a9a6a 914cc38a2d
commit 935ae98f4a
92 changed files with 2479 additions and 2105 deletions
@@ -587,7 +587,7 @@
 			var/turf/T = get_turf(client.eye)
 			stat("Location:", COORD(T))
 			stat("CPU:", "[world.cpu]")
-			stat("Instances:", "[world.contents.len]")
+			stat("Instances:", "[num2text(world.contents.len, 10)]")
 			GLOB.stat_entry()
 			config.stat_entry()
 			stat(null)