From 3126eaf97ce51cf4e1c28c1ec7a3fd1f4cce6dae Mon Sep 17 00:00:00 2001 From: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Date: Fri, 3 May 2024 17:58:36 +0100 Subject: [PATCH] Makes the Supermatter Announcements More Noticeable. (#25191) * The SM is LOUD! * Whoops. * Hallucination * Update code/modules/power/engines/supermatter/supermatter.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> --------- Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --- .../hallucinations/effects/moderate.dm | 2 +- .../power/engines/supermatter/supermatter.dm | 20 +++++++++---------- .../engines/supermatter/supermatter_event.dm | 14 ++++++------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/code/modules/hallucinations/effects/moderate.dm b/code/modules/hallucinations/effects/moderate.dm index 9e197e3ed68..b381a82d4a4 100644 --- a/code/modules/hallucinations/effects/moderate.dm +++ b/code/modules/hallucinations/effects/moderate.dm @@ -234,7 +234,7 @@ /obj/effect/hallucination/delamination_alarm/Initialize(mapload, mob/living/carbon/target) . = ..() target.playsound_local(target, 'sound/machines/engine_alert2.ogg', 25, FALSE, 30, 30) - target.hear_radio(message_to_multilingual("Danger! Crystal hyperstructure integrity faltering! Integrity: [rand(30, 50)]%"), vname = "supermatter crystal", part_a = "\[[get_frequency_name(PUB_FREQ)]\] ", part_b = " ") + target.hear_radio(message_to_multilingual("Danger! Crystal hyperstructure integrity faltering! Integrity: [rand(30, 50)]%"), vname = "supermatter crystal", part_a = "\[[get_frequency_name(PUB_FREQ)]\] ", part_b = " ") /** * # Hallucination - Plasma Flood diff --git a/code/modules/power/engines/supermatter/supermatter.dm b/code/modules/power/engines/supermatter/supermatter.dm index 3fc0b2826da..97b41d4c8ed 100644 --- a/code/modules/power/engines/supermatter/supermatter.dm +++ b/code/modules/power/engines/supermatter/supermatter.dm @@ -323,7 +323,7 @@ var/image/causality_field = image(icon, null, "causality_field") add_overlay(causality_field) - var/speaking = "[emergency_alert] The supermatter has reached critical integrity failure. Emergency causality destabilization field has been activated." + var/speaking = "[emergency_alert] The supermatter has reached critical integrity failure. Emergency causality destabilization field has been activated." for(var/mob/M in GLOB.player_list) // for all players var/turf/T = get_turf(M) if(istype(T) && atoms_share_level(T, src)) // if the player is on the same zlevel as the SM shared @@ -336,7 +336,7 @@ damage = explosion_point - 1 // One point below exploding, so it will re-start the countdown once unfrozen return if(damage < explosion_point) // Cutting it a bit close there engineers - radio.autosay("[safe_alert] Failsafe has been disengaged.", name, null) + radio.autosay("[safe_alert] Failsafe has been disengaged.", name, null) cut_overlay(causality_field, TRUE) final_countdown = FALSE remove_filter(list("outline", "icon")) @@ -345,9 +345,9 @@ sleep(10) continue else if(i > 50) - speaking = "[DisplayTimeText(i, TRUE)] remain before causality stabilization." + speaking = "[DisplayTimeText(i, TRUE)] remain before causality stabilization." else - speaking = "[i*0.1]..." + speaking = "[i * 0.1]..." radio.autosay(speaking, name, null) sleep(10) @@ -648,27 +648,27 @@ //Oh shit it's bad, time to freak out if(damage > emergency_point) - radio.autosay("[emergency_alert] Integrity: [get_integrity()]%", name, null) + radio.autosay("[emergency_alert] Integrity: [get_integrity()]%", name, null) lastwarning = REALTIMEOFDAY if(!has_reached_emergency) investigate_log("has reached the emergency point for the first time.", "supermatter") message_admins("[src] has reached the emergency point [ADMIN_JMP(src)].") has_reached_emergency = TRUE else if(damage >= damage_archived) // The damage is still going up - radio.autosay("[warning_alert] Integrity: [get_integrity()]%", name, "Engineering") + radio.autosay("[warning_alert] Integrity: [get_integrity()]%", name, "Engineering") lastwarning = REALTIMEOFDAY - (WARNING_DELAY * 5) else // Phew, we're safe - radio.autosay("[safe_alert] Integrity: [get_integrity()]%", name, "Engineering") + radio.autosay("[safe_alert] Integrity: [get_integrity()]%", name, "Engineering") lastwarning = REALTIMEOFDAY if(power > POWER_PENALTY_THRESHOLD) - radio.autosay("Warning: Hyperstructure has reached dangerous power level.", name, "Engineering") + radio.autosay("Warning: Hyperstructure has reached dangerous power level.", name, "Engineering") if(powerloss_inhibitor < 0.5) - radio.autosay("DANGER: CHARGE INERTIA CHAIN REACTION IN PROGRESS.", name, "Engineering") + radio.autosay("DANGER: CHARGE INERTIA CHAIN REACTION IN PROGRESS.", name, "Engineering") if(combined_gas > MOLE_CRUNCH_THRESHOLD) - radio.autosay("Warning: Critical coolant mass reached.", name, "Engineering") + radio.autosay("Warning: Critical coolant mass reached.", name, "Engineering") //Boom (Mind blown) if(damage > explosion_point) countdown() diff --git a/code/modules/power/engines/supermatter/supermatter_event.dm b/code/modules/power/engines/supermatter/supermatter_event.dm index 8af8c5ef9b3..1d7bae80edc 100644 --- a/code/modules/power/engines/supermatter/supermatter_event.dm +++ b/code/modules/power/engines/supermatter/supermatter_event.dm @@ -33,7 +33,7 @@ return /datum/supermatter_event/proc/on_end() - sm_radio_say("Anomalous crystal activity has ended.") + sm_radio_say("Anomalous crystal activity has ended.") supermatter.heat_penalty_threshold = SUPERMATTER_HEAT_PENALTY_THRESHOLD supermatter.gas_multiplier = 1 supermatter.power_additive = 0 @@ -120,7 +120,7 @@ duration = 1 MINUTES /datum/supermatter_event/bravo_tier/alert_engi() - sm_radio_say("Anomalous crystal activity detected! Activity class: [name]. Operator intervention is required!") + sm_radio_say("Anomalous crystal activity detected! Activity class: [name]. Operator intervention is required!") // more gas @@ -150,7 +150,7 @@ duration = 10 SECONDS /datum/supermatter_event/alpha_tier/alert_engi() - sm_radio_say("ALERT: Critical anomalous crystal activity detected! Activity class: [name]. IMMEDIATE Operator intervention is REQUIRED!") + sm_radio_say("ALERT: Critical anomalous crystal activity detected! Activity class: [name]. IMMEDIATE Operator intervention is REQUIRED!") /datum/supermatter_event/alpha_tier/apc_short name = "A-1" @@ -181,16 +181,16 @@ duration = 7 MINUTES // 2 MINUTES of s-tier anomaly /datum/supermatter_event/sierra_tier/alert_engi() - general_radio_say("ALERT: Anomalous supermatter state expected in: 5 minutes.") - sm_radio_say("EMERGENCY ALERT: 5 MINUTES UNTIL [supermatter] EXHIBITS [name] CLASS ANOMALOUS ACTIVITY!") + general_radio_say("ALERT: Anomalous supermatter state expected in: 5 minutes.") + sm_radio_say("EMERGENCY ALERT: 5 MINUTES UNTIL [supermatter] EXHIBITS [name] CLASS ANOMALOUS ACTIVITY!") /datum/supermatter_event/sierra_tier/on_start() addtimer(CALLBACK(src, PROC_REF(start_sierra_event)), 5 MINUTES) supermatter.has_run_sclass = TRUE /datum/supermatter_event/sierra_tier/proc/start_sierra_event() - general_radio_say("ALERT: ANOMALOUS SUPERMATTER STATE DETECTED!") - sm_radio_say("EMERGENCY ALERT: Class [name] anomalous behavior in progress!") + general_radio_say("ALERT: ANOMALOUS SUPERMATTER STATE DETECTED!") + sm_radio_say("EMERGENCY ALERT: Class [name] anomalous behavior in progress!") //S class events //Arc-type