Merge pull request #900 from Erthilo/master

Fix for Cyborg lockdown and MMI's not spawning

code/defines/procs/helpers.dm

@@ -128,7 +128,7 @@
 	return t
 
 /proc/strip_html_simple(var/t,var/limit=MAX_MESSAGE_LEN)
-	var/list/strip_chars = list("<",">")
+	var/list/strip_chars = list("<",">","&","'")
 	t = copytext(t,1,limit)
 	for(var/char in strip_chars)
 		var/index = findtext(t, char)
@@ -1587,7 +1587,7 @@ proc/get_opposite(var/checkdir)
 		var/a = copytext(text,i,i+1)
 		if(a == character)
 			count++
-	return count
+	return count
 
 /proc/reverse_direction(var/dir)
 	switch(dir)

code/game/machinery/computer/robot.dm

@@ -21,9 +21,11 @@
 		if(screen == 1)
 			for(var/mob/living/silicon/robot/R in world)
 				if(istype(user, /mob/living/silicon/ai))
-					if (R.connected_ai != user) continue
+					if (R.connected_ai != user)
+						continue
 				if(istype(user, /mob/living/silicon/robot))
-					if (R != user) continue
+					if (R != user)
+						continue
 				dat += "[R.name] |"
 				if(R.stat)
 					dat += " Not Responding |"
@@ -148,10 +150,10 @@
 		else if (href_list["stopbot"])
 			if(src.allowed(usr))
 				var/mob/living/silicon/robot/R = locate(href_list["stopbot"])
-				if(R)
+				if(R && istype(R)) // Extra sancheck because of input var references
 					var/choice = input("Are you certain you wish to [R.canmove ? "lock down" : "release"] [R.name]?") in list("Confirm", "Abort")
 					if(choice == "Confirm")
-						if(R)
+						if(R && istype(R))
 							message_admins("\blue [key_name_admin(usr)] [R.canmove ? "locked down" : "released"] [R.name]!")
 							log_game("[key_name(usr)] [R.canmove ? "locked down" : "released"] [R.name]!")
 							R.canmove = !R.canmove
@@ -173,7 +175,7 @@
 				if(R)
 					var/choice = input("Are you certain you wish to hack [R.name]?") in list("Confirm", "Abort")
 					if(choice == "Confirm")
-						if(R)
+						if(R && istype(R))
 							message_admins("\blue [key_name_admin(usr)] emagged [R.name] using robotic console!")
 							log_game("[key_name(usr)] emagged [R.name] using robotic console!")
 							R.emagged = 1

code/modules/mob/living/silicon/robot/life.dm

@@ -310,7 +310,7 @@
 						src << "\red <B>Killswitch Activated"
 					killswitch = 0
 					spawn(5)
-						gib(src)
+						gib()
 
 		process_locks()
 			if(weapon_lock)

code/modules/mob/living/silicon/robot/robot.dm

@@ -213,7 +213,7 @@
 	flick("flash", flash)
 /*
 	if (stat == 2 && client)
-		gib(1)
+		gib()
 		return
 
 	else if (stat == 2 && !client)
@@ -225,7 +225,7 @@
 			if (stat != 2)
 				adjustBruteLoss(100)
 				adjustFireLoss(100)
-				gib(1)
+				gib()
 				return
 		if(2.0)
 			if (stat != 2)

code/modules/mob/mob_movement.dm

@@ -160,6 +160,7 @@
 		return
 
 	if(Process_Grab())	return
+	if(!mob.canmove)	return
 
 //Making mob movememnt changes instant.
 	if(mob.paralysis || mob.stunned || mob.resting || mob.weakened || mob.buckled || (mob.changeling && mob.changeling.changeling_fakedeath))