Ergo's Changes

*Examine shows NPCs a unique message
*NPCs should no longer stand and stare at people in combat.
*Toned down the amount of rudeness in their speech.

code/modules/mob/interactive.dm

@@ -424,7 +424,7 @@
 	var/turf/D = get_step(src,dir)
 	if(D)
 		if(!D.density)
-			walk_to(src,T)
+			walk_to(src,T,0,5)
 			doing = doing & ~TRAVEL
 			return 1
 		else
@@ -539,10 +539,10 @@
 			if(shift)
 				if(src.dir == NORTH || SOUTH)
 					var/towalk = pick(EAST,WEST)
-					walk_to(src,get_step(src,towalk))
+					walk_to(src,get_step(src,towalk),0,5)
 				else
 					var/towalk = pick(NORTH,SOUTH)
-					walk_to(src,get_step(src,towalk))
+					walk_to(src,get_step(src,towalk),0,5)
 
 /mob/living/carbon/human/interactive/proc/combat(obj)
 	set background = 1
@@ -602,7 +602,8 @@
 							if(Adjacent(TARGET))
 								M.attack_hand(src)
 								sleep(1)
-			else if(M.health <= 1 || !(M in range(14,src)))
+				timeout++
+			else if(timeout >= 10 || M.health <= 1 || !(M in range(14,src)))
 				doing = doing & ~FIGHTING
 				timeout = 0
 				TARGET = null

code/modules/mob/living/carbon/human/examine.dm

@@ -239,7 +239,9 @@
 			msg += "[t_He] [t_has] a stupid expression on [t_his] face.\n"
 
 		if(getorgan(/obj/item/organ/brain))
-			if(!key)
+			if(istype(src,/mob/living/carbon/human/interactive))
+				msg += "<span class='deadsay'>[t_He] [t_is] appears to be some sort of sick automaton, [t_his] eyes are glazed over and [t_his] mouth is slightly agape.</span>\n"
+			else if(!key)
 				msg += "<span class='deadsay'>[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely.</span>\n"
 			else if(!client)
 				msg += "[t_He] [t_has] a vacant, braindead stare...\n"

strings/npc_chatter.txt

@@ -1,11 +1,11 @@
-verbs_use@=touch@,hold@,poke@,punch@,smash@,assault@,wrench@,tickle@,modify@,whack@,beat@,tackle@,fiddle@,destroy
-verbs_touch@=stroke@,pat@,lick@,finger@,mess with@,absorb@,sneeze on@,fist@,feel up@,inject@,rip
+verbs_use@=touch@,hold@,poke@,punch@,smash@,assault@,wrench@,tickle@,modify@,whack@,beat@,tackle@,destroy
+verbs_touch@=pat@,mess with@,absorb@,sneeze on@,inject@,rip@,slap@,grab@,choke
 verbs_move@=run@,jog@,leg it@,slide@,cheese it@,walk@,stroll@,fly@,scoot@,yakkety@,speed@,fuck off@,escape
-nouns_insult@=faggot@,shitcurity@,noob@,comdom@,greyturd@,tator@,lingbin@,bitch@,whorelord@,cluwne@,shitbin@,turdcurity@,fuckblanket@,asswhistle@,cumdumpster
-nouns_generic@=you@,you there@,guy@,person@,dude@,shitbin@,officer
-nouns_objects@=thing@,tool@,whatever@,potential murder weapon@,object@,toy@,rear-end pleasure device@,whatever
-nouns_body@=ass@,head@,face@,arms@,fingers@,toes@,chest@,eyes@,nails@,groin@,stomach@,intestines@,head@,hoo-hah
-adjective_insult@=ugly@,repulsive@,dumb@,asian@,mongoloid@,childish@,captain-like@,monkey-like@,whoreish@,dimwit@,cunt-face@,vomit-inducer
+nouns_insult@=gaylord@,shitcurity@,noob@,comdom@,greyshirt@,tator@,lingbin@,bitch@,whorelord@,cluwne@,monkey@,cheesemonger@,milkdrinker
+nouns_generic@=you@,you there@,guy@,person@,dude@,jerk@,officer
+nouns_objects@=thing@,tool@,whatever@,potential murder weapon@,object@,toy@,device@,whatever
+nouns_body@=ass@,head@,face@,arms@,fingers@,toes@,chest@,eyes@,nails@,groin@,stomach@,intestines@,head
+adjective_insult@=ugly@,repulsive@,dumb@,asian@,mongoloid@,childish@,captain-like@,monkey-like@,whoreish@,dimwit@,jerk-face@,vomit-inducer
 adjective_objects@=big@,small@,tiny@,round@,square@,oblong@,colorful@,dull@,shiny@,sparkling@,blinking@,awful
 adjective_generic@=nice@,pretty@,ugly@,bad@,okay@,stupid
-curse_words@=fuck@,shit@,cunt@,ass@,cock@,dick@,bitch@,mother fucker
+curse_words@=damn@,shit@,arse@,ass@,wank@,jerk@,bitch