Commended fixes 2x

cmss13-devs · Aug 1, 2024 · 0b1beae · 0b1beae
1 parent c0356ce
commit 0b1beae
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/code/modules/cm_marines/altitude_control_console.dm b/code/modules/cm_marines/altitude_control_console.dm
@@ -76,6 +76,7 @@ GLOBAL_VAR_INIT(ship_alt, SHIP_ALT_MED)
 	if(GLOB.ship_alt == SHIP_ALT_HIGH && GLOB.ship_temp == 0)
 		ai_silent_announcement("Attention: Engine cooloff completed, automatic stabilization to most optimal geo-synchronous orbit undergoing.", ";", TRUE)
 		GLOB.ship_alt = SHIP_ALT_MED
+		TIMER_COOLDOWN_START(src, COOLDOWN_ALTITUDE_CHANGE, 20 SECONDS)
 		for(var/mob/living/carbon/current_mob in GLOB.living_mob_list)
 			if(!is_mainship_level(current_mob.z))
 				continue
@@ -85,6 +86,7 @@ GLOBAL_VAR_INIT(ship_alt, SHIP_ALT_MED)
 	if(GLOB.ship_alt == SHIP_ALT_LOW && GLOB.ship_temp >= OVERHEAT)
 		ai_silent_announcement("Attention: Low altitude orbital maneuver no longer sustainable, moving to furthest geo-synchronous orbit until engine cooloff.", ";", TRUE)
 		GLOB.ship_alt = SHIP_ALT_HIGH
+		TIMER_COOLDOWN_START(src, COOLDOWN_ALTITUDE_CHANGE, 20 SECONDS)
 		for(var/mob/living/carbon/current_mob in GLOB.living_mob_list)
 			if(!is_mainship_level(current_mob.z))
 				continue
@@ -147,7 +149,7 @@ GLOBAL_VAR_INIT(ship_alt, SHIP_ALT_MED)
 	if(GLOB.ship_alt == new_altitude)
 		return
 	GLOB.ship_alt = new_altitude
-	TIMER_COOLDOWN_START(src, COOLDOWN_ALTITUDE_CHANGE, 60 SECONDS)
+	TIMER_COOLDOWN_START(src, COOLDOWN_ALTITUDE_CHANGE, 40 SECONDS)
 	for(var/mob/living/carbon/current_mob in GLOB.living_mob_list)
 		if(!is_mainship_level(current_mob.z))
 			continue

diff --git a/tgui/packages/tgui/interfaces/AltitudeControlConsole.jsx b/tgui/packages/tgui/interfaces/AltitudeControlConsole.jsx
@@ -69,11 +69,13 @@ export const AltitudeControlConsole = () => {
             </Button>
           }
         </Section>
-        <Section title="System Operational Warning">
-          <Box textAlign="center" fontSize="20px">
-            The Ship will always be set according to the disabled option, if
-            none of the two options available to you are disabled, that means
-            the ship is on high altitude
+        <Section title="System Operational Warnings">
+          <Box fontSize="20px">
+            1. Automatic changes have a cooldown of 20 seconds.
+            <br />
+            2. Manual changes have a cooldown of 40 seconds.
+            <br />
+            3. In average, it takes 3 minutes for the engines to 100% overheat.
           </Box>
         </Section>
       </Window.Content>