From d5869f2c3feb53813506b1593a4a6b37d0eaa64f Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sat, 25 Jan 2020 19:25:04 -0800 Subject: [PATCH 1/2] Add an audible alarm sound to SM Delamination --- code/modules/power/supermatter/supermatter.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 9e1f3f06c2..43185c339c 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -171,7 +171,11 @@ /obj/machinery/power/supermatter/proc/announce_warning() var/integrity = get_integrity() var/alert_msg = " Integrity at [integrity]%" +<<<<<<< HEAD var/message_sound = 'sound/ambience/matteralarm.ogg' // VOREStation Edit - Rykka adds SM Delam alarm +======= + var/message_sound = 'sound/ambience/matteralarm.ogg' +>>>>>>> 09a8cde... Merge pull request #6603 from Rykka-Stormheart/shep-dev-sm-delam-alarm if(damage > emergency_point) alert_msg = emergency_alert + alert_msg @@ -192,10 +196,16 @@ //Public alerts if((damage > emergency_point) && !public_alert) global_announcer.autosay("WARNING: SUPERMATTER CRYSTAL DELAMINATION IMMINENT!", "Supermatter Monitor") +<<<<<<< HEAD for(var/mob/M in player_list) // VOREStation Edit - Rykka adds SM Delam alarm if(!istype(M,/mob/new_player) && !isdeaf(M)) // VOREStation Edit - Rykka adds SM Delam alarm M << message_sound // VOREStation Edit - Rykka adds SM Delam alarm admin_chat_message(message = "SUPERMATTER DELAMINATING!", color = "#FF2222") //VOREStation Add +======= + for(var/mob/M in player_list) // Rykka adds SM Delam alarm + if(!istype(M,/mob/new_player) && !isdeaf(M)) // Rykka adds SM Delam alarm + M << message_sound // Rykka adds SM Delam alarm +>>>>>>> 09a8cde... Merge pull request #6603 from Rykka-Stormheart/shep-dev-sm-delam-alarm public_alert = 1 log_game("SUPERMATTER([x],[y],[z]) Emergency PUBLIC announcement. Power:[power], Oxygen:[oxygen], Damage:[damage], Integrity:[get_integrity()]") else if(safe_warned && public_alert) From 2366e865f3d73ffa92ea16637d97c1691d10a73b Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sat, 25 Jan 2020 22:56:18 -0500 Subject: [PATCH 2/2] Update supermatter.dm --- code/modules/power/supermatter/supermatter.dm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 43185c339c..8430b717ca 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -171,11 +171,7 @@ /obj/machinery/power/supermatter/proc/announce_warning() var/integrity = get_integrity() var/alert_msg = " Integrity at [integrity]%" -<<<<<<< HEAD - var/message_sound = 'sound/ambience/matteralarm.ogg' // VOREStation Edit - Rykka adds SM Delam alarm -======= var/message_sound = 'sound/ambience/matteralarm.ogg' ->>>>>>> 09a8cde... Merge pull request #6603 from Rykka-Stormheart/shep-dev-sm-delam-alarm if(damage > emergency_point) alert_msg = emergency_alert + alert_msg @@ -196,16 +192,10 @@ //Public alerts if((damage > emergency_point) && !public_alert) global_announcer.autosay("WARNING: SUPERMATTER CRYSTAL DELAMINATION IMMINENT!", "Supermatter Monitor") -<<<<<<< HEAD - for(var/mob/M in player_list) // VOREStation Edit - Rykka adds SM Delam alarm - if(!istype(M,/mob/new_player) && !isdeaf(M)) // VOREStation Edit - Rykka adds SM Delam alarm - M << message_sound // VOREStation Edit - Rykka adds SM Delam alarm - admin_chat_message(message = "SUPERMATTER DELAMINATING!", color = "#FF2222") //VOREStation Add -======= for(var/mob/M in player_list) // Rykka adds SM Delam alarm if(!istype(M,/mob/new_player) && !isdeaf(M)) // Rykka adds SM Delam alarm M << message_sound // Rykka adds SM Delam alarm ->>>>>>> 09a8cde... Merge pull request #6603 from Rykka-Stormheart/shep-dev-sm-delam-alarm + admin_chat_message(message = "SUPERMATTER DELAMINATING!", color = "#FF2222") //VOREStation Add public_alert = 1 log_game("SUPERMATTER([x],[y],[z]) Emergency PUBLIC announcement. Power:[power], Oxygen:[oxygen], Damage:[damage], Integrity:[get_integrity()]") else if(safe_warned && public_alert)