Merge branch 'master' into upstream-merge-30218

2017-08-28 09:03:46 -05:00
parent 472e39693f 27750d91d6
commit b39bd24aaa
62 changed files with 332 additions and 790 deletions
@@ -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