Merge branch 'master' into upstream-merge-30494

2017-09-12 02:40:24 -05:00
parent 63122795f9 8223692c32
commit dac6cc56e4
173 changed files with 8361 additions and 5643 deletions
@@ -39,7 +39,7 @@
 /datum/station_goal/Topic(href, href_list)
 	..()

-	if(!check_rights(R_ADMIN))
+	if(!check_rights(R_ADMIN) || !usr.client.holder.CheckAdminHref(href, href_list))
 		return

 	if(href_list["announce"])