çiñkis eder cani cok

cmss13-devs · Aug 1, 2023 · ae2f0f5 · ae2f0f5
1 parent 3d54b36
commit ae2f0f5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/code/game/machinery/computer/almayer_control.dm b/code/game/machinery/computer/almayer_control.dm
@@ -136,12 +136,7 @@
 				to_chat(usr, SPAN_WARNING("You are unable to cancel the evacuation right now!"))
 				return FALSE
 
-			spawn(35)//some time between AI announcements for evac cancel and SD cancel.
-				if(EvacuationAuthority.evac_status == EVACUATION_STATUS_STANDING_BY)//nothing changed during the wait
-					//if the self_destruct is active we try to cancel it (which includes lowering alert level to red)
-					if(!EvacuationAuthority.cancel_self_destruct(1))
-						//if SD wasn't active (likely canceled manually in the SD room), then we lower the alert level manually.
-						set_security_level(SEC_LEVEL_RED, TRUE) //both SD and evac are inactive, lowering the security level.
+			addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/structure/machinery/computer/almayer_control, cancel_evac)), 4 SECONDS)
 
 			log_game("[key_name(usr)] has canceled the emergency evacuation.")
 			message_admins("[key_name_admin(usr)] has canceled the emergency evacuation.")
@@ -282,3 +277,9 @@
 
 // end tgui \\
 
+/obj/structure/machinery/computer/almayer_control/proc/cancel_evac()
+	if(EvacuationAuthority.evac_status == EVACUATION_STATUS_STANDING_BY)//nothing changed during the wait
+		//if the self_destruct is active we try to cancel it (which includes lowering alert level to red)
+		if(!EvacuationAuthority.cancel_self_destruct(1))
+			//if SD wasn't active (likely canceled manually in the SD room), then we lower the alert level manually.
+			set_security_level(SEC_LEVEL_RED, TRUE) //both SD and evac are inactive, lowering the security level.
diff --git a/tgui/packages/tgui/interfaces/AlmayerControl.js b/tgui/packages/tgui/interfaces/AlmayerControl.js
@@ -34,7 +34,7 @@ export const AlmayerControl = (_props, context) => {
     destruct_reason = 'Ship is not under an active emergency.';
   } else if (data.time_request < worldTime) {
     distress_reason =
-      'Beacon is currently on cooldown. Time remaining: ' +
+      'Beacon is currently recharging. Time remaining: ' +
       Math.ceil((data.time_message - worldTime) / 10) +
       'secs.';
   } else if (data.time_destruct < worldTime) {
@@ -84,7 +84,7 @@ export const AlmayerControl = (_props, context) => {
             <Flex.Item>
               {!canMessage && (
                 <Button color="bad" warning={1} fluid={1} icon="ban">
-                  Shipwide announcement on cooldown :{' '}
+                  Shipwide announcement recharging:{' '}
                   {Math.ceil((data.time_message - worldTime) / 10)} secs
                 </Button>
               )}
@@ -102,7 +102,7 @@ export const AlmayerControl = (_props, context) => {
             <Flex.Item>
               {!canCentral && (
                 <Button color="bad" warning={1} fluid={1} icon="ban">
-                  High Command message on cooldown :{' '}
+                  Quantum relay re-cycling :{' '}
                   {Math.ceil((data.time_message - worldTime) / 10)} secs
                 </Button>
               )}

diff --git a/tgui/packages/tgui/interfaces/CommandTablet.js b/tgui/packages/tgui/interfaces/CommandTablet.js
@@ -28,7 +28,7 @@ export const CommandTablet = (_props, context) => {
   } else if (AlertLevel !== 2) {
     distress_reason = 'Ship is not under an active emergency.';
   } else if (distressCooldown) {
-    distress_reason = 'Beacon is currently on cooldown.';
+    distress_reason = 'Beacon is currently recharging.';
   } else if (!minimumTimeElapsed) {
     distress_reason = "It's too early to launch a distress beacon.";
   }
@@ -41,7 +41,7 @@ export const CommandTablet = (_props, context) => {
             <Flex.Item>
               {!canAnnounce && (
                 <Button color="bad" warning={1} fluid={1} icon="ban">
-                  Announcement on cooldown :{' '}
+                  Announcement recharging:{' '}
                   {Math.ceil((data.endtime - data.worldtime) / 10)} secs
                 </Button>
               )}