Merge branch 'master' of git://github.com/Baystation12/Baystation12

baystation12.dme

@@ -374,9 +374,6 @@
 #include "code\game\vote.dm"
 #include "code\game\area\ai_monitored.dm"
 #include "code\game\area\areas.dm"
-#include "code\game\asteroid\asteroid.dm"
-#include "code\game\asteroid\device.dm"
-#include "code\game\asteroid\turf.dm"
 #include "code\game\events\Event.dm"
 #include "code\game\events\EventsMain.dm"
 #include "code\game\events\EventProcs\black_hole.dm"

code/defines/global.dm

@@ -12,7 +12,7 @@ var/global
 
 	defer_powernet_rebuild = 0		// true if net rebuild will be called manually after an event
 
-	list/global_map = null
+//	list/global_map = null
 	//list/global_map = list(list(1,5),list(4,3))//an array of map Z levels.
 	//Resulting sector map looks like
 	//|_1_|_4_|

code/game/atom_procs.dm

@@ -839,7 +839,7 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl
 	return
 
 
-/atom/proc/get_global_map_pos()
+/*/atom/proc/get_global_map_pos()
 	if(!islist(global_map) || isemptylist(global_map)) return
 	var/cur_x = null
 	var/cur_y = null
@@ -853,7 +853,7 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl
 	if(cur_x && cur_y)
 		return list("x"=cur_x,"y"=cur_y)
 	else
-		return 0
+		return 0	*/
 
 /atom/proc/checkpass(passflag)
 	return pass_flags&passflag

code/game/gamemodes/extended/extended.dm

@@ -11,6 +11,6 @@
 	world << "<B>Just have fun and role-play!</B>"
 
 /datum/game_mode/extended/pre_setup()
-	setup_sectors()
-	spawn_exporation_packs()
+//	setup_sectors()
+//	spawn_exporation_packs()
 	return 1

code/game/gamemodes/sandbox/sandbox.dm

@@ -13,8 +13,8 @@
 		if(M.client)
 			M.CanBuild()
 
-	setup_sectors()
-	spawn_exporation_packs()
+//	setup_sectors()
+//	spawn_exporation_packs()
 	return 1
 
 /datum/game_mode/sandbox/check_finished()

code/game/turf.dm

@@ -1212,7 +1212,7 @@ turf/simulated/floor/return_siding_icon_state()
 					MM << "\red Something you are carrying is preventing you from leaving. Don't play stupid; you know exactly what it is."
 			return
 
-		else if(ticker.mode.name == "extended"||ticker.mode.name == "sandbox")	Sandbox_Spacemove(A)
+//		else if(ticker.mode.name == "extended"||ticker.mode.name == "sandbox")	Sandbox_Spacemove(A)
 
 		else
 			if (src.x <= 2 || A.x >= (world.maxx - 1) || src.y <= 2 || A.y >= (world.maxy - 1))
@@ -1247,7 +1247,7 @@ turf/simulated/floor/return_siding_icon_state()
 
 //				if(istype(A, /obj/structure/closet/coffin))
 //					coffinhandler.Add(A)
-
+/*
 /turf/space/proc/Sandbox_Spacemove(atom/movable/A as mob|obj)
 	var/cur_x
 	var/cur_y
@@ -1356,7 +1356,7 @@ turf/simulated/floor/return_siding_icon_state()
 				if ((A && A.loc))
 					A.loc.Entered(A)
 	return
-
+*/
 /obj/effect/vaultspawner
 	var/maxX = 6
 	var/maxY = 6