boop

cmss13-devs · Aug 13, 2023 · 2e60aed · 2e60aed
1 parent d322bb4
commit 2e60aed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm
@@ -95,6 +95,7 @@
 	return data
 
 /obj/structure/machinery/computer/overwatch/tgui_interact(mob/user, datum/tgui/ui)
+	user.set_interaction(src)
 	if(!tacmap.map_holder)
 		var/level = SSmapping.levels_by_trait(tacmap.targeted_ztrait)
 		if(!level[1])
@@ -325,6 +326,7 @@
 
 	var/mob/user = usr
 
+	user.set_interaction(src)
 	switch(action)
 		if("pick_squad")
 			if(current_squad)

diff --git a/tgui/packages/tgui/interfaces/OverwatchConsole.js b/tgui/packages/tgui/interfaces/OverwatchConsole.js
@@ -445,7 +445,7 @@ const SquadMonitor = (props, context) => {
         </Table.Row>
         {squad_leader && (
           <Table.Row key="index" bold>
-            <Table.Cell p="2px">
+            <Table.Cell collapsing p="2px">
               {(squad_leader.has_helmet && (
                 <Button
                   onClick={() =>
@@ -493,7 +493,7 @@ const SquadMonitor = (props, context) => {
 
               return (
                 <Table.Row key="index">
-                  <Table.Cell p="2px">
+                  <Table.Cell collapsing p="2px">
                     {(marine.has_helmet && (
                       <Button
                         onClick={() =>