Merge branch 'master' into stationgoals

code/modules/shuttle/supply.dm

@@ -295,7 +295,7 @@
 		return
 
 	var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(_loc)
-	playsound(_loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1)
+	playsound(_loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1)
 	reqform.name = "Requisition Form - [crates] '[object.name]' for [orderedby]"
 	reqform.info += "<h3>[station_name] Supply Requisition Form</h3><hr>"
 	reqform.info += "INDEX: #[shuttle_master.ordernum]<br>"

code/modules/shuttle/syndicate.dm

@@ -8,6 +8,7 @@
 	shuttleId = "syndicate"
 	possible_destinations = "syndicate_away;syndicate_z5;syndicate_z3;syndicate_ne;syndicate_nw;syndicate_n;syndicate_se;syndicate_sw;syndicate_s"
 	var/challenge = FALSE
+	var/moved = FALSE
 
 /obj/machinery/computer/shuttle/syndicate/recall
 	name = "syndicate shuttle recall terminal"
@@ -18,6 +19,7 @@
 		if(challenge && world.time < SYNDICATE_CHALLENGE_TIMER)
 			to_chat(usr, "<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>")
 			return 0
+		moved = TRUE
 	..()
 
 /obj/machinery/computer/shuttle/syndicate/drop_pod