Merge remote-tracking branch 'origin/master' into hardsync-1.5

code/modules/client/verbs/aooc.dm

@@ -13,7 +13,7 @@ GLOBAL_VAR_INIT(normal_aooc_colour, "#ce254f")
 	if(!mob)
 		return
 
-	if(!(prefs.toggles & CHAT_OOC))
+	if(!(prefs.chat_toggles & CHAT_OOC))
 		to_chat(src, "<span class='danger'> You have OOC muted.</span>")
 		return
 	if(jobban_isbanned(mob, "OOC"))

code/modules/client/verbs/ooc.dm

@@ -179,7 +179,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
 		to_chat(usr, "<span class='notice'>Sorry, that function is not enabled on this server.</span>")
 		return
 
-	browse_messages(null, usr.ckey, null, TRUE, override = TRUE)
+	browse_messages(null, usr.ckey, null, TRUE)
 
 /client/proc/self_playtime()
 	set name = "View tracked playtime"