Add syndicate headset messages, squashes both together.

2018-06-15 13:52:12 -04:00
parent 4780f3a20b
commit b4edde2c0a
4 changed files with 65 additions and 14 deletions
@@ -62,6 +62,11 @@
 		body += "<a href='?_src_=holder;[HrefToken()];borgpanel=[REF(M)]'>BP</a> - "
 	body += "<a href='?priv_msg=[M.ckey]'>PM</a> - "
 	body += "<a href='?_src_=holder;[HrefToken()];subtlemessage=[REF(M)]'>SM</a> - "
+<<<<<<< HEAD
+=======
+	if (ishuman(M) && M.mind)
+		body += "<a href='?_src_=holder;[HrefToken()];HeadsetMessage=[REF(M)]'>HM</a> - "
+>>>>>>> 78e7c5f... Merge pull request #38482 from DaxDupont/syndicatemess
 	body += "<a href='?_src_=holder;[HrefToken()];adminplayerobservefollow=[REF(M)]'>FLW</a> - "
 	//Default to client logs if available
 	var/source = LOGSRC_MOB