Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins

This commit is contained in:
Crazylemon64
2016-06-24 16:03:10 -07:00
547 changed files with 24802 additions and 9055 deletions
+4 -4
View File
@@ -62,10 +62,10 @@
/proc/preloadTemplates(path = "_maps/map_files/templates/") //see master controller setup
var/list/filelist = flist(path)
for(var/map in filelist)
var/datum/map_template/T = new(path = "[path][map]", rename = "[map]")
map_templates[T.name] = T
for(var/map in flist(path))
if(cmptext(copytext(map, length(map) - 3), ".dmm"))
var/datum/map_template/T = new(path = "[path][map]", rename = "[map]")
map_templates[T.name] = T
if(!config.disable_space_ruins) // so we don't unnecessarily clutter start-up
preloadRuinTemplates()