Merge branch 'master' into upstream-merge-6762

This commit is contained in:
Novacat
2020-03-09 01:45:23 -04:00
committed by GitHub
199 changed files with 16129 additions and 12876 deletions

View File

@@ -428,6 +428,7 @@ client/verb/character_setup()
//Log, disable
log_debug("[key_name(src)] reloaded VChat.")
winset(src, null, "outputwindow.htmloutput.is-visible=false;outputwindow.oldoutput.is-visible=false;outputwindow.chatloadlabel.is-visible=true")
//The hard way
qdel_null(src.chatOutput)