cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-14 09:35:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41144

Browse Source
This commit is contained in:
Jordan Brown
2018-10-28 14:09:53 -04:00
parent 96826f421f 9306d01f6f
commit fb0b3a19f0
9 changed files with 59 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/player_panel.dm
+13 -15
View File
@@ -2,7 +2,7 @@
if(!check_rights())
return
log_admin("[key_name(usr)] checked the player panel.")
var/dat = "<html><head><title>Player Panel</title></head>"
var/dat = "<html><head><meta http-equiv='X-UA-Compatible' content='IE=edge'/><title>Player Panel</title></head>"
//javascript, the part that does most of the work~
dat += {"
@@ -38,14 +38,10 @@
}
var ltd = tr.getElementsByTagName("td");
var td = ltd\[0\];
var lsearch = td.getElementsByTagName("b");
var lsearch = td.getElementsByClassName("filter_data");
var search = lsearch\[0\];
//var inner_span = li.getElementsByTagName("span")\[1\] //Should only ever contain one element.
//document.write("<p>"+search.innerText+"<br>"+filter+"<br>"+search.innerText.indexOf(filter))
if ( search.innerText.toLowerCase().indexOf(filter) == -1 )
{
//document.write("a");
//ltr.removeChild(tr);
td.innerHTML = "";
i--;
}
@@ -61,7 +57,7 @@
}
function expand(id,job,name,real_name,image,key,ip,antagonist,ref){
function expand(id,job,name,real_name,old_names,key,ip,antagonist,ref){
clearAll();
@@ -72,7 +68,7 @@
body += "</td><td align='center'>";
body += "<font size='2'><b>"+job+" "+name+"</b><br><b>Real name "+real_name+"</b><br><b>Played by "+key+" ("+ip+")</b></font>"
body += "<font size='2'><b>"+job+" "+name+"</b><br><b>Real name "+real_name+"</b><br><b>Played by "+key+" ("+ip+")</b><br><b>Old names :"+old_names+"</b></font>";
body += "</td><td align='center'>";
@@ -102,7 +98,7 @@
var id = span.getAttribute("id");
if(!(id.indexOf("item")==0))
if(!id || !(id.indexOf("item")==0))
continue;
var pass = 1;
@@ -147,9 +143,6 @@
locked_tabs.push(id);
var notice_span = document.getElementById(notice_span_id);
notice_span.innerHTML = "<font color='red'>Locked</font> ";
//link.setAttribute("onClick","attempt('"+id+"','"+link_id+"','"+notice_span_id+"');");
//document.write("removeFromLocked('"+id+"','"+link_id+"','"+notice_span_id+"')");
//document.write("aa - "+link.getAttribute("onClick"));
}
function attempt(ab){
@@ -172,8 +165,6 @@
locked_tabs\[index\] = "";
var notice_span = document.getElementById(notice_span_id);
notice_span.innerHTML = "";
//var link = document.getElementById(link_id);
//link.setAttribute("onClick","addToLocked('"+id+"','"+link_id+"','"+notice_span_id+"')");
}
function selectTextField(){
@@ -277,6 +268,12 @@
var/M_name = html_encode(M.name)
var/M_rname = html_encode(M.real_name)
var/M_key = html_encode(M.key)
var/previous_names = ""
if(M_key)
var/datum/player_details/P = GLOB.player_details[ckey(M_key)]
if(P)
previous_names = P.played_names.Join(",")
previous_names = html_encode(previous_names)
//output for each mob
dat += {"
@@ -285,9 +282,10 @@
<td align='center' bgcolor='[color]'>
<span id='notice_span[i]'></span>
<a id='link[i]'
onmouseover='expand("item[i]","[M_job]","[M_name]","[M_rname]","--unused--","[M_key]","[M.lastKnownIP]",[is_antagonist],"[REF(M)]")'
onmouseover='expand("item[i]","[M_job]","[M_name]","[M_rname]","[previous_names]","[M_key]","[M.lastKnownIP]",[is_antagonist],"[REF(M)]")'
>
<b id='search[i]'>[M_name] - [M_rname] - [M_key] ([M_job])</b>
<span hidden class='filter_data'>[M_name] [M_rname] [M_key] [M_job] [previous_names]</span>
</a>
<br><span id='item[i]'></span>
</td>
code/modules/admin/topic.dm
+1 -1
View File
@@ -1602,7 +1602,7 @@
message_admins("<span class='danger'>Admin [key_name_admin(usr)] AIized [key_name_admin(H)]!</span>")
log_admin("[key_name(usr)] AIized [key_name(H)].")
H.AIize()
H.AIize(H.client)
else if(href_list["makealien"])
if(!check_rights(R_SPAWN))