Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)

code/_onclick/ai.dm

@@ -55,11 +55,6 @@
 	if(modifiers["shift"] && modifiers["ctrl"])
 		CtrlShiftClickOn(A)
 		return
-	if(modifiers["middle"])
-		if(controlled_mech) //Are we piloting a mech? Placed here so the modifiers are not overridden.
-			controlled_mech.click_action(A, src, params) //Override AI normal click behavior.
-		return
-
 	if(modifiers["shift"])
 		ShiftClickOn(A)
 		return

code/_onclick/click.dm

@@ -82,11 +82,6 @@
 	if(!modifiers["catcher"] && A.IsObscured())
 		return
 
-	if(ismecha(loc))
-		var/obj/mecha/M = loc
-		M.click_action(A,src,params)
-		return TRUE
-
 	if(restrained())
 		DelayNextAction(CLICK_CD_HANDCUFFED)
 		return RestrainedClickOn(A)

code/_onclick/hud/radial.dm

@@ -194,6 +194,9 @@ GLOBAL_LIST_EMPTY(radial_menus)
 	else
 		if(istext(choices_values[choice_id]))
 			E.name = choices_values[choice_id]
+		else if(ispath(choices_values[choice_id],/atom))
+			var/atom/A = choices_values[choice_id]
+			E.name = initial(A.name)
 		else
 			var/atom/movable/AM = choices_values[choice_id] //Movables only
 			E.name = AM.name

code/_onclick/right_click.dm

@@ -11,10 +11,6 @@
 	if(!modifiers["catcher"] && A.IsObscured())
 		return
 
-	if(ismecha(loc))
-		var/obj/mecha/M = loc
-		return M.click_action(A,src,params)
-
 	if(restrained())
 		DelayNextAction(CLICK_CD_HANDCUFFED)
 		return RestrainedClickOn(A)