Fixed Get-Mob, #1038

This commit is contained in:
Albert Iordache
2012-05-17 12:32:40 +03:00
parent 058edbe594
commit 33f18717ad
2 changed files with 11 additions and 3 deletions
+4
View File
@@ -838,6 +838,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
var/list/names = list()
var/list/creatures = list()
var/list/namecounts = list()
for(var/mob/M in mobs)
var/name = M.name
if (name in names)
@@ -846,13 +847,16 @@ Turf and target are seperate in case you want to teleport some distance from a t
else
names.Add(name)
namecounts[name] = 1
if (M.real_name && M.real_name != M.name)
name += " \[[M.original_name? M.original_name : M.real_name]\]"
if (M.stat == 2)
if(istype(M, /mob/dead/observer/))
name += " \[ghost\]"
else
name += " \[dead\]"
creatures[name] = M
return creatures
+7 -3
View File
@@ -95,20 +95,24 @@
else
alert("Admin jumping disabled")
/client/proc/Getmob(var/mob/M)
/client/proc/Getmob(var/mob/M in world)
set category = "Admin"
set name = "Get Mob"
set desc = "Mob to teleport"
if(!src.holder)
src << "Only administrators may use this command."
return
if(config.allow_admin_jump)
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))
if(!selection)
return
M = mobs[selection]
var/mob/A = src.mob
var/turf/T = get_turf(A)
if(T && isturf(T))