cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 04:22:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	code/modules/admin/admin_verbs.dm
This commit is contained in:
skull132
2017-02-07 21:00:23 +02:00
parent e2cc0500c2 3e0b64ad19
commit b8ea5fd539
11 changed files with 119 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/IsBanned.dm
+2
View File
@@ -85,6 +85,8 @@ world/IsBanned(key,address,computer_id)
expires = " The ban is for [duration] minutes and expires on [expiration] (server time)."
var/desc = "\nReason: You, or another user of this computer or connection ([pckey]) is banned from playing here. The ban reason is:\n[reason]\nThis ban was applied by [ackey] on [bantime], [expires]"
if (config.forum_passphrase)
desc += "\nTo register on the forums, please use the following passphrase: [config.forum_passphrase]"
return list("reason"="[bantype]", "desc"="[desc]", "id" = ban_id)
code/modules/admin/admin_verbs.dm
+30 -2
View File
@@ -99,7 +99,8 @@ var/list/admin_verbs_admin = list(
/client/proc/cmd_dev_bst,
/client/proc/clear_toxins,
/client/proc/wipe_ai, // allow admins to force-wipe AIs
/client/proc/flush_lighting_queues
/client/proc/flush_lighting_queues,
/client/proc/fix_player_list
)
var/list/admin_verbs_ban = list(
/client/proc/unban_panel,
@@ -205,7 +206,8 @@ var/list/admin_verbs_debug = list(
/client/proc/toggle_recursive_explosions,
/client/proc/restart_sql,
/client/proc/flush_lighting_queues,
/client/proc/debug_pooling
/client/proc/debug_pooling,
/client/proc/fix_player_list
)
var/list/admin_verbs_paranoid_debug = list(
@@ -1073,3 +1075,29 @@ var/list/admin_verbs_cciaa = list(
lighting_update_lights = list()
lighting_update_corners = list()
lighting_update_overlays = list()
/client/proc/fix_player_list()
set category = "Special Verbs"
set name = "Regenerate Player List"
set desc = "Use this to regenerate the player list if it becomes broken somehow."
if (!check_rights(R_DEBUG|R_ADMIN))
return
if (alert("Regenerate player lists?", "Player List Repair", "No", "No", "Yes") != "Yes")
return
log_and_message_admins("is rebuilding the master player mob list.")
for (var/P in player_list)
if (isnull(P) || !ismob(P))
var/msg = "P_LIST DEBUG: Found null entry in player_list!"
log_debug(msg)
message_admins(span("danger", msg))
player_list -= P
else
var/mob/M = P
if (!M.client)
var/msg = "P_LIST DEBUG: Found a mob without a client in player_list! [M.name]"
log_debug(msg)
message_admins(span("danger", msg))
player_list -= M