Merge branch 'master' into upstream-merge-30763

2017-09-30 15:30:46 -04:00
parent 4f4fe98240 a6a4deb94c
commit 04d071deda
252 changed files with 6549 additions and 5230 deletions
@@ -50,7 +50,7 @@ SUBSYSTEM_DEF(mapping)
 	var/space_zlevels = list()
 	for(var/i in ZLEVEL_SPACEMIN to ZLEVEL_SPACEMAX)
 		switch(i)
-			if(ZLEVEL_MINING, ZLEVEL_LAVALAND, ZLEVEL_EMPTY_SPACE, ZLEVEL_TRANSIT)
+			if(ZLEVEL_MINING, ZLEVEL_LAVALAND, ZLEVEL_EMPTY_SPACE, ZLEVEL_TRANSIT, ZLEVEL_CITYOFCOGS)
 				continue
 			else
 				space_zlevels += i