diff --git a/code/__DEFINES/logging.dm b/code/__DEFINES/logging.dm index 3340485f34cc..88af44e8c6d9 100644 --- a/code/__DEFINES/logging.dm +++ b/code/__DEFINES/logging.dm @@ -29,15 +29,16 @@ #define LOG_CHAT (1 << 6) #define LOG_COMMENT (1 << 7) #define LOG_TELECOMMS (1 << 8) -#define LOG_OOC (1 << 9) -#define LOG_ADMIN (1 << 10) -#define LOG_OWNERSHIP (1 << 11) -#define LOG_GAME (1 << 12) -#define LOG_ADMIN_PRIVATE (1 << 13) -#define LOG_ASAY (1 << 14) -#define LOG_MECHA (1 << 15) -#define LOG_VIRUS (1 << 16) -#define LOG_CLONING (1 << 17) +#define LOG_NTSL (1 << 9) +#define LOG_OOC (1 << 10) +#define LOG_ADMIN (1 << 11) +#define LOG_OWNERSHIP (1 << 12) +#define LOG_GAME (1 << 13) +#define LOG_ADMIN_PRIVATE (1 << 14) +#define LOG_ASAY (1 << 15) +#define LOG_MECHA (1 << 16) +#define LOG_VIRUS (1 << 17) +#define LOG_CLONING (1 << 18) //Individual logging panel pages #define INDIVIDUAL_ATTACK_LOG (LOG_ATTACK) @@ -46,7 +47,7 @@ #define INDIVIDUAL_COMMS_LOG (LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS) #define INDIVIDUAL_OOC_LOG (LOG_OOC | LOG_ADMIN) #define INDIVIDUAL_OWNERSHIP_LOG (LOG_OWNERSHIP) -#define INDIVIDUAL_SHOW_ALL_LOG (LOG_ATTACK | LOG_SAY | LOG_WHISPER | LOG_EMOTE | LOG_DSAY | LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS | LOG_OOC | LOG_ADMIN | LOG_OWNERSHIP | LOG_GAME) +#define INDIVIDUAL_SHOW_ALL_LOG (LOG_ATTACK | LOG_SAY | LOG_WHISPER | LOG_EMOTE | LOG_DSAY | LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS | LOG_NTSL | LOG_OOC | LOG_ADMIN | LOG_OWNERSHIP | LOG_GAME) #define LOGSRC_CLIENT "Client" #define LOGSRC_MOB "Mob" diff --git a/code/__DEFINES/~yogs_defines/logging.dm b/code/__DEFINES/~yogs_defines/logging.dm index 942d0763e5fb..8995b972ffea 100644 --- a/code/__DEFINES/~yogs_defines/logging.dm +++ b/code/__DEFINES/~yogs_defines/logging.dm @@ -1,6 +1,6 @@ -#define LOG_LOOC (1 << 15) +#define LOG_LOOC (1 << 19) #define INDIVIDUAL_LOOC_LOG (LOG_LOOC) #undef INDIVIDUAL_SHOW_ALL_LOG -#define INDIVIDUAL_SHOW_ALL_LOG (LOG_ATTACK | LOG_SAY | LOG_WHISPER | LOG_EMOTE | LOG_DSAY | LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS | LOG_OOC | LOG_ADMIN | LOG_OWNERSHIP | LOG_GAME | LOG_LOOC) \ No newline at end of file +#define INDIVIDUAL_SHOW_ALL_LOG (LOG_ATTACK | LOG_SAY | LOG_WHISPER | LOG_EMOTE | LOG_DSAY | LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS | LOG_NTSL | LOG_OOC | LOG_ADMIN | LOG_OWNERSHIP | LOG_GAME | LOG_LOOC) diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm index d685ef9e46e2..84b0e8e94ce1 100644 --- a/code/__HELPERS/_logging.dm +++ b/code/__HELPERS/_logging.dm @@ -139,6 +139,10 @@ if (CONFIG_GET(flag/log_telecomms)) WRITE_LOG(GLOB.world_telecomms_log, "TCOMMS: [text]") +/proc/log_ntsl(text) + if (CONFIG_GET(flag/log_ntsl)) + WRITE_LOG(GLOB.world_ntsl_log, "NTSL: [text]") + /proc/log_chat(text) if (CONFIG_GET(flag/log_pda)) //same thing here diff --git a/code/_globalvars/logging.dm b/code/_globalvars/logging.dm index 45e96b9b9b65..181f855119ec 100644 --- a/code/_globalvars/logging.dm +++ b/code/_globalvars/logging.dm @@ -20,6 +20,8 @@ GLOBAL_VAR(world_pda_log) GLOBAL_PROTECT(world_pda_log) GLOBAL_VAR(world_telecomms_log) GLOBAL_PROTECT(world_telecomms_log) +GLOBAL_VAR(world_ntsl_log) +GLOBAL_PROTECT(world_ntsl_log) GLOBAL_VAR(world_manifest_log) GLOBAL_PROTECT(world_manifest_log) GLOBAL_VAR(query_debug_log) diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index 3cca331dda14..77330d978fdc 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -75,6 +75,8 @@ /datum/config_entry/flag/log_telecomms // log telecomms messages +/datum/config_entry/flag/log_ntsl // log NTSL compilation + /datum/config_entry/flag/log_twitter // log certain expliotable parrots and other such fun things in a JSON file of twitter valid phrases. /datum/config_entry/flag/log_world_topic // log all world.Topic() calls @@ -483,4 +485,4 @@ /datum/config_entry/number/reopen_roundstart_suicide_roles_delay min_val = 30 -/datum/config_entry/flag/reopen_roundstart_suicide_roles_command_report \ No newline at end of file +/datum/config_entry/flag/reopen_roundstart_suicide_roles_command_report diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 45d0266c00f9..ca24d451b74c 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -647,6 +647,8 @@ log_comment(log_text) if(LOG_TELECOMMS) log_telecomms(log_text) + if(LOG_NTSL) + log_ntsl(log_text) if(LOG_OOC) log_ooc(log_text) if(LOG_LOOC) // yogs - LOOC log diff --git a/code/game/world.dm b/code/game/world.dm index 7176d3385980..8690a9314410 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -114,6 +114,7 @@ GLOBAL_VAR(restart_counter) GLOB.world_attack_log = "[GLOB.log_directory]/attack.log" GLOB.world_pda_log = "[GLOB.log_directory]/pda.log" GLOB.world_telecomms_log = "[GLOB.log_directory]/telecomms.log" + GLOB.world_ntsl_log = "[GLOB.log_directory]/ntsl.log" GLOB.world_manifest_log = "[GLOB.log_directory]/manifest.log" GLOB.world_href_log = "[GLOB.log_directory]/hrefs.log" GLOB.sql_error_log = "[GLOB.log_directory]/sql.log" diff --git a/config/config.txt b/config/config.txt index dbb84f8f7cf1..5be2a250e70b 100644 --- a/config/config.txt +++ b/config/config.txt @@ -112,6 +112,9 @@ LOG_PDA ## log telecomms messages LOG_TELECOMMS +## log ntsl compilations +LOG_NTSL + ## log prayers LOG_PRAYER diff --git a/yogstation/code/game/machinery/telecomms/machines/server.dm b/yogstation/code/game/machinery/telecomms/machines/server.dm index eaa409b944c4..1f4b5b8cd362 100644 --- a/yogstation/code/game/machinery/telecomms/machines/server.dm +++ b/yogstation/code/game/machinery/telecomms/machines/server.dm @@ -51,5 +51,6 @@ to_chat(user, "You are banned from using NTSL.") return if(Compiler) + user.log_message(rawcode, LOG_NTSL) return Compiler.Compile(rawcode) //end-NTSL