cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 17:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Baystation12/Baystation12

Browse Source
This commit is contained in:
Hawk-v3
2012-02-28 22:07:45 +00:00
parent 6e3079f077 3a45c065aa
commit 2fe9b995ea
17 changed files with 234 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
code/modules/admin/admin.dm
View File

@@ -258,11 +258,16 @@
if ((M.client && M.client.holder && (M.client.holder.level >= src.level)))
alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null)
return
M << "\red You have been kicked from the server"
log_admin("[key_name(usr)] booted [key_name(M)].")
message_admins("\blue [key_name_admin(usr)] booted [key_name_admin(M)].", 1)
//M.client = null
del(M.client)
switch(alert("Are you sure?", ,"Yes", "NO, WAIT.. DAMMIT! NOT THAT BUTTON!"))
if("Yes")
if(ismob(M))
M << "\red You have been kicked from the server"
log_admin("[key_name(usr)] booted [key_name(M)].")
message_admins("\blue [key_name_admin(usr)] booted [key_name_admin(M)].", 1)
//M.client = null
del(M.client)
else
src << "Looks like someone already beat you."
if (href_list["removejobban"])
if ((src.rank in list("Game Admin", "Game Master" )))
@@ -1759,6 +1764,36 @@
C.files.RefreshResearch()
owner:rnd_check_designs()
#define AUTOBANTIME 10
if(href_list["warn"])
var/mob/M = locate(href_list["warn"])
if (ismob(M))
var/client/user
if(istype(usr, /client))
user = usr
else if(istype(usr, /mob))
user = usr.client
if(!user.holder)
src << "Only administrators may use this command."
return
if(M.client && M.client.holder && (M.client.holder.level >= user.holder.level))
alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null)
return
if(!M.client.warned)
M << "\red <B>You have been warned by an administrator. This is the only warning you will recieve.</B>"
M.client.warned = 1
message_admins("\blue [user.ckey] warned [M.ckey].")
else
AddBan(M.ckey, M.computer_id, "Autobanning due to previous warn", user.ckey, 1, AUTOBANTIME)
M << "\red<BIG><B>You have been autobanned by [user.ckey]. This is what we in the biz like to call a \"second warning\".</B></BIG>"
M << "\red This is a temporary ban; it will automatically be removed in [AUTOBANTIME] minutes."
log_admin("[user.ckey] warned [M.ckey], resulting in a [AUTOBANTIME] minute autoban.")
ban_unban_log_save("[user.ckey] warned [M.ckey], resulting in a [AUTOBANTIME] minute autoban.")
message_admins("\blue [user.ckey] warned [M.ckey], resulting in a [AUTOBANTIME] minute autoban.")
feedback_inc("ban_warn",1)
del(M.client)
///////////////////////////////////////////////////////////////////////////////////////////////Panels

38
code/modules/admin/player_panel.dm
View File

@@ -11,6 +11,7 @@
for(var/mob/M in mobs)
if(M.ckey)
var/color = "#e6e6e6"
i++
if(i%2 == 0)
color = "#f2f2f2"
var/real = (M.real_name == M.original_name ? M.real_name : "[M.original_name] (as [M.real_name])")
@@ -19,26 +20,32 @@
dat += "<tr align='center' bgcolor='[color]'><td>[M.name] \[[real]\] <br>[M.client ? M.client : "No client ([client_key])"] at ([T.x], [T.y], [T.z])</td>" // Adds current name
if(isobserver(M))
dat += "<td>Ghost</td>"
if(isalien(M))
else if(isalien(M))
dat += "<td>Alien</td>"
if(islarva(M))
else if(islarva(M))
dat += "<td>Alien larva</td>"
if(ishuman(M))
else if(istajaran(M))
dat += "<td>Tajaran</td>"
else if(ishuman(M))
dat += "<td>[M.job]</td>"
if(ismetroid(M))
else if(ismetroid(M))
dat += "<td>Metroid</td>"
if(ismonkey(M))
else if(ismonkey(M))
dat += "<td>Monkey</td>"
if(isAI(M))
else if(isAI(M))
dat += "<td>AI</td>"
if(ispAI(M))
else if(ispAI(M))
dat += "<td>pAI</td>"
if(isrobot(M))
else if(isrobot(M))
dat += "<td>Cyborg</td>"
if(isanimal(M))
else if(isanimal(M))
dat += "<td>Animal</td>"
if(iscorgi(M))
else if(iscorgi(M))
dat += "<td>Corgi</td>"
else if(istype(M,/mob/new_player))
dat += "<td>New Player</td>"
else
dat += "<td>ERROR</td>"
if(M.mind && M.mind.assigned_role && istype(M, /mob/living/carbon/human)) // Adds a column to Player Panel that shows their current job.
var/mob/living/carbon/human/H = M
@@ -81,13 +88,14 @@
"}
dat += {"<td><A HREF='?src=\ref[src];player_info=[M.ckey]'>[player_has_info(M.ckey) ? "Info" : "N/A"] </A></td>
<td><A href='?src=\ref[src];boot2=\ref[M]'>Boot</A> | <A href='?src=\ref[src];newban=\ref[M]'>Ban</A> | <A href='?src=\ref[src];jobban2=\ref[M]'>Jobban</A>
<br><font size="2.5">[muting]</font><br>
<font size="2"><A HREF='?src=\ref[src];adminplayeropts=\ref[M]'>PP</A> |
<td><A href='?src=\ref[usr];priv_msg=\ref[M]'><b>PM</b></A> |
<A HREF='?src=\ref[src];adminplayeropts=\ref[M]'>PP</A> |
<A HREF='?src=\ref[src];adminplayervars=\ref[M]'>VV</A> |
<A HREF='?src=\ref[src];adminplayersubtlemessage=\ref[M]'>SM</A> |
<A HREF='?src=\ref[src];adminplayerobservejump=\ref[M]'>JMP</A> |
<A HREF='?src=\ref[src];secretsadmin=check_antagonist'>CA</A></font></td>
<A HREF='?src=\ref[src];secretsadmin=check_antagonist'>CA</A></font>
<br><font size="2">[muting]</font><br>
<font size="2"><A href='?src=\ref[src];warn=\ref[M]'>Warn</A> | <A href='?src=\ref[src];boot2=\ref[M]'>Boot</A> | <A href='?src=\ref[src];newban=\ref[M]'>Ban</A> | <A href='?src=\ref[src];jobban2=\ref[M]'>Jobban</A></td>
"}
switch(is_special_character(M))
@@ -100,7 +108,7 @@
dat += "</table></body></html>"
usr << browse(dat, "window=players;size=905x480")
usr << browse(dat, "window=players;size=905x600")
//The old one
/obj/admins/proc/player_panel_old()