Merge branch 'Citadel-Station-13:master' into Projectile_Rework

2022-04-06 22:31:51 -04:00
parent 416c7412c8 03385972d7
commit 48db01702b
21 changed files with 526 additions and 156 deletions
@@ -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