Merge branch 'master' into AI_announcer_new

code/modules/shuttle/emergency.dm

@@ -276,6 +276,8 @@
 				for(var/mob/M in GLOB.player_list)
 					if(!isnewplayer(M) && !M.client.karma_spent && !(M.client.ckey in GLOB.karma_spenders) && !M.get_preference(PREFTOGGLE_DISABLE_KARMA_REMINDER))
 						to_chat(M, "<i>You have not yet spent your karma for the round; was there a player worthy of receiving your reward? Look under Special Verbs tab, Award Karma.</i>")
+				if(config.map_voting_enabled)
+					SSvote.initiate_vote("map", "the server", TRUE)
 
 		if(SHUTTLE_ESCAPE)
 			if(time_left <= 0)

code/modules/shuttle/navigation_computer.dm

@@ -264,6 +264,8 @@
 	visible_icon = FALSE
 	use_static = FALSE
 	simulated = FALSE
+	// The Shuttle Docker does not trigger the AI Detector
+	ai_detector_visible = FALSE
 	var/list/placement_images = list()
 	var/list/placed_images = list()
 

code/modules/shuttle/shuttle_rotate.dm

@@ -56,6 +56,9 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
 		d2 = temp
 	update_icon()
 
+/obj/structure/shuttle/engine/shuttleRotate(rotation, params)
+	setDir(angle2dir(rotation+dir2angle(dir)))
+
 //Fixes dpdir on shuttle rotation
 /obj/structure/disposalpipe/shuttleRotate(rotation, params)
 	. = ..()

code/modules/shuttle/syndicate.dm

@@ -12,6 +12,7 @@
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	flags = NODECONSTRUCT
 	var/challenge = FALSE
+	var/challenge_time = 0 //When was war declared?
 
 /obj/machinery/computer/shuttle/syndicate/recall
 	name = "syndicate shuttle recall terminal"
@@ -19,9 +20,10 @@
 	possible_destinations = "syndicate_away"
 
 /obj/machinery/computer/shuttle/syndicate/can_call_shuttle(user, action)
+	var/time_to_go = max(SYNDICATE_CHALLENGE_TIMER, (challenge_time + 10 MINUTES))
 	if(action == "move")
-		if(challenge && world.time < SYNDICATE_CHALLENGE_TIMER)
-			to_chat(user, "<span class='warning'>You've issued a combat challenge to the station! You've got to give them at least [round(((SYNDICATE_CHALLENGE_TIMER - world.time) / 10) / 60)] more minutes to allow them to prepare.</span>")
+		if(challenge && world.time < time_to_go)
+			to_chat(user, "<span class='warning'>You've issued a combat challenge to the station! You've got to give them at least [round(((time_to_go - world.time) / 10) / 60)] more minutes to allow them to prepare.</span>")
 			return FALSE
 	return TRUE