MinorCommit

cmss13-devs · Sep 29, 2023 · f7a65bc · f7a65bc
1 parent 919b1c9
commit f7a65bc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/code/modules/cm_marines/radar.dm b/code/modules/cm_marines/radar.dm
@@ -204,17 +204,20 @@
 		if(!trackable(humanoid))
 			continue
 		var/crewmember_name = "Unknown"
+		var/crewmember_rank = "Unknown"
 		if(humanoid.wear_id)
 			var/obj/item/card/id/ID = humanoid.wear_id.GetID()
 			if(ID?.registered_name)
 				crewmember_name = ID.registered_name
+			if(ID?.assignment)
+				crewmember_rank = ID.assignment
 		switch(humanoid.stat)
 			if(CONSCIOUS)
-				crewmember_name = "[crewmember_name] (Conscious)"
+				crewmember_name = "[crewmember_name] ([crewmember_rank]) (Conscious)"
 			if(UNCONSCIOUS)
-				crewmember_name = "[crewmember_name] (Unconscious)"
+				crewmember_name = "[crewmember_name] ([crewmember_rank]) (Unconscious)"
 			if(DEAD)
-				crewmember_name = "[crewmember_name] (DEAD)"
+				crewmember_name = "[crewmember_name] ([crewmember_rank]) (DEAD)"
 		var/list/crewinfo = list(
 			ref = REF(humanoid),
 			name = crewmember_name,

diff --git a/tgui/packages/tgui/interfaces/Radar.tsx b/tgui/packages/tgui/interfaces/Radar.tsx
@@ -29,7 +29,7 @@ type Target = {
 
 export const Radar = (props, context) => {
   return (
-    <Window width={800} height={600} theme="ntos">
+    <Window width={965} height={600} theme="ntos">
       <Window.Content scrollable>
         <RadarContent />
       </Window.Content>
@@ -40,7 +40,7 @@ export const Radar = (props, context) => {
 export const RadarContent = (props, context) => {
   return (
     <Stack fill>
-      <Stack.Item position="relative" width={20.5}>
+      <Stack.Item position="relative" width={35}>
         <ObjectDisplay />
       </Stack.Item>
       <Stack.Item