Merge branch 'master' into mapsyncs43293845982

2018-01-07 20:23:00 +00:00
parent ca058b1266 cc0cb03046
commit d2ec28b1e6
29 changed files with 207 additions and 153 deletions
@@ -49,8 +49,8 @@
 	SSair.setup_template_machinery(atmos_machines)

 /datum/map_template/proc/load_new_z()
-	var/x = round(world.maxx/2)
-	var/y = round(world.maxy/2)
+	var/x = round((world.maxx - width)/2)
+	var/y = round((world.maxy - height)/2)

 	var/list/bounds = maploader.load_map(file(mappath), x, y)
 	if(!bounds)