Revert "orbit menu is less cluttered (#3197)"

This reverts commit 38e9de9.
shiptest-ss13 · Jul 17, 2024 · 65c3483 · 65c3483
1 parent 199d8e0
commit 65c3483
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
@@ -295,7 +295,7 @@ Turf and target are separate in case you want to teleport some distance from a t
 	return "[pick("!","@","#","$","%","^","&")][pick("!","@","#","$","%","^","&","*")][pick("!","@","#","$","%","^","&","*")][pick("!","@","#","$","%","^","&","*")]"
 
 //Returns a list of all items of interest with their name
-/proc/getpois(mobs_only = FALSE, skip_mindless = FALSE, specify_dead_role = TRUE, only_realname = FALSE)
+/proc/getpois(mobs_only = FALSE, skip_mindless = FALSE, specify_dead_role = TRUE)
 	var/list/mobs = sortmobs()
 	var/list/namecounts = list()
 	var/list/pois = list()
@@ -305,11 +305,7 @@ Turf and target are separate in case you want to teleport some distance from a t
 				continue
 		if(M.client && M.client.holder && M.client.holder.fakekey) //stealthmins
 			continue
-		var/name = ""
-		if(only_realname)
-			name = avoid_assoc_duplicate_keys(M.real_name, namecounts)
-		else
-			name = avoid_assoc_duplicate_keys(M.name, namecounts) + M.get_realname_string()
+		var/name = avoid_assoc_duplicate_keys(M.name, namecounts) + M.get_realname_string()
 
 		if(M.stat == DEAD && specify_dead_role)
 			if(isobserver(M))
@@ -325,7 +321,6 @@ Turf and target are separate in case you want to teleport some distance from a t
 			pois[avoid_assoc_duplicate_keys(A.name, namecounts)] = A
 
 	return pois
-
 //Orders mobs by type then by name
 /proc/sortmobs()
 	var/list/moblist = list()

diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
@@ -495,6 +495,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 
 	if(isobserver(usr)) //Make sure they're an observer!
 
+
 		var/list/dest = list() //List of possible destinations (mobs)
 		var/target = null	   //Chosen target.
 

diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
@@ -57,7 +57,7 @@
 	var/list/misc = list()
 	var/list/npcs = list()
 
-	var/list/pois = getpois(skip_mindless = TRUE, specify_dead_role = FALSE, only_realname = TRUE)
+	var/list/pois = getpois(skip_mindless = TRUE, specify_dead_role = FALSE)
 	for (var/name in pois)
 		var/list/serialized = list()
 		serialized["name"] = name
@@ -67,8 +67,6 @@
 		serialized["ref"] = REF(poi)
 
 		var/mob/M = poi
-
-		serialized["fake_name"] = M.name
 		if (istype(M))
 			if (isobserver(M))
 				ghosts += list(serialized)

diff --git a/tgui/packages/tgui/interfaces/Orbit.js b/tgui/packages/tgui/interfaces/Orbit.js
@@ -54,7 +54,6 @@ const BasicSection = (props, context) => {
         {things.map((thing) => (
           <Button
             key={thing.name}
-            tooltip={thing.fake_name}
             content={thing.name}
             onClick={() =>
               act('orbit', {
@@ -75,7 +74,6 @@ const OrbitedButton = (props, context) => {
   return (
     <Button
       color={color}
-      tooltip={thing.fake_name}
       onClick={() =>
         act('orbit', {
           ref: thing.ref,