Merge upstream

This commit is contained in:
Cyberboss
2017-05-26 15:32:55 -04:00
676 changed files with 141679 additions and 159173 deletions
+4
View File
@@ -645,3 +645,7 @@ GLOBAL_LIST(external_rsc_urls)
CRASH("change_view called without argument.")
view = new_size
/client/proc/AnnouncePR(announcement)
if(prefs && prefs.chat_toggles & CHAT_PULLR)
to_chat(src, announcement)