cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Linter Introduction + Cleanup

Browse Source
This commit is contained in:
Chompstation Bot
2021-05-27 16:31:50 +00:00
parent bbafe17f3b
commit 20e3b0a2d3
244 changed files with 4808 additions and 1461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/_helpers/logging.dm
View File

@@ -189,6 +189,7 @@
/proc/log_ghostsay(text, mob/speaker)
if (config.log_say)
WRITE_LOG(diary, "DEADCHAT: [speaker.simple_info_line()]: [html_decode(text)]")
<<<<<<< HEAD
//CHOMPEdit Begin
if(speaker.client)
if(!SSdbcore.IsConnected())
@@ -205,6 +206,17 @@
//speaker.dialogue_log += "<b>([time_stamp()])</b> (<b>[speaker]/[speaker.client]</b>) <u>DEADSAY:</u> - <span style=\"color:green\">[text]</span>"
//GLOB.round_text_log += "<font size=1><span style=\"color:#7e668c\"><b>([time_stamp()])</b> (<b>[src]/[speaker.client]</b>) <u>DEADSAY:</u> - [text]</span></font>"
//CHOMPEdit End
||||||| parent of da4837903c... Merge pull request #10433 from VOREStation/upstream-merge-8085
speaker.dialogue_log += "<b>([time_stamp()])</b> (<b>[speaker]/[speaker.client]</b>) <u>DEADSAY:</u> - <span style=\"color:green\">[text]</span>"
GLOB.round_text_log += "<font size=1><span style=\"color:#7e668c\"><b>([time_stamp()])</b> (<b>[src]/[speaker.client]</b>) <u>DEADSAY:</u> - [text]</span></font>"
=======
speaker.dialogue_log += "<b>([time_stamp()])</b> (<b>[speaker]/[speaker.client]</b>) <u>DEADSAY:</u> - <span style=\"color:green\">[text]</span>"
GLOB.round_text_log += "<font size=1><span style=\"color:#7e668c\"><b>([time_stamp()])</b> (<b>[speaker]/[speaker.client]</b>) <u>DEADSAY:</u> - [text]</span></font>"
>>>>>>> da4837903c... Merge pull request #10433 from VOREStation/upstream-merge-8085
/proc/log_ghostemote(text, mob/speaker)
if (config.log_emote)