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

Conflicts:
	code/modules/power/port_gen.dm

code/controllers/master_controller.dm

@@ -40,7 +40,6 @@ datum/controller/game_controller
 	var/last_thing_processed
 
 	var/list/shuttle_list	                    // For debugging and VV
-	var/datum/ore_distribution/asteroid_ore_map // For debugging and VV.
 
 	var/global/datum/garbage_collector/garbageCollector
 
@@ -84,7 +83,7 @@ datum/controller/game_controller/proc/setup()
 	setupgenetics()
 	setupfactions()
 	setup_economy()
-	SetupXenoarch()
+	//SetupXenoarch()
 
 	for(var/i=0, i<max_secret_rooms, i++)
 		make_mining_asteroid_secret()
@@ -120,11 +119,6 @@ datum/controller/game_controller/proc/setup_objects()
 			var/obj/machinery/atmospherics/unary/vent_scrubber/T = U
 			T.broadcast_status()
 
-	//Create the mining ore distribution map.
-	asteroid_ore_map = new /datum/ore_distribution()
-	asteroid_ore_map.populate_distribution_map()
-
-
 	//Set up roundstart seed list.
 	//populate_seed_list()
 

code/controllers/verbs.dm

@@ -1,26 +1,6 @@
 //TODO: rewrite and standardise all controller datums to the datum/controller type
 //TODO: allow all controllers to be deleted for clean restarts (see WIP master controller stuff) - MC done - lighting done
 
-/client/proc/show_distribution_map()
-	set category = "Debug"
-	set name = "Show Distribution Map"
-	set desc = "Print the asteroid ore distribution map to the world."
-
-	if(!holder)	return
-
-	if(master_controller && master_controller.asteroid_ore_map)
-		master_controller.asteroid_ore_map.print_distribution_map()
-
-/client/proc/remake_distribution_map()
-	set category = "Debug"
-	set name = "Remake Distribution Map"
-	set desc = "Rebuild the asteroid ore distribution map."
-
-	if(!holder)	return
-
-	if(master_controller && master_controller.asteroid_ore_map)
-		master_controller.asteroid_ore_map = new /datum/ore_distribution()
-		master_controller.asteroid_ore_map.populate_distribution_map()
 
 /client/proc/restart_controller(controller in list("Master","Failsafe","Supply"))
 	set category = "Debug"