Skip to content

Commit

Permalink
TGS Test Merge (#6950)
Browse files Browse the repository at this point in the history
  • Loading branch information
Kevinz authored and Kevinz committed Jan 8, 2025
2 parents 31517d0 + cad6615 commit 6fdd1eb
Show file tree
Hide file tree
Showing 24 changed files with 136 additions and 572 deletions.
5 changes: 3 additions & 2 deletions citadel.dme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,6 @@
#include "code\controllers\configuration\entries\skills.dm"
#include "code\controllers\configuration\entries\urls.dm"
#include "code\controllers\configuration_old\configuration.dm"
#include "code\controllers\configuration_old\configuration_vr.dm"
#include "code\controllers\observer_listener\atom\observer.dm"
#include "code\controllers\repository\designs.dm"
#include "code\controllers\repository\flooring.dm"
Expand Down Expand Up @@ -688,8 +687,10 @@
#include "code\controllers\subsystem\sound\soundbyte_manager.dm"
#include "code\controllers\toml_config\toml_config_entry.dm"
#include "code\controllers\toml_config\toml_configuration.dm"
#include "code\controllers\toml_config\entries\backend-logging-toggles.dm"
#include "code\controllers\toml_config\entries\backend-logging.dm"
#include "code\controllers\toml_config\entries\backend-repository.dm"
#include "code\controllers\toml_config\entries\backend.dm"
#include "code\controllers\toml_config\entries\backend.repository.dm"
#include "code\datums\ability.dm"
#include "code\datums\ability_handler.dm"
#include "code\datums\access.dm"
Expand Down
54 changes: 27 additions & 27 deletions code/__HELPERS/_logging.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,39 +80,39 @@ GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global"))
*/
/proc/log_admin(text)
admin_log.Add(text)
if (config_legacy.log_admin)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/admin))
WRITE_LOG(GLOB.world_game_log, "ADMIN: [text]")

/proc/log_admin_private(text)
admin_log.Add(text)
if (config_legacy.log_admin)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/admin))
WRITE_LOG(GLOB.world_game_log, "ADMINPRIVATE: [text]")

/proc/log_adminsay(text, mob/speaker)
if (config_legacy.log_adminchat)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/adminchat))
if(speaker)
WRITE_LOG(GLOB.world_game_log, "ADMINPRIVATE: ASAY: [speaker.simple_info_line()]: [text]")
else
WRITE_LOG(GLOB.world_game_log, "ADMINPRIVATE: ASAY: [text]")

/proc/log_modsay(text, mob/speaker)
if (config_legacy.log_adminchat)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/adminchat))
WRITE_LOG(GLOB.world_game_log, "MODSAY: [speaker.simple_info_line()]: [html_decode(text)]")

/proc/log_eventsay(text, mob/speaker)
if (config_legacy.log_adminchat)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/adminchat))
WRITE_LOG(GLOB.world_game_log, "EVENTSAY: [speaker.simple_info_line()]: [html_decode(text)]")

/proc/log_adminpm(text, client/source, client/dest)
admin_log.Add(text)
if (config_legacy.log_admin)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/admin))
WRITE_LOG(GLOB.world_game_log, "ADMINPM: [key_name(source)]->[key_name(dest)]: [html_decode(text)]")

/**
* All other items are public.
*/
/proc/log_game(text)
if (config_legacy.log_game)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/game))
WRITE_LOG(GLOB.world_game_log, "GAME: [text]")

/proc/log_asset(text)
Expand All @@ -123,22 +123,22 @@ GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global"))

/// <VStation_specific>
/proc/log_access_in(client/new_client)
if (config_legacy.log_access)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/access))
var/message = "[key_name(new_client)] - IP:[new_client.address] - CID:[new_client.computer_id] - BYOND v[new_client.byond_version]"
WRITE_LOG(GLOB.world_game_log, "ACCESS IN: [message]")

/proc/log_access_out(mob/last_mob)
if (config_legacy.log_access)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/access))
var/message = "[key_name(last_mob)] - IP:[last_mob.lastKnownIP] - CID:Logged Out - BYOND Logged Out"
WRITE_LOG(GLOB.world_game_log, "ACCESS OUT: [message]")
/// </VStation_specific>

/proc/log_attack(attacker, defender, message)
if (config_legacy.log_attack)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/attack))
WRITE_LOG(GLOB.world_attack_log, "ATTACK: [attacker] against [defender]: [message]")

/proc/log_say(text, mob/speaker)
if (config_legacy.log_say)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/say))
WRITE_LOG(GLOB.world_game_log, "SAY: [speaker.simple_info_line()]: [html_decode(text)]")

//Log the message to in-game dialogue logs, as well.
Expand All @@ -147,47 +147,47 @@ GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global"))
GLOB.round_text_log += "<b>([time_stamp()])</b> (<b>[speaker]/[speaker.client]</b>) <u>SAY:</u> - <span style='color:#32cd32'>[text]</span>"

/proc/log_ooc(text, client/user)
if (config_legacy.log_ooc)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/ooc))
WRITE_LOG(GLOB.world_game_log, "OOC: [user.simple_info_line()]: [html_decode(text)]")

GLOB.round_text_log += "<b>([time_stamp()])</b> (<b>[user]</b>) <u>OOC:</u> - <span style='color:blue'><b>[text]</b></span>"

/proc/log_whisper(text, mob/speaker)
if (config_legacy.log_whisper)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/whisper))
WRITE_LOG(GLOB.world_game_log, "WHISPER: [speaker.simple_info_line()]: [html_decode(text)]")

if(speaker.client)
speaker.dialogue_log += "<b>([time_stamp()])</b> (<b>[speaker]/[speaker.client]</b>) <u>SAY:</u> - <span style='color:gray'><i>[text]</i></span>"
GLOB.round_text_log += "<b>([time_stamp()])</b> (<b>[speaker]/[speaker.client]</b>) <u>SAY:</u> - <span style='color:gray'><i>[text]</i></span>"

/proc/log_emote(text, mob/speaker)
if (config_legacy.log_emote)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/emote))
WRITE_LOG(GLOB.world_game_log, "EMOTE: [speaker.simple_info_line()]: [html_decode(text)]")

if(speaker.client)
speaker.dialogue_log += "<b>([time_stamp()])</b> (<b>[speaker]/[speaker.client]</b>) <u>EMOTE:</u> - <span style='color:#CCBADC'>[text]</span>"
GLOB.round_text_log += "<b>([time_stamp()])</b> (<b>[speaker]/[speaker.client]</b>) <u>EMOTE:</u> - <span style='color:#CCBADC'>[text]</span>"

/proc/log_subtle(text, mob/speaker)
if (config_legacy.log_emote)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/emote))
WRITE_LOG(GLOB.world_game_log, "SUBTLE: [speaker.simple_info_line()]: [html_decode(text)]")

/proc/log_subtle_anti_ghost(text, mob/speaker)
if (config_legacy.log_emote)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/emote))
WRITE_LOG(GLOB.world_game_log, "SUBTLER: [speaker.simple_info_line()]: [html_decode(text)]")

/proc/log_subtle_vore(text, mob/speaker)
if (config_legacy.log_emote)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/emote))
WRITE_LOG(GLOB.world_game_log, "SUBTLE_VORE: [speaker.simple_info_line()]: [html_decode(text)]")

/proc/log_aooc(text, client/user)
if (config_legacy.log_ooc)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/ooc))
WRITE_LOG(GLOB.world_game_log, "AOOC: [user.simple_info_line()]: [html_decode(text)]")

GLOB.round_text_log += "<b>([time_stamp()])</b> (<b>[user]</b>) <u>AOOC:</u> - <span style='color:red'><b>[text]</b></span>"

/proc/log_looc(text, client/user)
if (config_legacy.log_ooc)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/ooc))
WRITE_LOG(GLOB.world_game_log, "LOOC: [user.simple_info_line()]: [html_decode(text)]")

GLOB.round_text_log += "<b>([time_stamp()])</b> (<b>[user]</b>) <u>LOOC:</u> - <span style='color:orange'><b>[text]</b></span>"
Expand All @@ -196,7 +196,7 @@ GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global"))
WRITE_LOG(GLOB.world_runtime_log, "IPINTEL: [text]")

/proc/log_vote(text)
if (config_legacy.log_vote)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/vote))
WRITE_LOG(GLOB.world_game_log, "VOTE: [text]")

/proc/log_topic(text)
Expand Down Expand Up @@ -418,7 +418,7 @@ GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global"))

/// VSTATION SPECIFIC LOGGING. ///
/proc/log_debug(text)
if (config_legacy.log_debug)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/debug))
WRITE_LOG(GLOB.world_runtime_log, "DEBUG: [text]")

// for(var/client/C in GLOB.admins)
Expand All @@ -430,22 +430,22 @@ GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global"))
// )

/proc/log_ghostsay(text, mob/speaker)
if (config_legacy.log_say)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/say))
WRITE_LOG(GLOB.world_game_log, "DEADCHAT: [speaker.simple_info_line()]: [html_decode(text)]")

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>"

/proc/log_ghostemote(text, mob/speaker)
if (config_legacy.log_emote)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/emote))
WRITE_LOG(GLOB.world_game_log, "DEADEMOTE: [speaker.simple_info_line()]: [html_decode(text)]")

/proc/log_adminwarn(text)
if (config_legacy.log_adminwarn)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/adminwarn))
WRITE_LOG(GLOB.world_game_log, "ADMINWARN: [html_decode(text)]")

/proc/log_pda(text, mob/speaker)
if (config_legacy.log_pda)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/pda))
WRITE_LOG(GLOB.world_game_log, "PDA: [speaker.simple_info_line()]: [html_decode(text)]")

speaker.dialogue_log += "<b>([time_stamp()])</b> (<b>[speaker]/[speaker.client]</b>) <u>MSG:</u> - <span style='color:green'>[text]</span>"
Expand All @@ -470,11 +470,11 @@ GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global"))
log_world(progress_message)

/proc/log_nsay(text, inside, mob/speaker)
if (config_legacy.log_say)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/say))
WRITE_LOG(GLOB.world_game_log, "NSAY (NIF:[inside]): [speaker.simple_info_line()]: [html_decode(text)]")

/proc/log_nme(text, inside, mob/speaker)
if (config_legacy.log_emote)
if (Configuration.get_entry(/datum/toml_config_entry/backend/logging/toggles/emote))
WRITE_LOG(GLOB.world_game_log, "NME (NIF:[inside]): [speaker.simple_info_line()]: [html_decode(text)]")


Expand Down
Loading

0 comments on commit 6fdd1eb

Please sign in to comment.