cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Numerous bugfixes.

Browse Source
This commit is contained in:
SkyMarshal
2012-04-17 11:55:53 -07:00
parent 1aa29c3c4c
commit 23f13cb95d
10 changed files with 87 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,10 +14,10 @@
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])")
var/real = (M.real_name == M.original_name ? "<b>[M.name]/[M.real_name]</b>" : "<b>[M.original_name] (as [M.name]/[M.real_name])</b>")
var/turf/T = get_turf(M)
var/client_key = (M.key? M.key : "No key")
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
dat += "<tr align='center' bgcolor='[color]'><td>[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>"
else if(isalien(M))

28
code/modules/admin/verbs/adminjump.dm
View File

@@ -28,7 +28,7 @@
alert("Admin jumping disabled")
return
/client/proc/jumptomob()
/client/proc/jumptomob(var/mob/M in world)
set category = "Admin"
set name = "Jump to Mob"
@@ -37,12 +37,13 @@
return
if(config.allow_admin_jump)
var/mobs = getmobs()
var/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in mobs
if(!selection)
return
var/mob/M = mobs[selection]
if(!M || !istype(M))
var/mobs = getmobs()
var/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in mobs
if(!selection)
return
M = mobs[selection]
var/mob/A = src.mob
var/turf/T = get_turf(M)
if(T && isturf(T))
@@ -94,7 +95,7 @@
else
alert("Admin jumping disabled")
/client/proc/Getmob()
/client/proc/Getmob(var/mob/M)
set category = "Admin"
set name = "Get Mob"
set desc = "Mob to teleport"
@@ -102,11 +103,12 @@
src << "Only administrators may use this command."
return
if(config.allow_admin_jump)
var/mobs = getmobs()
var/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in mobs
var/mob/M = mobs[selection]
if(!istype(M))
return
if(!M || !istype(M))
var/mobs = getmobs()
var/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in mobs
M = mobs[selection]
if(!istype(M))
return
var/mob/A = src.mob
var/turf/T = get_turf(A)
if(T && isturf(T))