Merge branch 'master' into upstream-merge-30218

code/game/machinery/computer/communications.dm

@@ -456,7 +456,8 @@
 					dat += "<BR>\[ <A HREF='?src=\ref[src];operation=announce'>Make a Captain's Announcement</A> \]"
 					if(config.cross_allowed)
 						dat += "<BR>\[ <A HREF='?src=\ref[src];operation=crossserver'>Send a message to an allied station</A> \]"
-					dat += "<BR>\[ <A HREF='?src=\ref[src];operation=purchase_menu'>Purchase Shuttle</A> \]"
+					if(SSmapping.config.allow_custom_shuttles == "yes")
+						dat += "<BR>\[ <A HREF='?src=\ref[src];operation=purchase_menu'>Purchase Shuttle</A> \]"
 					dat += "<BR>\[ <A HREF='?src=\ref[src];operation=changeseclevel'>Change Alert Level</A> \]"
 					dat += "<BR>\[ <A HREF='?src=\ref[src];operation=emergencyaccess'>Emergency Maintenance Access</A> \]"
 					dat += "<BR>\[ <A HREF='?src=\ref[src];operation=nukerequest'>Request Nuclear Authentication Codes</A> \]"

code/game/machinery/telecomms/machines/allinone.dm

@@ -14,6 +14,7 @@
 	machinetype = 6
 	var/intercept = FALSE // if TRUE, broadcasts all syndie messages to syndicate channel
 
+
 /obj/machinery/telecomms/allinone/receive_signal(datum/signal/signal)
 
 	if(!on) // has to be on to receive messages