Merge branch 'master' into upstream-merge-37597

2018-05-22 07:21:53 -05:00
parent 467819beba b3e5513185
commit 6a575f19d1
661 changed files with 12019 additions and 10559 deletions
@@ -170,7 +170,8 @@

 			if(href_list["send"])
 				signaler.send_activation()
-				audible_message("[icon2html(src, world)] *beep* *beep*")
+				audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*")
+				playsound(src, 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE)

 			if(href_list["freq"])
 				var/new_frequency = (signaler.frequency + text2num(href_list["freq"]))