Merge remote-tracking branch 'upstream/master' into repathing-sprite-accessories

This commit is contained in:
KasparoVy
2016-08-26 02:28:47 -04:00
112 changed files with 1584 additions and 1001 deletions
+2 -1
View File
@@ -295,7 +295,8 @@
prefs.last_id = computer_id //these are gonna be used for banning
. = ..() //calls mob.Login()
chatOutput.start()
spawn() // Goonchat does some non-instant checks in start()
chatOutput.start()
if(custom_event_msg && custom_event_msg != "")
to_chat(src, "<h1 class='alert'>Custom Event</h1>")