object narrate is now atom narrate

code/datums/langchat/langchat.dm

@@ -116,7 +116,7 @@
 		if(langchat_client_enabled(M) && !M.ear_deaf && (skip_language_check || M.say_understands(src, language)))
 			M.client.images += langchat_image
 
-	if(isturf(loc))
+	if(isturf(src) || isturf(loc))
 		langchat_image.loc = src
 	else
 		langchat_image.loc = recursive_holder_check(src)

code/modules/admin/admin_verbs.dm

@@ -15,7 +15,7 @@ var/list/admin_verbs_default = list(
 	/client/proc/cmd_admin_change_their_name,
 	/client/proc/cmd_admin_changekey,
 	/client/proc/cmd_admin_subtle_message,
-	/client/proc/cmd_admin_object_narrate,
+	/client/proc/cmd_admin_atom_narrate,
 	/client/proc/cmd_admin_xeno_report,  //Allows creation of IC reports by the Queen Mother
 	/client/proc/cmd_admin_create_bioscan,
 	/client/proc/cmd_admin_create_AI_report,  //Allows creation of IC reports by the ships AI utilizing Almayer General channel. Relies on ARES being intact and tcomms being powered.
@@ -115,7 +115,7 @@ var/list/admin_verbs_minor_event = list(
 	/datum/admins/proc/force_predator_round, //Force spawns a predator round.
 	/client/proc/adjust_predator_round,
 	/client/proc/cmd_admin_world_narrate, /*sends text to all players with no padding*/
-	/client/proc/cmd_admin_object_narrate,
+	/client/proc/cmd_admin_atom_narrate,
 	/client/proc/cmd_admin_create_centcom_report, //Messages from USCM command/other factions.
 	/client/proc/cmd_admin_create_predator_report, //Predator ship AI report
 	/client/proc/toggle_ob_spawn,
@@ -279,7 +279,7 @@ var/list/admin_verbs_hideable = list(
 	/client/proc/cmd_admin_change_their_name,
 	/client/proc/cmd_admin_changekey,
 	/client/proc/cmd_admin_subtle_message,
-	/client/proc/cmd_admin_object_narrate,
+	/client/proc/cmd_admin_atom_narrate,
 	/client/proc/cmd_admin_pm_context,
 	/client/proc/cmd_admin_rejuvenate,
 	/client/proc/cmd_admin_check_contents,

code/modules/admin/verbs/mob_verbs.dm

@@ -203,22 +203,22 @@
 		else
 			return
 
-/client/proc/cmd_admin_object_narrate(obj/selected)
-	set name = "Object Narrate"
+/client/proc/cmd_admin_atom_narrate(atom/selected)
+	set name = "Atom Narrate"
 	set category = null
 
 	if(!check_rights(R_MOD))
 		return
 
-	var/type = tgui_input_list(usr,
-				"What type of narration?",
-				"Narration",
-				list(NARRATION_METHOD_SAY, NARRATION_METHOD_ME, NARRATION_METHOD_DIRECT))
-	if(!type) return
-	var/message = input(usr,
-				"What should it say?",
-				"Narrating as [selected.name]")
-	if(!message) return
+	var/type = tgui_input_list(mob,"What type of narration?", "Narration", list(NARRATION_METHOD_SAY, NARRATION_METHOD_ME, NARRATION_METHOD_DIRECT))
+
+	if(!type)
+		return
+
+	var/message = tgui_input_text(mob, "What should it say?", "Narrating as [selected]")
+
+	if(!message)
+		return
 
 	var/list/heard = get_mobs_in_view(world_view_size, selected)
 
@@ -231,8 +231,9 @@
 			selected.visible_message("<b>[selected]</b> [message]")
 		if(NARRATION_METHOD_DIRECT)
 			selected.visible_message("[message]")
-	log_admin("[key_name(src)] sent an Object Narrate with message [message].")
-	message_admins("[key_name(src)] sent an Object Narrate with message [message].")
+
+	log_admin("[key_name(src)] sent an Atom Narrate with message [message].")
+	message_admins("[key_name(src)] sent an Atom Narrate with message [message].")
 
 /client/proc/cmd_admin_direct_narrate(mob/M)
 	set name = "Narrate"