merge

code/modules/mob/mob.dm

@@ -566,7 +566,7 @@
 			reset_view(null)
 			client.adminobs = 0
 	else
-		if(ticker)
+		if(ticker && ticker.mode)
 //		 world << "there's a ticker"
 			if(ticker.mode.name == "AI malfunction")
 //				world << "ticker says its malf"

code/modules/mob/mob_helpers.dm

@@ -144,7 +144,7 @@ proc/isorgan(A)
 	else
 		if (pr >= 100)
 			return n
-	var/te = n
+	var/te = html_decode(n)
 	var/t = ""
 	n = length(n)
 	var/p = null
@@ -155,7 +155,7 @@ proc/isorgan(A)
 		else
 			t = text("[]*", t)
 		p++
-	return t
+	return html_encode(t)
 
 /*proc/NewStutter(phrase,stunned)
 	phrase = html_decode(phrase)

code/modules/mob/mob_movement.dm

@@ -220,7 +220,7 @@
 							M.animate_movement = 2
 							return
 
-		else if(mob.confused)
+		else if(mob.confused && prob(30))
 			step(mob, pick(cardinal))
 		else
 			. = ..()