cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changes some world init order stuff around (#15186)

Browse Source 
* Changes some world init order stuff around

* More stuff
This commit is contained in:
AffectedArc07
2020-12-29 10:43:28 -05:00
committed by GitHub
parent 43ee2488c7
commit 0a0324514b
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_ranks.dm
+2 -2
View File
@@ -56,7 +56,7 @@ GLOBAL_PROTECT(admin_ranks) // this shit is being protected for obvious reasons
testing(msg)
#endif
/proc/load_admins()
/proc/load_admins(run_async = FALSE)
if(IsAdminAdvancedProcCall())
to_chat(usr, "<span class='boldannounce'>Admin reload blocked: Advanced ProcCall detected.</span>")
message_admins("[key_name(usr)] attempted to reload admins via advanced proc-call")
@@ -118,7 +118,7 @@ GLOBAL_PROTECT(admin_ranks) // this shit is being protected for obvious reasons
return
var/datum/db_query/query = SSdbcore.NewQuery("SELECT ckey, rank, level, flags FROM [format_table_name("admin")]")
if(!query.warn_execute())
if(!query.warn_execute(async=run_async))
qdel(query)
return
code/modules/admin/banjob.dm
+2 -2
View File
@@ -68,7 +68,7 @@ GLOBAL_DATUM_INIT(jobban_regex, /regex, regex("(\[\\S]+) - (\[^#]+\[^# ])(?: ##
//Job permabans
var/datum/db_query/permabans = SSdbcore.NewQuery("SELECT ckey, job FROM [format_table_name("ban")] WHERE bantype = 'JOB_PERMABAN' AND isnull(unbanned)")
if(!permabans.warn_execute())
if(!permabans.warn_execute(async=FALSE))
qdel(permabans)
return FALSE
@@ -83,7 +83,7 @@ GLOBAL_DATUM_INIT(jobban_regex, /regex, regex("(\[\\S]+) - (\[^#]+\[^# ])(?: ##
// Job tempbans
var/datum/db_query/tempbans = SSdbcore.NewQuery("SELECT ckey, job FROM [format_table_name("ban")] WHERE bantype = 'JOB_TEMPBAN' AND isnull(unbanned) AND expiration_time > Now()")
if(!tempbans.warn_execute())
if(!tempbans.warn_execute(async=FALSE))
qdel(tempbans)
return FALSE
code/modules/admin/verbs/diagnostics.dm
+1 -1
View File
@@ -116,7 +116,7 @@
message_admins("[key_name_admin(usr)] has manually reloaded admins")
log_admin("[key_name(usr)] has manually reloaded admins")
load_admins()
load_admins(run_async=TRUE)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Reload Admins") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!