The syndicate shuttle can no longer leave unless the bomb is deployed.

Teleport can no longer teleport to the syndicate shuttle.

Main solar walkways are no longer blocked.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@623 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/gamemodes/nuclear/nuclearbomb.dm

@@ -38,6 +38,7 @@
 		flick("nuclearbombc", src)
 		src.icon_state = "nuclearbomb1"
 		src.extended = 1
+		bomb_set = 1
 	return
 
 /obj/machinery/nuclearbomb/verb/make_deployable()
@@ -149,8 +150,6 @@
 			derp = 1
 		if (A.name == "Wizard's Den")
 			derp = 1
-	if (syndicate_station_at_station)
-		herp = 1
 	if (!derp)
 		for(var/direction in cardinal)
 			for(var/area/target in get_step(src,direction))
@@ -160,6 +159,8 @@
 					derp = 1
 				if (target.name == "Wizard's Den")
 					derp = 1
+	if (syndicate_station_at_station)
+		herp = 1
 	for(var/mob/M in world)
 		if(M.client)
 			spawn(0)

code/game/gamemodes/wizard/spell12.dm

@@ -10,7 +10,7 @@
 
 	var/list/theareas = new/list()
 	for(var/area/AR in world)
-		if(istype(AR, /area/shuttle)) continue
+		if(istype(AR, /area/shuttle) || istype(AR, /area/syndicate_station)) continue
 		if(theareas.Find(AR.name)) continue
 		var/turf/picked = pick(get_area_turfs(AR.type))
 		if (picked.z == src.z)
@@ -51,7 +51,7 @@
 
 	var/list/theareas = new/list()
 	for(var/area/AR in world)
-		if(istype(AR, /area/shuttle)) continue
+		if(istype(AR, /area/shuttle) || istype(AR, /area/syndicate_station)) continue
 		if(theareas.Find(AR.name)) continue
 		var/turf/picked = pick(get_area_turfs(AR.type))
 		if (picked.z == src.z)

code/game/syndicate_shuttle.dm

@@ -13,6 +13,7 @@ var/syndicate_station_time = 0
 var/syndicate_station_timeleft = 0
 var/area/syndicate_loc = null
 var/syndicate_out_of_moves = 0
+var/bomb_set = 1
 
 /obj/machinery/computer/syndicate_station
 	name = "Syndicate Station Terminal"
@@ -79,6 +80,7 @@ var/syndicate_out_of_moves = 0
 					del(T)
 
 			start_location.move_contents_to(end_location)
+			bomb_set = 0
 
 
 
@@ -117,6 +119,7 @@ var/syndicate_out_of_moves = 0
 /proc/syndicate_can_move()
 	if(syndicate_station_moving_to_station || syndicate_station_moving_to_space) return 0
 	if(syndicate_out_of_moves) return 0
+	if(!bomb_set) return 0
 	else return 1
 
 /obj/machinery/computer/syndicate_station/attackby(I as obj, user as mob)