Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos

code/modules/mapping/map_template.dm

@@ -195,6 +195,9 @@
 			deleted_atoms++
 	log_world("Annihilated [deleted_atoms] objects.")
 
+/datum/map_template/proc/post_load()
+	return
+
 //for your ever biggening badminnery kevinz000
 //❤ - Cyberboss
 /proc/load_new_z_level(file, name, orientation, list/ztraits)

code/modules/mapping/verify.dm

@@ -1,4 +1,4 @@
-/// An error report generated by [parsed_map/check_for_errors].
+/// An error report generated by [/datum/parsed_map/proc/check_for_errors].
 /datum/map_report
 	var/original_path
 	var/list/bad_paths = list()