diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm
index c5b296772c79..9c7c252a32c8 100644
--- a/code/modules/cm_marines/overwatch.dm
+++ b/code/modules/cm_marines/overwatch.dm
@@ -317,10 +317,12 @@
has_supply_pad = TRUE
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(GLOB.almayer_orbital_cannon, ob_firing_cooldown)
- data["ob_loaded"] = GLOB.almayer_orbital_cannon.chambered_tray
+ data["can_launch_obs"] = GLOB.almayer_orbital_cannon
+ if(GLOB.almayer_orbital_cannon)
+ data["ob_cooldown"] = COOLDOWN_TIMELEFT(GLOB.almayer_orbital_cannon, ob_firing_cooldown)
+ data["ob_loaded"] = GLOB.almayer_orbital_cannon.chambered_tray
+ data["supply_cooldown"] = COOLDOWN_TIMELEFT(current_squad, next_supplydrop)
data["operator"] = operator.name
return data
diff --git a/tgui/packages/tgui/interfaces/OverwatchConsole.jsx b/tgui/packages/tgui/interfaces/OverwatchConsole.jsx
index 1805f231fb16..3d7a30df2c46 100644
--- a/tgui/packages/tgui/interfaces/OverwatchConsole.jsx
+++ b/tgui/packages/tgui/interfaces/OverwatchConsole.jsx
@@ -87,19 +87,21 @@ const SquadPanel = (props, context) => {
Supply Drop
)}
- setCategory('ob')}>
- Orbital Bombardment
-
+ {!!data.can_launch_obs && (
+ setCategory('ob')}>
+ Orbital Bombardment
+
+ )}
act('tacmap_unpin')}>
Tactical Map
{category === 'monitor' && }
{category === 'supply' && data.can_launch_crates && }
- {category === 'ob' && }
+ {category === 'ob' && data.can_launch_obs && }
>
);
};