forked from Baystation12/Baystation12
-
-
Notifications
You must be signed in to change notification settings - Fork 108
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'alpha' into chat-update-2
- Loading branch information
Showing
117 changed files
with
3,623 additions
and
515 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
SUBSYSTEM_DEF(chat) | ||
name = "Chat" | ||
wait = 1 | ||
runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY | ||
priority = SS_PRIORITY_CHAT | ||
init_order = SS_INIT_CHAT | ||
var/list/payload = list() | ||
var/initialized = 0 | ||
|
||
/datum/controller/subsystem/chat/Initialize(timeofday) | ||
initialized = 1 | ||
return ..() | ||
|
||
|
||
/datum/controller/subsystem/chat/fire() | ||
for(var/i in payload) | ||
var/client/C = i | ||
to_target(C, output(payload[C], "browseroutput:output")) | ||
payload -= C | ||
|
||
if(MC_TICK_CHECK) | ||
return | ||
|
||
/datum/controller/subsystem/chat/proc/queue(target, message, handle_whitespace = TRUE, trailing_newline = TRUE) | ||
if(!target || !message) | ||
return | ||
|
||
if(!istext(message)) | ||
CRASH("to_chat called with invalid input type") | ||
|
||
if(target == world) | ||
target = GLOB.clients | ||
|
||
//Some macros remain in the string even after parsing and fuck up the eventual output | ||
var/original_message = message | ||
message = replacetext(message, "\improper", "") | ||
message = replacetext(message, "\proper", "") | ||
if(handle_whitespace) | ||
message = replacetext(message, "\n", "<br>") | ||
message = replacetext(message, "\t", "[FOURSPACES][FOURSPACES]") | ||
if (trailing_newline) | ||
message += "<br>" | ||
|
||
|
||
//url_encode it TWICE, this way any UTF-8 characters are able to be decoded by the Javascript. | ||
//Do the double-encoding here to save nanoseconds | ||
var/twiceEncoded = url_encode(url_encode(message)) | ||
|
||
if(islist(target)) | ||
for(var/I in target) | ||
var/client/C = CLIENT_FROM_VAR(I) //Grab us a client if possible | ||
|
||
if(!C) | ||
return | ||
|
||
//Send it to the old style output window. | ||
legacy_chat(C, original_message) | ||
|
||
if(!C?.chatOutput || C.chatOutput.broken) //A player who hasn't updated his skin file. | ||
continue | ||
|
||
if(!C.chatOutput.loaded) //Client still loading, put their messages in a queue | ||
C.chatOutput.messageQueue += message | ||
continue | ||
|
||
payload[C] += twiceEncoded | ||
|
||
else | ||
var/client/C = CLIENT_FROM_VAR(target) //Grab us a client if possible | ||
|
||
if(!C) | ||
return | ||
|
||
//Send it to the old style output window. | ||
legacy_chat(C, original_message) | ||
|
||
if(!C?.chatOutput || C.chatOutput.broken) //A player who hasn't updated his skin file. | ||
return | ||
|
||
if(!C.chatOutput.loaded) //Client still loading, put their messages in a queue | ||
C.chatOutput.messageQueue += message | ||
return | ||
|
||
payload[C] += twiceEncoded |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.