From 33f18717ad7e9fc8d12ea3df60480f7fabd89aaf Mon Sep 17 00:00:00 2001
From: Albert Iordache <iordachealbert@gmail.com>
Date: Thu, 17 May 2012 12:32:03 +0300
Subject: [PATCH] Fixed Get-Mob, #1038

---
 code/defines/procs/helpers.dm         |  4 ++++
 code/modules/admin/verbs/adminjump.dm | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/code/defines/procs/helpers.dm b/code/defines/procs/helpers.dm
index 61dc65dbc3b..859e8abd106 100644
--- a/code/defines/procs/helpers.dm
+++ b/code/defines/procs/helpers.dm
@@ -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
diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm
index 943205551f4..871f0bfcc97 100644
--- a/code/modules/admin/verbs/adminjump.dm
+++ b/code/modules/admin/verbs/adminjump.dm
@@ -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))