July 5th TG sync (#1883)

July 5th TG sync
2017-07-05 22:14:19 -05:00
parent 454b9c3d68
commit b1b4826c0c
1264 changed files with 149689 additions and 570309 deletions
@@ -1,63 +1,63 @@
-// How much "space" we give the edge of the map
-GLOBAL_LIST_INIT(potentialRandomZlevels, generateMapList(filename = "config/awaymissionconfig.txt"))
-
-/proc/createRandomZlevel()
-	if(GLOB.awaydestinations.len)	//crude, but it saves another var!
-		return
-
-	if(GLOB.potentialRandomZlevels && GLOB.potentialRandomZlevels.len)
-		to_chat(world, "<span class='boldannounce'>Loading away mission...</span>")
-		var/map = pick(GLOB.potentialRandomZlevels)
-		load_new_z_level(map)
-		to_chat(world, "<span class='boldannounce'>Away mission loaded.</span>")
-
-/proc/reset_gateway_spawns(reset = FALSE)
-	for(var/obj/machinery/gateway/G in world)
-		if(reset)
-			G.randomspawns = GLOB.awaydestinations
-		else
-			G.randomspawns.Add(GLOB.awaydestinations)
-
-/obj/effect/landmark/awaystart
-	name = "away mission spawn"
-	desc = "Randomly picked away mission spawn points"
-
-/obj/effect/landmark/awaystart/New()
-	GLOB.awaydestinations += src
-	..()
-
-/obj/effect/landmark/awaystart/Destroy()
-	GLOB.awaydestinations -= src
-	return ..()
-
-/proc/generateMapList(filename)
-	var/list/potentialMaps = list()
+// How much "space" we give the edge of the map
+GLOBAL_LIST_INIT(potentialRandomZlevels, generateMapList(filename = "config/awaymissionconfig.txt"))
+
+/proc/createRandomZlevel()
+	if(GLOB.awaydestinations.len)	//crude, but it saves another var!
+		return
+
+	if(GLOB.potentialRandomZlevels && GLOB.potentialRandomZlevels.len)
+		to_chat(world, "<span class='boldannounce'>Loading away mission...</span>")
+		var/map = pick(GLOB.potentialRandomZlevels)
+		load_new_z_level(map)
+		to_chat(world, "<span class='boldannounce'>Away mission loaded.</span>")
+
+/proc/reset_gateway_spawns(reset = FALSE)
+	for(var/obj/machinery/gateway/G in world)
+		if(reset)
+			G.randomspawns = GLOB.awaydestinations
+		else
+			G.randomspawns.Add(GLOB.awaydestinations)
+
+/obj/effect/landmark/awaystart
+	name = "away mission spawn"
+	desc = "Randomly picked away mission spawn points"
+
+/obj/effect/landmark/awaystart/New()
+	GLOB.awaydestinations += src
+	..()
+
+/obj/effect/landmark/awaystart/Destroy()
+	GLOB.awaydestinations -= src
+	return ..()
+
+/proc/generateMapList(filename)
+	var/list/potentialMaps = list()
 	var/list/Lines = world.file2list(filename)
-
-	if(!Lines.len)
-		return
-	for (var/t in Lines)
-		if (!t)
-			continue
-
-		t = trim(t)
-		if (length(t) == 0)
-			continue
-		else if (copytext(t, 1, 2) == "#")
-			continue
-
-		var/pos = findtext(t, " ")
-		var/name = null
-
-		if (pos)
-			name = lowertext(copytext(t, 1, pos))
-
-		else
-			name = lowertext(t)
-
-		if (!name)
-			continue
-
-		potentialMaps.Add(t)
-
-	return potentialMaps
+
+	if(!Lines.len)
+		return
+	for (var/t in Lines)
+		if (!t)
+			continue
+
+		t = trim(t)
+		if (length(t) == 0)
+			continue
+		else if (copytext(t, 1, 2) == "#")
+			continue
+
+		var/pos = findtext(t, " ")
+		var/name = null
+
+		if (pos)
+			name = lowertext(copytext(t, 1, pos))
+
+		else
+			name = lowertext(t)
+
+		if (!name)
+			continue
+
+		potentialMaps.Add(t)
+
+	return potentialMaps