Merge pull request #215 from Tastyfish/master

retired admins don't get sent as admins in json

code/WorkInProgress/Tastyfish/Eliza.dm

@@ -19,7 +19,7 @@
 	username = ""
 	yesno_state = ""
 	yesno_param = ""
-	print("Hi! I'm [callsign], how are you doing?")
+	print("Hi! I'm [callsign], how are you doing? You can talk to me by beginning your statements with \"[callsign],\"")
 
 /datum/text_parser/parser/eliza/process_line()
 	..()

code/WorkInProgress/Tastyfish/Eliza_Data.dm

@@ -108,7 +108,7 @@
 				"Oh, I*",
 				"You're not really talking about me, are you?")),
 		new/datum/text_parser/keyword(
-			list("i want"),
+			list("i want","i like"),
 			list(
 				"What would it mean if you got*",
 				"Why do you want*",
@@ -397,7 +397,7 @@
 		pda.overlays = null
 		pda.overlays += image('pda.dmi', "pda-r")
 
-		return "Told [name] that [object]."
+		return "Told [name], [object]."
 
 /datum/text_parser/keyword/yes
 	process(object)

code/game/json.dm

@@ -30,7 +30,7 @@ proc/makejson()
 	var/admins = "no"
 	for(var/client/C)
 		playerscount++
-		if(C.holder)
+		if(C.holder && C.holder.level >= 0)		// make sure retired admins don't make nt think admins are on
 			if(!C.stealth)
 				admins = "yes"
 				players += "[C.key];"