From 5a8e964dcc6daa94802f42a274fed13aabb885a2 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Fri, 13 Sep 2019 13:54:37 -0700 Subject: [PATCH] compile --- code/__DEFINES/tgs.config.dm | 4 ++-- code/game/world.dm | 4 ++++ code/modules/admin/admin_verbs.dm | 2 -- code/modules/admin/chat_commands.dm | 12 ++++++------ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/code/__DEFINES/tgs.config.dm b/code/__DEFINES/tgs.config.dm index 5ab1b4f2174..0819a31b1c4 100644 --- a/code/__DEFINES/tgs.config.dm +++ b/code/__DEFINES/tgs.config.dm @@ -4,8 +4,8 @@ #define TGS_READ_GLOBAL(Name) GLOB.##Name #define TGS_WRITE_GLOBAL(Name, Value) GLOB.##Name = ##Value #define TGS_WORLD_ANNOUNCE(message) to_chat(world, "[html_encode(##message)]") -#define TGS_INFO_LOG(message) log_world("TGS: Info: [##message]") -#define TGS_ERROR_LOG(message) log_world("TGS: Error: [##message]") +#define TGS_INFO_LOG(message) log_to_dd("TGS: Info: [##message]") +#define TGS_ERROR_LOG(message) log_to_dd("TGS: Error: [##message]") #define TGS_NOTIFY_ADMINS(event) message_admins(##event) #define TGS_CLIENT_COUNT clients.len #define TGS_PROTECT_DATUM(Path) GENERAL_PROTECT_DATUM(##Path) diff --git a/code/game/world.dm b/code/game/world.dm index b8e68aef324..85a81b0bc58 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -416,10 +416,13 @@ var/world_topic_spam_protect_time = world.timeofday TgsReboot() +/* if(TEST_RUN_PARAMETER in params) FinishTestRun() return +*/ +/* if(TgsAvailable()) var/do_hard_reboot // check the hard reboot counter @@ -440,6 +443,7 @@ var/world_topic_spam_protect_time = world.timeofday log_world("World hard rebooted at [time_stamp()]") shutdown_logging() // See comment below. TgsEndProcess() +*/ log_world("World rebooted at [time_stamp()]") shutdown_logging() // Past this point, no logging procs can be used, at risk of data loss. diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index ebb52b11cb7..ed91843d6d4 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -169,7 +169,6 @@ var/list/admin_verbs_server = list( /datum/admins/proc/toggleaban, /client/proc/cmd_mod_say, /client/proc/toggle_log_hrefs, - /datum/admins/proc/immreboot, /client/proc/everyone_random, /datum/admins/proc/toggleAI, /client/proc/cmd_admin_delete, //delete an instance/object/mob/etc, @@ -302,7 +301,6 @@ var/list/admin_verbs_hideable = list( /datum/admins/proc/delay, /datum/admins/proc/toggleaban, /client/proc/toggle_log_hrefs, - /datum/admins/proc/immreboot, /client/proc/everyone_random, /datum/admins/proc/toggleAI, /datum/admins/proc/adrev, diff --git a/code/modules/admin/chat_commands.dm b/code/modules/admin/chat_commands.dm index 66e4d97f8bd..5c1925918d0 100644 --- a/code/modules/admin/chat_commands.dm +++ b/code/modules/admin/chat_commands.dm @@ -14,7 +14,7 @@ var/list/adm = get_admin_counts() var/list/allmins = adm["total"] var/status = "Admins: [allmins.len] (Active: [english_list(adm["present"])] AFK: [english_list(adm["afk"])] Stealth: [english_list(adm["stealth"])] Skipped: [english_list(adm["noflags"])]). " - status += "Players: [clients.len] (Active: [get_active_player_count(0,1,0)]). Mode: [SSticker.mode ? SSticker.mode.name : "Not started"]." + status += "Players: [clients.len]" //(Active: [get_active_player_count(0,1,0)]). Mode: [SSticker.mode ? SSticker.mode.name : "Not started"]." return status /datum/tgs_chat_command/irccheck @@ -27,7 +27,7 @@ if(rtod - last_irc_check < IRC_STATUS_THROTTLE) return last_irc_check = rtod - var/server = CONFIG_GET(string/server) + var/server = null //CONFIG_GET(string/server) //return "[round_id ? "Round #[round_id]: " : ""][clients.len] players on [SSmapping.config.map_name], Mode: [master_mode]; Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting"] -- [server ? server : "[world.internet_address]:[world.port]"]" var/current_state switch(ticker.current_state) @@ -104,11 +104,11 @@ GLOBAL_LIST(round_end_notifiees) admin_only = TRUE /datum/tgs_chat_command/sdql/Run(datum/tgs_chat_user/sender, params) - if(AdminProcCaller) + if(GLOB.AdminProcCaller) return "Unable to run query, another admin proc call is in progress. Try again later." - AdminProcCaller = "CHAT_[sender.friendly_name]" //_ won't show up in ckeys so it'll never match with a real admin - var/list/results = world.SDQL2_query(params, AdminProcCaller, AdminProcCaller) - AdminProcCaller = null + GLOB.AdminProcCaller = "CHAT_[sender.friendly_name]" //_ won't show up in ckeys so it'll never match with a real admin + var/list/results = world.SDQL2_query(params, GLOB.AdminProcCaller, GLOB.AdminProcCaller) + GLOB.AdminProcCaller = null if(!results) return "Query produced no output" var/list/text_res = results.Copy(1, 3)