diff --git a/code/game/gamemodes/miniantags/borer/borer_event.dm b/code/game/gamemodes/miniantags/borer/borer_event.dm index 012252773e7..d5bd7d65776 100644 --- a/code/game/gamemodes/miniantags/borer/borer_event.dm +++ b/code/game/gamemodes/miniantags/borer/borer_event.dm @@ -14,9 +14,7 @@ if(successSpawn) 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') else - var/text = "Warning: Could not spawn any mobs for event Borer Infestation" - message_admins(text) - log_adminwarn(text) + log_and_message_admins("Warning: Could not spawn any mobs for event Borer Infestation") /datum/event/borer_infestation/start() var/list/vents = get_valid_vent_spawns(exclude_mobs_nearby = TRUE, exclude_visible_by_mobs = TRUE) diff --git a/code/modules/events/alien_infestation.dm b/code/modules/events/alien_infestation.dm index 7b34ac3b2e6..f36fc238e4b 100644 --- a/code/modules/events/alien_infestation.dm +++ b/code/modules/events/alien_infestation.dm @@ -12,9 +12,7 @@ if(successSpawn) GLOB.event_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') else - var/text = "Warning: Could not spawn any mobs for event Alien Infestation" - message_admins(text) - log_adminwarn(text) + log_and_message_admins("Warning: Could not spawn any mobs for event Alien Infestation") /datum/event/alien_infestation/start() var/list/vents = get_valid_vent_spawns(exclude_mobs_nearby = TRUE, exclude_visible_by_mobs = TRUE) diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm index 096c145cc39..82494fd2768 100644 --- a/code/modules/events/blob.dm +++ b/code/modules/events/blob.dm @@ -7,9 +7,7 @@ if(successSpawn) GLOB.event_announcement.Announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak5.ogg') else - var/text = "Warning: Could not spawn any mobs for event Blob" - message_admins(text) - log_adminwarn(text) + log_and_message_admins("Warning: Could not spawn any mobs for event Blob") /datum/event/blob/start() processing = FALSE //so it won't fire again in next tick diff --git a/code/modules/events/spider_infestation.dm b/code/modules/events/spider_infestation.dm index 4feef679ed1..39f16c183f7 100644 --- a/code/modules/events/spider_infestation.dm +++ b/code/modules/events/spider_infestation.dm @@ -14,9 +14,7 @@ GLOBAL_VAR_INIT(sent_spiders_to_station, 0) if(successSpawn) GLOB.event_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') else - var/text = "Warning: Could not spawn any mobs for event Spider Infestation" - message_admins(text) - log_adminwarn(text) + log_and_message_admins("Warning: Could not spawn any mobs for event Spider Infestation") /datum/event/spider_infestation/start() var/list/vents = get_valid_vent_spawns(exclude_mobs_nearby = TRUE, exclude_visible_by_mobs = TRUE) diff --git a/code/modules/events/spider_terror.dm b/code/modules/events/spider_terror.dm index 97ec3d948b8..ae618fd6ef2 100644 --- a/code/modules/events/spider_terror.dm +++ b/code/modules/events/spider_terror.dm @@ -12,9 +12,7 @@ if(successSpawn) GLOB.command_announcement.Announce("Confirmed outbreak of level 3 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/effects/siren-spooky.ogg') else - var/text = "Warning: Could not spawn any mobs for event Terror Spiders" - message_admins(text) - log_adminwarn(text) + log_and_message_admins("Warning: Could not spawn any mobs for event Terror Spiders") /datum/event/spider_terror/start() var/list/vents = get_valid_vent_spawns(exclude_mobs_nearby = TRUE, exclude_visible_by_mobs = TRUE)