diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 20873efa2d3..c6e8f91482a 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1670,10 +1670,11 @@ log_admin("[key_name(usr)] changed the bomb cap to [MAX_EX_DEVESTATION_RANGE], [MAX_EX_HEAVY_RANGE], [MAX_EX_LIGHT_RANGE]") if("wave") + var/should_announce = alert(usr, "Meteors will be spawned. Would you like to make an announcement?", "Message", "Yes", "No") == "Yes" feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","MW") message_admins("[key_name_admin(usr)] has spawned meteors") - E = new /datum/round_event/meteor_wave() + E = new /datum/round_event/meteor_wave(should_announce) if("gravanomalies") feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","GA") diff --git a/code/modules/events/meateor_wave.dm b/code/modules/events/meateor_wave.dm index b45140ad5ee..d66ef27596f 100644 --- a/code/modules/events/meateor_wave.dm +++ b/code/modules/events/meateor_wave.dm @@ -5,7 +5,8 @@ max_occurrences = 1 /datum/round_event/meteor_wave/meaty/announce() - priority_announce("Meaty ores have been detected on collision course with the station.", "Oh Crap, Get The Mop.",'sound/AI/meteors.ogg') + if(announce) + priority_announce("Meaty ores have been detected on collision course with the station.", "Oh Crap, Get The Mop.",'sound/AI/meteors.ogg') /datum/round_event/meteor_wave/meaty/tick() if(IsMultiple(activeFor, 3)) diff --git a/code/modules/events/meteor_wave.dm b/code/modules/events/meteor_wave.dm index e9e950f6c37..2063f369194 100644 --- a/code/modules/events/meteor_wave.dm +++ b/code/modules/events/meteor_wave.dm @@ -7,11 +7,17 @@ /datum/round_event/meteor_wave startWhen = 6 endWhen = 66 + var/announce = 1 + +/datum/round_event/meteor_wave/New(should_announce = 1) + ..() + announce = should_announce /datum/round_event/meteor_wave/announce() - priority_announce("Meteors have been detected on collision course with the station.", "Meteor Alert", 'sound/AI/meteors.ogg') + if(announce) + priority_announce("Meteors have been detected on collision course with the station.", "Meteor Alert", 'sound/AI/meteors.ogg') /datum/round_event/meteor_wave/tick() if(IsMultiple(activeFor, 3)) - spawn_meteors(5, meteorsA) //meteor list types defined in gamemode/meteor/meteors.dm + spawn_meteors(5, meteorsA) //meteor list types defined in gamemode/meteor/meteors.dm