-Made the admin "floor is lava" secret to only hurt carbons. Otherwise activating it would kill the AI everytime, since it cannot move.

-Fixed following not working right. Optimized "observe".

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4685 316c924e-a436-60f5-8080-3fe189b3f50e

code/modules/admin/admin.dm

@@ -2069,7 +2069,7 @@ var/global/floorIsLava = 0
 
 					spawn(0)
 						for(var/i = i, i < length, i++) // 180 = 3 minutes
-							for(var/mob/living/L in living_mob_list)
+							for(var/mob/living/carbon/L in living_mob_list)
 								if(istype(L.loc, /turf/simulated/floor)) // Are they on LAVA?!
 									var/turf/simulated/floor/F = L.loc
 									var/safe = 0

code/modules/mob/dead/observer/observer.dm

@@ -180,12 +180,17 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	set desc = "Follow and haunt a mob."
 
 	if(istype(usr, /mob/dead/observer))
-		var/mob/target = input("Please, select a player!", "Jump to Mob", null, null) as null|anything in getmobs()
-		if(target)
+		var/list/mobs = getmobs()
+		var/input = input("Please, select a mob!", "Follow Mob", null, null) as null|anything in mobs
+		var/mob/target = mobs[input]
+		if(target && target != usr)
 			spawn(0)
 				var/turf/pos = get_turf(src)
 				while(src.loc == pos)
-					src.loc = get_turf(target)
+					var/turf/T = get_turf(target)
+					if(!T)
+						break
+					src.loc = T
 					pos = src.loc
 					sleep(15)
 

code/modules/mob/mob.dm

@@ -443,51 +443,40 @@ var/list/slot_equipment_priority = list( \
 	var/list/namecounts = list()
 	var/list/creatures = list()
 
-	for (var/obj/item/weapon/disk/nuclear/D in world)
-		var/name = "Nuclear Disk"
-		if (names.Find(name))
-			namecounts[name]++
-			name = "[name] ([namecounts[name]])"
-		else
-			names.Add(name)
-			namecounts[name] = 1
-		creatures[name] = D
+	for(var/obj/O in world)
+		if(!O.loc)
+			continue
+		if(istype(O, /obj/item/weapon/disk/nuclear))
+			var/name = "Nuclear Disk"
+			if (names.Find(name))
+				namecounts[name]++
+				name = "[name] ([namecounts[name]])"
+			else
+				names.Add(name)
+				namecounts[name] = 1
+			creatures[name] = O
 
-	for (var/obj/machinery/singularity/S in world)
-		var/name = "Singularity"
-		if (names.Find(name))
-			namecounts[name]++
-			name = "[name] ([namecounts[name]])"
-		else
-			names.Add(name)
-			namecounts[name] = 1
-		creatures[name] = S
+		if(istype(O, /obj/machinery/singularity))
+			var/name = "Singularity"
+			if (names.Find(name))
+				namecounts[name]++
+				name = "[name] ([namecounts[name]])"
+			else
+				names.Add(name)
+				namecounts[name] = 1
+			creatures[name] = O
 
-	for (var/obj/machinery/bot/B in world)
-		var/name = "BOT: [B.name]"
-		if (names.Find(name))
-			namecounts[name]++
-			name = "[name] ([namecounts[name]])"
-		else
-			names.Add(name)
-			namecounts[name] = 1
-		creatures[name] = B
-/*
-	for (var/mob/living/silicon/decoy/D in world)
-		var/name = "[D.name]"
-		if (names.Find(name))
-			namecounts[name]++
-			name = "[name] ([namecounts[name]])"
-		else
-			names.Add(name)
-			namecounts[name] = 1
-		creatures[name] = D
-*/
+		if(istype(O, /obj/machinery/bot))
+			var/name = "BOT: [O.name]"
+			if (names.Find(name))
+				namecounts[name]++
+				name = "[name] ([namecounts[name]])"
+			else
+				names.Add(name)
+				namecounts[name] = 1
+			creatures[name] = O
 
 
-
-//THIS IS HOW YOU ADD OBJECTS TO BE OBSERVED
-
 	for(var/mob/M in sortAtom(mob_list))
 		var/name = M.name
 		if (names.Find(name))
@@ -499,7 +488,6 @@ var/list/slot_equipment_priority = list( \
 
 		creatures[name] = M
 
-//THIS IS THE MOBS PART: LOOK IN HELPERS.DM
 
 	client.perspective = EYE_PERSPECTIVE