diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index 26ac9307b61..e197d419f49 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -31,7 +31,15 @@
 	for (var/mob/M in world)
 		if(M && M.client && M.client.holder)
 			if(usr.client.holder  && (usr.client.holder.level != 0))
-				usr << "[M.key] is a [M.client.holder.rank][M.client.stealth ? " <i>(as [M.client.fakekey])</i>" : ""]"
+				var/afk = 0
+				if( M.client.inactivity > 3000 ) //3000 deciseconds = 300 seconds = 5 minutes
+					afk = 1
+				if(isobserver(M))
+					usr << "[M.key] is a [M.client.holder.rank][M.client.stealth ? " <i>(as [M.client.fakekey])</i>" : ""] - Observing [afk ? "(AFK)" : ""]"
+				else if(istype(M,/mob/new_player))
+					usr << "[M.key] is a [M.client.holder.rank][M.client.stealth ? " <i>(as [M.client.fakekey])</i>" : ""] - Has not entered [afk ? "(AFK)" : ""]"
+				else if(istype(M,/mob/living))
+					usr << "[M.key] is a [M.client.holder.rank][M.client.stealth ? " <i>(as [M.client.fakekey])</i>" : ""] - Playing [afk ? "(AFK)" : ""]"
 			else if(!M.client.stealth && (M.client.holder.level != -3))
 				usr << "\t[pick(nobles)] [M.client] is a [M.client.holder.rank]"
 
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index be46259e7ff..c421c563040 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
 
 /* new portable generator - work in progress
 
@@ -57,15 +57,14 @@ display round(lastgen) and plasmatank amount
 	var/recent_fault = 0
 	var/power_output = 1
 
-	proc
-		HasFuel() //Placeholder for fuel check.
-			return 1
+	proc/HasFuel() //Placeholder for fuel check.
+		return 1
 
-		UseFuel() //Placeholder for fuel use.
-			return
+	proc/UseFuel() //Placeholder for fuel use.
+		return
 
-		handleInactive()
-			return
+	proc/handleInactive()
+		return
 
 	process()
 		if(active && HasFuel() && !crit_fail && anchored)