cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2026-08-22 15:06:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

compile

Browse Source
This commit is contained in:
kevinz000
2019-09-13 13:54:37 -07:00
parent 80734ab287
commit 5a8e964dcc
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/tgs.config.dm
+2 -2
View File
@@ -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, "<span class='boldannounce'>[html_encode(##message)]</span>")
#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)
code/game/world.dm
+4
View File
@@ -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.
code/modules/admin/admin_verbs.dm
-2
View File
@@ -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,
code/modules/admin/chat_commands.dm
+6 -6
View File
@@ -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)