Merge pull request #8337 from PsiOmegaDelta/Map

Fixes #8334.
This commit is contained in:
Zuhayr
2015-03-03 11:58:35 +10:30
3 changed files with 58 additions and 58 deletions

View File

@@ -1076,7 +1076,7 @@ About the new airlock wires panel:
emitter_resistance *= 3
//if assembly is given, create the new door from the assembly
if (assembly)
if (assembly && istype(assembly))
assembly_type = assembly.type
electronics = assembly.electronics

View File

@@ -40,7 +40,8 @@ proc/createRandomZlevel()
var/map = pick(potentialRandomZlevels)
var/file = file(map)
if(isfile(file))
maploader.load_map(file, load_speed = 100)
maploader.load_map(file)
world.log << "away mission loaded: [map]"
for(var/obj/effect/landmark/L in landmarks_list)
if (L.name != "awaystart")

View File

@@ -53,10 +53,9 @@ dmm_suite{
*/
verb/load_map(var/dmm_file as file, var/z_offset as num, var/load_speed as num)
verb/load_map(var/dmm_file as file, var/z_offset as num)
// dmm_file: A .dmm file to load (Required).
// z_offset: A number representing the z-level on which to start loading the map (Optional).
// load_speed: How many tiles should be loaded per second, defaults to no pause (Optional)
verb/write_map(var/turf/t1 as turf, var/turf/t2 as turf, var/flags as num){
// t1: A turf representing one corner of a three dimensional grid (Required).