From bb1494dfe39329ed3e0bbff167c98eec9c4f79d8 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Thu, 26 Mar 2020 11:55:40 -0400 Subject: [PATCH] Remove the 'has cleared the' announcement for ships --- code/modules/events/meteors.dm | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/code/modules/events/meteors.dm b/code/modules/events/meteors.dm index 18ff044a2dc..ebe9221e741 100644 --- a/code/modules/events/meteors.dm +++ b/code/modules/events/meteors.dm @@ -24,11 +24,12 @@ ..() /datum/event/meteor_wave/announce() - switch(severity) - if(EVENT_LEVEL_MAJOR) - command_announcement.Announce("Meteors have been detected on collision course with \the [location_name()].", "Meteor Alert", new_sound = 'sound/AI/meteors.ogg') - else - command_announcement.Announce("\The [location_name()] is now in a meteor shower.", "Meteor Alert") + if(!victim) + switch(severity) + if(EVENT_LEVEL_MAJOR) + command_announcement.Announce("Meteors have been detected on collision course with \the [location_name()].", "Meteor Alert", new_sound = 'sound/AI/meteors.ogg') + else + command_announcement.Announce("\The [location_name()] is now in a meteor shower.", "Meteor Alert") /datum/event/meteor_wave/tick() if(waves && activeFor >= next_meteor) @@ -50,11 +51,12 @@ /datum/event/meteor_wave/end() ..() - switch(severity) - if(EVENT_LEVEL_MAJOR) - command_announcement.Announce("\The [location_name()] has cleared the meteor storm.", "Meteor Alert") - else - command_announcement.Announce("\The [location_name()] has cleared the meteor shower", "Meteor Alert") + if(!victim) + switch(severity) + if(EVENT_LEVEL_MAJOR) + command_announcement.Announce("\The [location_name()] has cleared the meteor storm.", "Meteor Alert") + else + command_announcement.Announce("\The [location_name()] has cleared the meteor shower", "Meteor Alert") /datum/event/meteor_wave/proc/get_meteors() if(EVENT_LEVEL_MAJOR) @@ -71,9 +73,6 @@ next_meteor_upper = 10 next_meteor = 0 -/datum/event/meteor_wave/overmap/announce() - return - /datum/event/meteor_wave/overmap/tick() if(victim && !victim.is_still()) // Meteors mostly fly in your face start_side = prob(90) ? victim.fore_dir : pick(GLOB.cardinal)