Compile

code/controllers/subsystem/mapping.dm

@@ -334,6 +334,7 @@ GLOBAL_LIST_EMPTY(the_station_areas)
 	for (var/map in mapvotes)
 		if (!map)
 			mapvotes.Remove(map)
+			continue
 		if (!(map in global.config.maplist))
 			mapvotes.Remove(map)
 			continue
@@ -468,9 +469,9 @@ GLOBAL_LIST_EMPTY(the_station_areas)
 		else
 			return
 
-	possible_options += "Custom"
-	var/lvl_name
-	var/datum/space_level/level
+	possible_options = "Custom"
+	var/away_name
+	var/datum/space_level/away_level
 
 	var/answer = input("What kind ? ","Away/VR") as null|anything in possible_options
 	switch(answer)
@@ -480,34 +481,22 @@ GLOBAL_LIST_EMPTY(the_station_areas)
 			var/mapfile = input("Pick file:", "File") as null|file
 			if(!mapfile)
 				return
-			lvl_name = "[mapfile] custom"
-			to_chat(usr,"<span class='notice'>Loading [lvl_name]...</span>")
+			away_name = "[mapfile] custom"
+			to_chat(usr,"<span class='notice'>Loading [away_name]...</span>")
 			var/datum/map_template/template = new(mapfile, choice, ztraits)
-			level = template.load_new_z(ztraits)
+			away_level = template.load_new_z(ztraits)
 		else
-			lvl_name = answer
-			to_chat(usr,"<span class='notice'>Loading [lvl_name]...</span>")
-			var/datum/map_template/template = new(lvl_name, choice)
-			level = template.load_new_z(ztraits)
+			away_name = answer
+			to_chat(usr,"<span class='notice'>Loading [away_name]...</span>")
+			var/datum/map_template/template = new(away_name, choice)
+			away_level = template.load_new_z(ztraits)
 
-	message_admins("Admin [key_name_admin(usr)] has loaded [lvl_name] [choice].")
-	log_admin("Admin [key_name(usr)] has loaded [lvl_name] [choice].")
-	if(!level)
-		message_admins("Loading [lvl_name] failed!")
+	message_admins("Admin [key_name_admin(usr)] has loaded [away_name] away mission.")
+	log_admin("Admin [key_name(usr)] has loaded [away_name] away mission.")
+	if(!away_level)
+		message_admins("Loading [away_name] failed!")
 		return
 
-
-	if(choice == AWAY_MISSION_NAME && GLOB.the_gateway)
-		//Link any found away gate with station gate
-		var/obj/machinery/gateway/centeraway/new_gate
-		for(var/obj/machinery/gateway/centeraway/G in GLOB.machines)
-			if(G.z == level.z_value) //I'll have to refactor gateway shitcode before multi-away support.
-				new_gate = G
-				break
-		//Link station gate with away gate and remove wait time.
-		GLOB.the_gateway.awaygate = new_gate
-		GLOB.the_gateway.wait = world.time
-
 /datum/controller/subsystem/mapping/proc/RequestBlockReservation(width, height, z, type = /datum/turf_reservation, turf_type_override, border_type_override)
 	UNTIL((!z || reservation_ready["[z]"]) && !clearing_reserved_turfs)
 	var/datum/turf_reservation/reserve = new type