- A change to 'who' for admins, which now displays more information. Amongst these is the ckey of the person, the name of the character they're playing, their status as alive, unconscious, dead or observing (joined as observer) and whether they are an antagonist or not. Along with this you get an adminhelp-style (?) link which displays further information about the person. While this might not be considered a 'bugfix' it is necessary due to the removal of the tensioner panel as it gives a quick overview of how many people are alive and how many are dead.

- Removed the obnoxious message blue and red colors which was shown when hydroponics trays were overran by weeds. The message is now blue and has a dot at the end, instead of an exclamation point.
- Made '/obj/effect/debugging/marker' immovable. It was silly that it reacted to air movement.
- Standardized mapping.dm
- Removed the round-end condition of "Everyone is dead! Resetting in 30 seconds!"

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

code/defines/mob/dead/observer.dm

@@ -13,3 +13,4 @@
 	var/can_reenter_corpse
 	var/datum/hud/living/carbon/hud = null // hud
 	var/bootime = 0
+	var/started_as_observer //This variable is set to 1 when you enter the game as an observer. If you died in the game and are a ghsot - this will remain as null. Note that this is not a reliable way to determine if admins started as observers, since they change mobs a lot.

code/game/machinery/hydroponics.dm

@@ -218,9 +218,8 @@ obj/machinery/hydroponics/proc/weedinvasion() // If a weed growth is sufficient,
 	src.harvest = 0
 	src.weedlevel = 0 // Reset
 	src.pestlevel = 0 // Reset
-	spawn(5) // Wait a while
 	src.updateicon()
-	src.visible_message("\red[src] has been overtaken by \blue [src.myseed.plantname]!")
+	src.visible_message("\blue [src] has been overtaken by [src.myseed.plantname].")
 
 	return
 

code/game/verbs/who.dm

@@ -26,10 +26,32 @@ proc/get_all_admin_clients()
 	var/list/peeps = list()
 
 	for (var/client/C in client_list)
+		var/entry = ""
 		if (C.stealth && !usr.client.holder)
-			peeps += "\t[C.fakekey]"
+			entry += "\t[C.fakekey]"
 		else
-			peeps += "\t[C.key][C.stealth ? " <i>(as [C.fakekey])</i>" : ""]"
+			entry += "\t[C.key][C.stealth ? " <i>(as [C.fakekey])</i>" : ""]"
+
+		if(usr.client.holder)
+			var/mob/M = C.mob
+			entry += " - Playing as [M.real_name]"
+			switch(M.stat)
+				if(UNCONSCIOUS)
+					entry += " - <font color='darkgray'><b>Unconscious</b></font>"
+				if(DEAD)
+					if(isobserver(M))
+						var/mob/dead/observer/O = M
+						if(O.started_as_observer)
+							entry += " - <font color='gray'>Observing</font>"
+						else
+							entry += " - <font color='black'><b>DEAD</b></font>"
+					else
+						entry += " - <font color='black'><b>DEAD</b></font>"
+			if(is_special_character(C.mob))
+				entry += " - <b><font color='red'>Antagonist</font></b>"
+			entry += " (<A HREF='?src=\ref[src.client.holder];adminmoreinfo=\ref[M]'>?</A>)"
+
+		peeps += entry
 
 	peeps = sortList(peeps)
 

code/modules/admin/verbs/mapping.dm

@@ -34,15 +34,16 @@ var/intercom_range_display_status = 0
 	icon = 'icons/turf/areas.dmi'
 	icon_state = "yellow"
 
-/client/proc
+/obj/effect/debugging/marker/Move()
+	return 0
 
-	do_not_use_these()
+/client/proc/do_not_use_these()
 	set category = "Mapping"
 	set name = "-None of these are for ingame use!!"
 
 	..()
 
-	camera_view()
+/client/proc/camera_view()
 	set category = "Mapping"
 	set name = "Camera Range Display"
 
@@ -63,7 +64,7 @@ var/intercom_range_display_status = 0
 
 
 
-	sec_camera_report()
+/client/proc/sec_camera_report()
 	set category = "Mapping"
 	set name = "Camera Report"
 
@@ -103,7 +104,7 @@ var/intercom_range_display_status = 0
 	usr << browse(output,"window=airreport;size=1000x500")
 	feedback_add_details("admin_verb","mCRP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-	intercom_view()
+/client/proc/intercom_view()
 	set category = "Mapping"
 	set name = "Intercom Range Display"
 
@@ -123,7 +124,7 @@ var/intercom_range_display_status = 0
 					del(F)
 	feedback_add_details("admin_verb","mIRD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-	enable_debug_verbs()
+/client/proc/enable_debug_verbs()
 	set category = "Debug"
 	set name = "Debug verbs"
 	src.verbs += /client/proc/do_not_use_these 			//-errorage
@@ -145,7 +146,7 @@ var/intercom_range_display_status = 0
 
 	feedback_add_details("admin_verb","mDV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-	count_objects_on_z_level()
+/client/proc/count_objects_on_z_level()
 	set category = "Mapping"
 	set name = "Count Objects On Level"
 	var/level = input("Which z-level?","Level?") as text
@@ -188,7 +189,7 @@ var/intercom_range_display_status = 0
 	world << "There are [count] objects of type [type_path] on z-level [num_level]"
 	feedback_add_details("admin_verb","mOBJZ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-	count_objects_all()
+/client/proc/count_objects_all()
 	set category = "Mapping"
 	set name = "Count Objects All"
 

code/modules/mob/death.dm

@@ -50,31 +50,6 @@
 /mob/proc/death(gibbed)
 	timeofdeath = world.time
 
-	var/cancel = 0
-	for(var/mob/M in player_list)
-		if(M.stat != DEAD)
-			cancel = 1
-			break
-	if(!cancel)
-		world << "<B>Everyone is dead! Resetting in 30 seconds!</B>"
-
-		spawn(300)
-			for(var/mob/M in player_list)
-				if(M.stat != DEAD)
-					world << "Aborting world restart!"
-					return
-
-			feedback_set_details("end_error","no live players")
-
-			if(blackbox)
-				blackbox.save_all_data_to_sql()
-
-			sleep(50)
-
-			log_game("Rebooting because of no live players")
-			world.Reboot()
-			return
-
 	living_mob_list -= src
 	dead_mob_list += src
 	return ..(gibbed)

code/modules/mob/new_player/new_player.dm

@@ -130,6 +130,7 @@
 				spawning = 1
 				src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS cant last forever yo
 
+				observer.started_as_observer = 1
 				close_spawn_windows()
 				var/obj/O = locate("landmark*Observer-Start")
 				src << "\blue Now teleporting."