Merge remote-tracking branch 'bay12-upstream/master' into development

code/modules/admin/verbs/adminjump.dm

@@ -2,7 +2,7 @@
 	return
 
 /mob/dead/observer/on_mob_jump()
-	following = null
+	stop_following()
 
 /client/proc/Jump(var/area/A in return_sorted_areas())
 	set name = "Jump to Area"
@@ -21,7 +21,7 @@
 	else
 		alert("Admin jumping disabled")
 
-/client/proc/jumptoturf(var/turf/T in world)
+/client/proc/jumptoturf(var/turf/T in turfs)
 	set name = "Jump to Turf"
 	set category = "Admin"
 	if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_DEV))