From b2daa86680abb022b80910025442b1cfaab6e3b1 Mon Sep 17 00:00:00 2001
From: uporotiy <uporotiy@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Thu, 6 Jan 2011 13:09:40 +0000
Subject: [PATCH] Improved lizard AI. Fixed asay being removed by "hide admin
 verbs".

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@788 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/objects/livestock.dm    | 11 +++++------
 code/modules/admin/admin_verbs.dm |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/code/game/objects/livestock.dm b/code/game/objects/livestock.dm
index 01c18c954aa..8342a831a91 100644
--- a/code/game/objects/livestock.dm
+++ b/code/game/objects/livestock.dm
@@ -233,11 +233,10 @@
 		if (!alive)				//If it isn't alive, it shouldn't be doing anything.
 			return
 		if (cowardly) //cowardly = 1 stuff
-			if (!flee_from.len) //checking for threats
-				var/view = view_range-2							//Actual sight slightly lower then it's total sight.
-				for (var/mob/living/carbon/C in range(view,src.loc))
-					if ((get_dir(src,C) & dir) || (C.m_intent=="run" && C.moved_recently)) //if it can see or hear anyone nearby, start fleeing
-						flee_from += C
+			var/view = view_range-2							//Actual sight slightly lower then it's total sight.
+			for (var/mob/living/carbon/C in range(view,src.loc)) //checking for threats
+				if (((get_dir(src,C) & dir) || (C.m_intent=="run" && C.moved_recently)) && !(C in flee_from)) //if it can see or hear anyone nearby, start fleeing
+					flee_from += C
 			if (flee_from.len) //ohgodrun
 				var/viable_dirs = 0
 				for(var/mob/living/carbon/C in flee_from)
@@ -249,7 +248,7 @@
 				if(viable_dirs) //if there is somewhere to run, DO IT DAMNIT
 					var/list/turfs_to_move_to = new/list()
 					for(var/turf/T in orange(src,1))
-						if((get_dir(src,T) & viable_dirs) == get_dir(src,T))
+						if(((get_dir(src,T) & viable_dirs) == get_dir(src,T)) && !T.density)
 							turfs_to_move_to += T
 					src.Move(pick(turfs_to_move_to))
 		if (aggressive) //aggressive = 1 stuff
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index a9490b8ff03..5badaf6f083 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -1005,7 +1005,7 @@
 	src.verbs -= /client/proc/cmd_admin_mute
 	src.verbs -= /client/proc/cmd_admin_pm
 	src.verbs -= /client/proc/cmd_admin_direct_narrate 	// -- TLE
-	src.verbs -= /client/proc/cmd_admin_say
+	//src.verbs -= /client/proc/cmd_admin_say
 	src.verbs -= /client/proc/cmd_admin_subtle_message
 	src.verbs -= /client/proc/cmd_admin_world_narrate 	// -- TLE
 	src.verbs -= /client/proc/get_admin_state