diff --git a/code/modules/events/jellyfish_migration.dm b/code/modules/events/jellyfish_migration.dm index 48b6bd9966..3a1c45e8a8 100644 --- a/code/modules/events/jellyfish_migration.dm +++ b/code/modules/events/jellyfish_migration.dm @@ -20,7 +20,7 @@ announcement = "Massive migration of unknown biological entities has been detected near [location_name()], please stand-by." else announcement = "Unknown biological [spawned_jellyfish.len == 1 ? "entity has" : "entities have"] been detected near [location_name()], please stand-by." - GLOB.command_announcement.Announce(announcement, "Lifesign Alert") + GLOB.command_announcement.Announce(announcement, "Lifesign Alert", new_sound = ANNOUNCER_MSG_UNIDENTIFIED_LIFESIGNS) /datum/event/jellyfish_migration/tick() if(activeFor % 5 != 0) diff --git a/code/modules/events/spider_migration_yw.dm b/code/modules/events/spider_migration_yw.dm index ac93f026d3..28a4a58527 100644 --- a/code/modules/events/spider_migration_yw.dm +++ b/code/modules/events/spider_migration_yw.dm @@ -14,7 +14,7 @@ announcement = "Massive migration of unknown biological entities has been detected near [station_name()], please stand-by." //CHOMPStation Edit: Restore original message. else announcement = "Unknown biological [spawned_spider.len == 1 ? "entity has" : "entities have"] been detected near [station_name()], please stand-by." //CHOMPStation Edit: Restore original message. - GLOB.command_announcement.Announce(announcement, "Lifesign Alert") + GLOB.command_announcement.Announce(announcement, "Lifesign Alert", new_sound = ANNOUNCER_MSG_UNIDENTIFIED_LIFESIGNS) /datum/event/spider_migration/start() if(severity == EVENT_LEVEL_MAJOR) diff --git a/modular_chomp/code/modules/event/horde_infestation.dm b/modular_chomp/code/modules/event/horde_infestation.dm index 0580cd5dc5..4aef45a30a 100644 --- a/modular_chomp/code/modules/event/horde_infestation.dm +++ b/modular_chomp/code/modules/event/horde_infestation.dm @@ -33,7 +33,7 @@ /datum/event/horde_infestation/announce() if(spiders) //Horrible way of doing this - GLOB.command_announcement.Announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg') + GLOB.command_announcement.Announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", new_sound = ANNOUNCER_MSG_UNIDENTIFIED_LIFESIGNS) if(metroids) //Horrible way of doing this GLOB.command_announcement.Announce("High-energy lifeforms detected coming aboard [station_name()]. All crew members, stay alert, and listen to security instructions.", "Lifesign Alert", new_sound = 'sound/misc/alarm1.ogg') @@ -95,4 +95,4 @@ area_names |= metroid_area.name if(area_names.len) var/english_list = english_list(area_names) - GLOB.command_announcement.Announce("Sensors have narrowed down remaining lifeforms to the following areas: [english_list]", "Lifesign Alert") + GLOB.command_announcement.Announce("Sensors have narrowed down remaining lifeforms to the following areas: [english_list]", "Lifesign Alert") //No sound intentionally. diff --git a/modular_chomp/code/modules/event/metroid_infestation.dm b/modular_chomp/code/modules/event/metroid_infestation.dm index 0f89e26062..82451fa9f4 100644 --- a/modular_chomp/code/modules/event/metroid_infestation.dm +++ b/modular_chomp/code/modules/event/metroid_infestation.dm @@ -14,12 +14,12 @@ spawncount = rand(2 * severity, 4 * severity) for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in GLOB.machines) - //CHOMPEdit: Added a couple areas to the exclusion. Also made this actually work. + //Added a couple areas to the exclusion. Also made this actually work. var/area/in_area = get_area(temp_vent) if(in_area.flag_check(AREA_FORBID_EVENTS)) continue if(!temp_vent.welded && temp_vent.network && (temp_vent.loc.z in using_map.station_levels)) - if(temp_vent.network.normal_members.len > 10) //CHOMP Edit: Most our networks are 40. SM is 4 and toxins is 2. This needed to change in order to spawn. + if(temp_vent.network.normal_members.len > 10) //Most our networks are 40. SM is 4 and toxins is 2. This needed to change in order to spawn. vents += temp_vent /datum/event/metroid_infestation/announce() @@ -55,4 +55,4 @@ area_names |= metroid_area.name if(area_names.len && active_metroid_event == TRUE) var/english_list = english_list(area_names) - GLOB.command_announcement.Announce("Sensors have narrowed down remaining lifeforms to the following areas: [english_list]", "Lifesign Alert") + GLOB.command_announcement.Announce("Sensors have narrowed down remaining lifeforms to the following areas: [english_list]", "Lifesign Alert") //No sound intentionally.