Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sank

This commit is contained in:
Arokha Sieyes
2016-06-09 01:00:07 -04:00
7 changed files with 76 additions and 57 deletions
@@ -14,6 +14,6 @@
*/
/proc/logTheThing(type, source, target, text, diaryType)
if(diaryType)
world << "Diary: \[[diaryType]:[type]] [text]"
log_debug("Diary: \[[diaryType]:[type]] [text]")
else
world << "Log: \[[type]] [text]"
log_debug("Log: \[[type]] [text]")