Merge remote-tracking branch 'citadel/master' into mobility_flags

code/datums/brain_damage/brain_trauma.dm

@@ -14,7 +14,7 @@
 	var/can_gain = TRUE
 	var/random_gain = TRUE //can this be gained through random traumas?
 	var/resilience = TRAUMA_RESILIENCE_BASIC //how hard is this to cure?
-	var/clonable = TRUE // will this transfer if the brain is cloned?
+	var/clonable = TRUE // will this transfer if the brain is cloned? - currently has no effect
 
 /datum/brain_trauma/Destroy()
 	if(brain && brain.traumas)

code/datums/brain_damage/imaginary_friend.dm

@@ -153,7 +153,7 @@
 	to_chat(src, compose_message(speaker, message_language, raw_message, radio_freq, spans, message_mode, FALSE, source))
 
 /mob/camera/imaginary_friend/proc/friend_talk(message)
-	message = capitalize(trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)))
+	message = capitalize(trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN)))
 
 	if(!message)
 		return

code/datums/brain_damage/mild.dm

@@ -199,13 +199,16 @@
 		var/list/new_message = list()
 
 		for(var/word in message_split)
-			var/suffix = copytext(word,-1)
+			var/suffix = ""
+			var/suffix_foundon = 0
+			for(var/potential_suffix in list("." , "," , ";" , "!" , ":" , "?"))
+				suffix_foundon = findtext(word, potential_suffix, -length(potential_suffix))
+				if(suffix_foundon)
+					suffix = potential_suffix
+					break
 
-			// Check if we have a suffix and break it out of the word
-			if(suffix in list("." , "," , ";" , "!" , ":" , "?"))
-				word = copytext(word,1,-1)
-			else
-				suffix = ""
+			if(suffix_foundon)
+				word = copytext(word, 1, suffix_foundon)
 
 			word = html_decode(word)
 
@@ -216,10 +219,9 @@
 					new_message += pick("uh","erm")
 					break
 				else
-					var/list/charlist = string2charlist(word) // Stupid shit code
+					var/list/charlist = text2charlist(word)
 					shuffle_inplace(charlist)
-					charlist.len = round(charlist.len * 0.5,1)
-					new_message += html_encode(jointext(charlist,"")) + suffix
+					new_message += jointext(charlist, "") + suffix
 
 		message = jointext(new_message, " ")