Overwatch console changes

cmss13-devs · Oct 19, 2023 · 76d6ded · 76d6ded
1 parent 51520bc
commit 76d6ded
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 18 deletions.
diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm
@@ -315,8 +315,13 @@
 	data["can_launch_crates"] = has_supply_pad
 	data["has_crate_loaded"] = supply_crate
 	data["supply_cooldown"] = COOLDOWN_TIMELEFT(current_squad, next_supplydrop)
-	data["ob_cooldown"] = COOLDOWN_TIMELEFT(almayer_orbital_cannon, ob_firing_cooldown)
-	data["ob_loaded"] = almayer_orbital_cannon.chambered_tray
+
+	data["can_launch_bombardments"] = FALSE
+
+	if(almayer_orbital_cannon)
+		data["ob_cooldown"] = COOLDOWN_TIMELEFT(almayer_orbital_cannon, ob_firing_cooldown)
+		data["ob_loaded"] = almayer_orbital_cannon.chambered_tray
+		data["can_launch_bombardments"] = TRUE
 
 	data["operator"] = operator.name
 

diff --git a/tgui/packages/tgui/interfaces/OverwatchConsole.js b/tgui/packages/tgui/interfaces/OverwatchConsole.js
@@ -88,19 +88,20 @@ const SquadPanel = (props, context) => {
             Supply Drop
           </Tabs.Tab>
         )}
-        <Tabs.Tab
-          selected={category === 'ob'}
-          icon="bomb"
-          onClick={() => setCategory('ob')}>
-          Orbital Bombardment
-        </Tabs.Tab>
-        <Tabs.Tab icon="map" onClick={() => act('tacmap_unpin')}>
-          Tactical Map
-        </Tabs.Tab>
+        {!!data.can_launch_bombardments && (
+          <Tabs.Tab
+            selected={category === 'ob'}
+            icon="bomb"
+            onClick={() => setCategory('ob')}>
+            Orbital Bombardment
+          </Tabs.Tab>
+        )}
       </Tabs>
       {category === 'monitor' && <SquadMonitor />}
       {category === 'supply' && data.can_launch_crates && <SupplyDrop />}
-      {category === 'ob' && <OrbitalBombardment />}
+      {category === 'ob' && data.can_launch_bombardments && (
+        <OrbitalBombardment />
+      )}
     </>
   );
 };
@@ -218,10 +219,10 @@ const RoleTable = (props, context) => {
     <Table m="1px" fontSize="12px" bold>
       <Table.Row>
         <Table.Cell textAlign="center" p="4px">
-          Squad Leader
+          Platoon Sergeant
         </Table.Cell>
         <Table.Cell collapsing p="4px">
-          Fire Team Leaders
+          Squad Sergeants
         </Table.Cell>
         <Table.Cell collapsing p="4px">
           Specialist
@@ -230,7 +231,7 @@ const RoleTable = (props, context) => {
           Smartgunner
         </Table.Cell>
         <Table.Cell collapsing p="4px">
-          Hospital Corpsmen
+          Platoon Corpsmen
         </Table.Cell>
         <Table.Cell collapsing p="4px">
           Combat Technicians
@@ -296,11 +297,11 @@ const SquadMonitor = (props, context) => {
     a = a.role;
     b = b.role;
     const roleValues = {
-      'Squad Leader': 10,
-      'Fireteam Leader': 9,
+      'Platoon Sergeant': 10,
+      'Squad Sergeant': 9,
       'Weapons Specialist': 8,
       'Smartgunner': 7,
-      'Hospital Corpsman': 6,
+      'Platoon Corpsman': 6,
       'Combat Technician': 5,
       'Rifleman': 4,
     };