diff --git a/code/game/gamemodes/miniantags/tourist/tourist_arrivals.dm b/code/game/gamemodes/miniantags/tourist/tourist_arrivals.dm index 2cf0f2a133a..87301b2438f 100644 --- a/code/game/gamemodes/miniantags/tourist/tourist_arrivals.dm +++ b/code/game/gamemodes/miniantags/tourist/tourist_arrivals.dm @@ -97,6 +97,11 @@ var/raffle_name = pick("Galactic Getaway Raffle", "Cosmic Jackpot Raffle", "Nebula Nonsense Raffle", "Greytide Giveaway Raffle", "Toolbox Treasure Raffle") GLOB.minor_announcement.Announce("The lucky winners of the Nanotrasen raffle, 'Nanotrasen [raffle_name],' are arriving at [station_name()] shortly. Please welcome them warmly, they'll be staying with you until the end of your shift!") +/datum/event/tourist_arrivals/fake_announce() + var/raffle_name = pick("Galactic Getaway Raffle", "Cosmic Jackpot Raffle", "Nebula Nonsense Raffle", "Greytide Giveaway Raffle", "Toolbox Treasure Raffle") + GLOB.minor_announcement.Announce("The lucky winners of the Nanotrasen raffle, 'Nanotrasen [raffle_name],' are arriving at [station_name()] shortly. Please welcome them warmly, they'll be staying with you until the end of your shift!") + return TRUE + // Greets the player, announces objectives! /datum/event/tourist_arrivals/proc/greeting(mob/living/carbon/human/M) var/list/greeting = list() diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index d458aae0e09..8000bd82ead 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -54,7 +54,9 @@ GLOBAL_LIST_EMPTY(current_pending_diseases) else to_chat(M, chat_box_examine(SPAN_DEADSAY("Disease outbreak: The next new arrival is a carrier of a \"[chosen_disease.severity]\" disease: [chosen_disease.name]!"))) -/datum/event/disease_outbreak/announce() +/datum/event/disease_outbreak/announce(false_alarm) + if(false_alarm) + severity = pick(EVENT_LEVEL_MAJOR, EVENT_LEVEL_MODERATE, EVENT_LEVEL_MUNDANE) switch(severity) if(EVENT_LEVEL_MAJOR) GLOB.major_announcement.Announce("Lethal viral pathogen detected aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/effects/siren-spooky.ogg', new_sound2 = 'sound/AI/outbreak_virus.ogg') diff --git a/code/modules/events/false_alarm.dm b/code/modules/events/false_alarm.dm index 6c15bd82a3d..b9842d995c7 100644 --- a/code/modules/events/false_alarm.dm +++ b/code/modules/events/false_alarm.dm @@ -19,9 +19,15 @@ /datum/event/rogue_drone, /datum/event/solar_flare, /datum/event/spider_infestation, + /datum/event/spider_terror, /datum/event/tear, + /datum/event/tear/honk, /datum/event/traders, - /datum/event/vent_clog + /datum/event/disease_outbreak, + /datum/event/vent_clog, + /datum/event/disposals_clog, + /datum/event/demon_incursion, + /datum/event/shuttle_loan, ) + subtypesof(/datum/event/anomaly) + subtypesof(/datum/event/carp_migration) var/datum/event/working_event diff --git a/code/modules/events/tear_honk.dm b/code/modules/events/tear_honk.dm index a38a3274157..430459bb840 100644 --- a/code/modules/events/tear_honk.dm +++ b/code/modules/events/tear_honk.dm @@ -7,8 +7,19 @@ /datum/event/tear/honk/spawn_tear(location) HE = new /obj/effect/tear/honk(location) -/datum/event/tear/honk/announce() - GLOB.minor_announcement.Announce("A Honknomoly has opened. Expected location: [impact_area.name].", "Honknomoly Alert", 'sound/items/airhorn.ogg') +/datum/event/tear/honk/announce(false_alarm) + var/area/target_area = impact_area + if(!target_area) + if(false_alarm) + target_area = findEventArea() + if(isnull(target_area)) + log_debug("Tried to announce a false-alarm honk tear without a valid area!") + kill() + else + log_debug("Tried to announce a honk tear without a valid area!") + kill() + return + GLOB.minor_announcement.Announce("A Honknomoly has opened. Expected location: [target_area.name].", "Honknomoly Alert", 'sound/items/airhorn.ogg') /datum/event/tear/honk/end() if(HE)