Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367

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

@@ -93,6 +93,7 @@
 	var/list/all_eyes = list()
 	var/max_multicams = 6
 	var/display_icon_override
+	var/emote_display = "Neutral" //text string of the current emote we set for the status displays, to prevent logins resetting it.
 
 /mob/living/silicon/ai/Initialize(mapload, datum/ai_laws/L, mob/target_ai)
 	. = ..()
@@ -201,6 +202,7 @@
 
 	if(!ai_core_icon || incapacitated())
 		return
+
 	display_icon_override = ai_core_icon
 	set_core_display_icon(ai_core_icon)
 
@@ -599,12 +601,15 @@
 	if(incapacitated())
 		return
 	var/list/ai_emotions = list("Very Happy", "Happy", "Neutral", "Unsure", "Confused", "Sad", "BSOD", "Blank", "Problems?", "Awesome", "Facepalm", "Thinking", "Friend Computer", "Dorfy", "Blue Glow", "Red Glow")
-	var/emote = input("Please, select a status!", "AI Status", null, null) in ai_emotions
+	var/n_emote = input("Please, select a status!", "AI Status", null, null) in ai_emotions
+	if(!n_emote)
+		return
+	emote_display = n_emote
 	for (var/each in GLOB.ai_status_displays) //change status of displays
 		var/obj/machinery/status_display/ai/M = each
-		M.emotion = emote
+		M.emotion = emote_display
 		M.update()
-	if (emote == "Friend Computer")
+	if (emote_display == "Friend Computer")
 		var/datum/radio_frequency/frequency = SSradio.return_frequency(FREQ_STATUS_DISPLAYS)
 
 		if(!frequency)
@@ -826,7 +831,7 @@
 
 	var/rendered = "<i><span class='game say'>[start]<span class='name'>[hrefpart][namepart] ([jobpart])</a> </span><span class='message'>[raw_message]</span></span></i>"
 
-	show_message(rendered, 2)
+	show_message(rendered, MSG_AUDIBLE)
 
 /mob/living/silicon/ai/fully_replace_character_name(oldname,newname)
 	..()

code/modules/mob/living/silicon/ai/examine.dm

@@ -3,18 +3,16 @@
 	if (stat == DEAD)
 		. += "<span class='deadsay'>It appears to be powered-down.</span>"
 	else
-		. += "<span class='warning'>"
 		if (getBruteLoss())
 			if (getBruteLoss() < 30)
-				. += "It looks slightly dented."
+				. += "<span class='warning'>It looks slightly dented.</span>"
 			else
-				. += "<B>It looks severely dented!</B>"
+				. += "<span class='danger'>It looks severely dented!</span>"
 		if (getFireLoss())
 			if (getFireLoss() < 30)
-				. += "It looks slightly charred."
+				. += "<span class='warning'>It looks slightly charred.</span>"
 			else
-				. += "<B>Its casing is melted and heat-warped!</B>"
-		. += "</span>"
+				. += "<span class='danger'>Its casing is melted and heat-warped!</span>"
 		if(deployed_shell)
 			. += "The wireless networking light is blinking."
 		else if (!shunted && !client)

code/modules/mob/living/silicon/ai/freelook/eye.dm

@@ -191,7 +191,7 @@
 	acceleration = !acceleration
 	to_chat(usr, "Camera acceleration has been toggled [acceleration ? "on" : "off"].")
 
-/mob/camera/aiEye/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode)
+/mob/camera/aiEye/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode, atom/movable/source)
 	. = ..()
 	if(relay_speech && speaker && ai && !radio_freq && speaker != ai && near_camera(speaker))
 		ai.relay_speech(message, speaker, message_language, raw_message, radio_freq, spans, message_mode)

code/modules/mob/living/silicon/ai/login.dm

@@ -4,7 +4,7 @@
 		for(var/each in GLOB.ai_status_displays) //change status
 			var/obj/machinery/status_display/ai/O = each
 			O.mode = 1
-			O.emotion = "Neutral"
+			O.emotion = emote_display
 			O.update()
 	set_eyeobj_visible(TRUE)
 	if(multicam_on)

code/modules/mob/living/silicon/ai/say.dm

@@ -49,7 +49,7 @@
 		else
 			padloc = "(UNKNOWN)"
 		src.log_talk(message, LOG_SAY, tag="HOLOPAD in [padloc]")
-		send_speech(message, 7, T, "robot", language)
+		send_speech(message, 7, T, "robot", message_language = language)
 		to_chat(src, "<i><span class='game say'>Holopad transmitted, <span class='name'>[real_name]</span> <span class='message robot'>\"[message]\"</span></span></i>")
 	else
 		to_chat(src, "No holopad connected.")