From dbb271c5bbf3b3a89220b7147f2667a311cbfce2 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Tue, 21 Jan 2025 22:08:52 +0100
Subject: [PATCH] fix sm announce (#16939)

---
 code/modules/power/supermatter/supermatter.dm | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 777bc56fdea..1ea43130485 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -64,8 +64,8 @@
 	var/damage = 0
 	var/damage_archived = 0
 	var/safe_alert = "Crystaline hyperstructure returning to safe operating levels."
-	var/safe_warned = 0
-	var/public_alert = 0 //Stick to Engineering frequency except for big warnings when integrity bad
+	var/safe_warned = TRUE
+	var/public_alert = FALSE //Stick to Engineering frequency except for big warnings when integrity bad
 	var/warning_point = 100
 	var/warning_alert = "Danger! Crystal hyperstructure instability!"
 	var/emergency_point = 500
@@ -247,12 +247,13 @@
 	if(damage > emergency_point)
 		alert_msg = emergency_alert + alert_msg
 		lastwarning = world.timeofday - WARNING_DELAY * 4
+		safe_warned = FALSE
 	else if(damage >= damage_archived) // The damage is still going up
-		safe_warned = 0
+		safe_warned = FALSE
 		alert_msg = warning_alert + alert_msg
 		lastwarning = world.timeofday
 	else if(!safe_warned)
-		safe_warned = 1 // We are safe, warn only once
+		safe_warned = TRUE // We are safe, warn only once
 		alert_msg = safe_alert
 		lastwarning = world.timeofday
 	else
@@ -267,11 +268,11 @@
 				if(!isnewplayer(M) && !isdeaf(M)) // Rykka adds SM Delam alarm
 					M << message_sound // Rykka adds SM Delam alarm
 			admin_chat_message(message = "SUPERMATTER DELAMINATING!", color = "#FF2222") //VOREStation Add
-			public_alert = 1
+			public_alert = TRUE
 			log_game("SUPERMATTER([x],[y],[z]) Emergency PUBLIC announcement. Power:[power], Oxygen:[oxygen], Damage:[damage], Integrity:[get_integrity()]")
 		else if(safe_warned && public_alert)
 			global_announcer.autosay(alert_msg, "Supermatter Monitor")
-			public_alert = 0
+			public_alert = FALSE
 
 /obj/machinery/power/supermatter/process()
 
@@ -296,6 +297,10 @@
 			announce_warning()
 	else
 		shift_light(4,initial(light_color))
+
+	if(damage < warning_point && !safe_warned && (world.timeofday - lastwarning) >= WARNING_DELAY * 10) // In case our safe announcement was not sent, we send it latest now
+		announce_warning()
+
 	if(grav_pulling)
 		supermatter_pull(src)