From b3c3cf75373451f8a1a95c0ca475ad04a1311dfb Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 10 Jul 2017 08:45:06 -0500 Subject: [PATCH] Switches SM squawk to report integrity (#1956) --- code/modules/power/supermatter/supermatter.dm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index fb45ab6f36..6dfd2cb276 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -73,9 +73,9 @@ var/damage = 0 var/damage_archived = 0 - var/safe_alert = "Crystalline hyperstructure returning to safe operating levels." + var/safe_alert = "Crystalline hyperstructure returning to safe operating parameters." var/warning_point = 50 - var/warning_alert = "Danger! Crystal hyperstructure instability!" + var/warning_alert = "Danger! Crystal hyperstructure integrity faltering!" var/damage_penalty_point = 550 var/emergency_point = 700 var/emergency_alert = "CRYSTAL DELAMINATION IMMINENT." @@ -393,21 +393,20 @@ if(damage > warning_point) // while the core is still damaged and it's still worth noting its status if((REALTIMEOFDAY - lastwarning) / 10 >= WARNING_DELAY) alarm() - var/stability = num2text(round((damage / explosion_point) * 100)) if(damage > emergency_point) - radio.talk_into(src, "[emergency_alert] Instability: [stability]%", common_channel, get_spans(), get_default_language()) + radio.talk_into(src, "[emergency_alert] Integrity: [get_integrity()]%", common_channel, get_spans(), get_default_language()) lastwarning = REALTIMEOFDAY if(!has_reached_emergency) investigate_log("has reached the emergency point for the first time.", INVESTIGATE_SUPERMATTER) message_admins("[src] has reached the emergency point [ADMIN_JMP(src)].") has_reached_emergency = 1 else if(damage >= damage_archived) // The damage is still going up - radio.talk_into(src, "[warning_alert] Instability: [stability]%", engineering_channel, get_spans(), get_default_language()) + radio.talk_into(src, "[warning_alert] Integrity: [get_integrity()]%", engineering_channel, get_spans(), get_default_language()) lastwarning = REALTIMEOFDAY - (WARNING_DELAY * 5) else // Phew, we're safe - radio.talk_into(src, "[safe_alert] Instability: [stability]%", engineering_channel, get_spans(), get_default_language()) + radio.talk_into(src, "[safe_alert] Integrity: [get_integrity()]%", engineering_channel, get_spans(), get_default_language()) lastwarning = REALTIMEOFDAY if(power > POWER_PENALTY_THRESHOLD)