Merge branch 'master' into upstream-merge-29839

2017-09-11 23:22:39 -05:00
parent 7d4c6a8445 a315554d4d
commit f60d57520b
74 changed files with 1693 additions and 1150 deletions
@@ -1124,7 +1124,10 @@

 	else if(href_list["showmessageckey"])
 		var/target = href_list["showmessageckey"]
-		browse_messages(target_ckey = target)
+		var/agegate = TRUE
+		if (href_list["showall"])
+			agegate = FALSE
+		browse_messages(target_ckey = target, agegate = agegate)

 	else if(href_list["showmessageckeylinkless"])
 		var/target = href_list["showmessageckeylinkless"]