From f1eaecedbf32cb05fac2249d92152e4955b88dbb Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 9 Dec 2023 00:59:41 +0100 Subject: [PATCH] [MIRROR] Fixed false anomaly announcements. [MDB IGNORE] (#25509) * Fixed false anomaly announcements. * Update _anomaly.dm * Update anomaly_bioscrambler.dm * Update anomaly_bluespace.dm * Fix merge conflicts --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> --- code/modules/events/anomaly/_anomaly.dm | 4 +++- .../events/anomaly/anomaly_bioscrambler.dm | 4 +++- .../events/anomaly/anomaly_bluespace.dm | 4 +++- .../events/anomaly/anomaly_dimensional.dm | 4 +++- .../events/anomaly/anomaly_ectoplasm.dm | 4 +++- code/modules/events/anomaly/anomaly_flux.dm | 4 +++- code/modules/events/anomaly/anomaly_grav.dm | 4 +++- .../events/anomaly/anomaly_hallucination.dm | 4 +++- code/modules/events/anomaly/anomaly_pyro.dm | 4 +++- code/modules/events/anomaly/anomaly_vortex.dm | 4 +++- code/modules/events/brand_intelligence.dm | 6 +++++- code/modules/events/disease_outbreak.dm | 17 ++++++++++++++++ code/modules/events/grey_tide.dm | 2 ++ .../events/shuttle_loan/shuttle_loan_event.dm | 6 +++++- code/modules/events/vent_clog.dm | 20 +++++++++++-------- 15 files changed, 71 insertions(+), 20 deletions(-) diff --git a/code/modules/events/anomaly/_anomaly.dm b/code/modules/events/anomaly/_anomaly.dm index a6c37c4931b..40ae2b840e1 100644 --- a/code/modules/events/anomaly/_anomaly.dm +++ b/code/modules/events/anomaly/_anomaly.dm @@ -26,7 +26,9 @@ impact_area = placer.findValidArea() /datum/round_event/anomaly/announce(fake) - priority_announce("Energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_ANOMALIES) //SKYRAT EDIT CHANGE + if(isnull(impact_area)) + impact_area = placer.findValidArea() + priority_announce("Energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_ANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert") /datum/round_event/anomaly/start() var/turf/anomaly_turf diff --git a/code/modules/events/anomaly/anomaly_bioscrambler.dm b/code/modules/events/anomaly/anomaly_bioscrambler.dm index f2c99221c8f..87d8a19c39a 100644 --- a/code/modules/events/anomaly/anomaly_bioscrambler.dm +++ b/code/modules/events/anomaly/anomaly_bioscrambler.dm @@ -15,4 +15,6 @@ anomaly_path = /obj/effect/anomaly/bioscrambler /datum/round_event/anomaly/anomaly_bioscrambler/announce(fake) - priority_announce("Biologic limb swapping agent detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name]. Wear biosuits or other protective gear to counter the effects. Calculated half-life of %9£$T$%F3 years.", "Anomaly Alert", ANNOUNCER_ANOMALIES) //SKYRAT EDIT CHANGE + if(isnull(impact_area)) + impact_area = placer.findValidArea() + priority_announce("Biologic limb swapping agent detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name]. Wear biosuits or other protective gear to counter the effects. Calculated half-life of %9£$T$%F3 years.", "Anomaly Alert", ANNOUNCER_ANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Biologic limb swapping agent detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name]. Wear biosuits or other protective gear to counter the effects. Calculated half-life of %9£$T$%F3 years.", "Anomaly Alert") diff --git a/code/modules/events/anomaly/anomaly_bluespace.dm b/code/modules/events/anomaly/anomaly_bluespace.dm index f5aa564b521..e8a6f4aa160 100644 --- a/code/modules/events/anomaly/anomaly_bluespace.dm +++ b/code/modules/events/anomaly/anomaly_bluespace.dm @@ -14,4 +14,6 @@ anomaly_path = /obj/effect/anomaly/bluespace /datum/round_event/anomaly/anomaly_bluespace/announce(fake) - priority_announce("Bluespace instability detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_MASSIVEBSPACEANOMALIES) //SKYRAT EDIT CHANGE + if(isnull(impact_area)) + impact_area = placer.findValidArea() + priority_announce("Bluespace instability detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_MASSIVEBSPACEANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Bluespace instability detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert") diff --git a/code/modules/events/anomaly/anomaly_dimensional.dm b/code/modules/events/anomaly/anomaly_dimensional.dm index 7bd3b56e118..885b4fef8c1 100644 --- a/code/modules/events/anomaly/anomaly_dimensional.dm +++ b/code/modules/events/anomaly/anomaly_dimensional.dm @@ -23,7 +23,9 @@ new_anomaly.prepare_area(new_theme_path = anomaly_theme) /datum/round_event/anomaly/anomaly_dimensional/announce(fake) - priority_announce("Dimensional instability detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_ANOMALIES) //SKYRAT EDIT CHANGE + if(isnull(impact_area)) + impact_area = placer.findValidArea() + priority_announce("Dimensional instability detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_ANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Dimensional instability detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert") /datum/event_admin_setup/listed_options/anomaly_dimensional input_text = "Select a dimensional anomaly theme?" diff --git a/code/modules/events/anomaly/anomaly_ectoplasm.dm b/code/modules/events/anomaly/anomaly_ectoplasm.dm index e91ed5f593d..6bd929d6922 100644 --- a/code/modules/events/anomaly/anomaly_ectoplasm.dm +++ b/code/modules/events/anomaly/anomaly_ectoplasm.dm @@ -39,7 +39,9 @@ announce_to_ghosts(newAnomaly) /datum/round_event/anomaly/anomaly_ectoplasm/announce(fake) - priority_announce("Paranormal ectoplasmic outburst detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_ANOMALIES) //SKYRAT EDIT CHANGE + if(isnull(impact_area)) + impact_area = placer.findValidArea() + priority_announce("Paranormal ectoplasmic outburst detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_ANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Paranormal ectoplasmic outburst detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert") /datum/event_admin_setup/anomaly_ectoplasm ///The admin-selected intensity diff --git a/code/modules/events/anomaly/anomaly_flux.dm b/code/modules/events/anomaly/anomaly_flux.dm index 0e333579901..231d3d825ba 100644 --- a/code/modules/events/anomaly/anomaly_flux.dm +++ b/code/modules/events/anomaly/anomaly_flux.dm @@ -15,4 +15,6 @@ anomaly_path = /obj/effect/anomaly/flux /datum/round_event/anomaly/anomaly_flux/announce(fake) - priority_announce("Hyper-energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_FLUXANOMALIES) //SKYRAT EDIT CHANGE + if(isnull(impact_area)) + impact_area = placer.findValidArea() + priority_announce("Hyper-energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_FLUXANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Hyper-energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert") diff --git a/code/modules/events/anomaly/anomaly_grav.dm b/code/modules/events/anomaly/anomaly_grav.dm index e7db49aaf55..400feb2900e 100644 --- a/code/modules/events/anomaly/anomaly_grav.dm +++ b/code/modules/events/anomaly/anomaly_grav.dm @@ -27,4 +27,6 @@ anomaly_path = /obj/effect/anomaly/grav/high /datum/round_event/anomaly/anomaly_grav/announce(fake) - priority_announce("Gravitational anomaly detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert" , ANNOUNCER_GRAVANOMALIES) //SKYRAT EDIT CHANGE + if(isnull(impact_area)) + impact_area = placer.findValidArea() + priority_announce("Gravitational anomaly detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert" , ANNOUNCER_GRAVANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Gravitational anomaly detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert" , ANNOUNCER_GRANOMALIES) diff --git a/code/modules/events/anomaly/anomaly_hallucination.dm b/code/modules/events/anomaly/anomaly_hallucination.dm index 599fbfd4a18..93803a321a8 100644 --- a/code/modules/events/anomaly/anomaly_hallucination.dm +++ b/code/modules/events/anomaly/anomaly_hallucination.dm @@ -15,4 +15,6 @@ anomaly_path = /obj/effect/anomaly/hallucination /datum/round_event/anomaly/anomaly_hallucination/announce(fake) - priority_announce("Hallucinatory event detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_ANOMALIES) //SKYRAT EDIT CHANGE + if(isnull(impact_area)) + impact_area = placer.findValidArea() + priority_announce("Hallucinatory event detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_ANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Hallucinatory event detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert") diff --git a/code/modules/events/anomaly/anomaly_pyro.dm b/code/modules/events/anomaly/anomaly_pyro.dm index ea4b57b0d2d..c8cbfde644c 100644 --- a/code/modules/events/anomaly/anomaly_pyro.dm +++ b/code/modules/events/anomaly/anomaly_pyro.dm @@ -14,4 +14,6 @@ anomaly_path = /obj/effect/anomaly/pyro /datum/round_event/anomaly/anomaly_pyro/announce(fake) - priority_announce("Pyroclastic anomaly detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_PYROANOMALIES) //SKYRAT EDIT CHANGE + if(isnull(impact_area)) + impact_area = placer.findValidArea() + priority_announce("Pyroclastic anomaly detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_PYROANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Pyroclastic anomaly detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert") diff --git a/code/modules/events/anomaly/anomaly_vortex.dm b/code/modules/events/anomaly/anomaly_vortex.dm index 81a5f9ca26e..3c762d52239 100644 --- a/code/modules/events/anomaly/anomaly_vortex.dm +++ b/code/modules/events/anomaly/anomaly_vortex.dm @@ -15,4 +15,6 @@ anomaly_path = /obj/effect/anomaly/bhole /datum/round_event/anomaly/anomaly_vortex/announce(fake) - priority_announce("Localized high-intensity vortex anomaly detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name]", "Anomaly Alert", ANNOUNCER_VORTEXANOMALIES) //SKYRAT EDIT CHANGE + if(isnull(impact_area)) + impact_area = placer.findValidArea() + priority_announce("Localized high-intensity vortex anomaly detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name]", "Anomaly Alert", ANNOUNCER_VORTEXANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Localized high-intensity vortex anomaly detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name]", "Anomaly Alert") diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm index 9fbfa87390b..e1631e8fa7c 100644 --- a/code/modules/events/brand_intelligence.dm +++ b/code/modules/events/brand_intelligence.dm @@ -48,7 +48,11 @@ origin_machine = pick_n_take(vending_machines) /datum/round_event/brand_intelligence/announce(fake) - priority_announce("Rampant brand intelligence has been detected aboard [station_name()]. Please inspect any [origin_machine] brand vendors for aggressive marketing tactics, and reboot them if necessary.", "Machine Learning Alert", ANNOUNCER_BRANDINTELLIGENCE) //SKYRAT EDIT CHANGE + var/machine_name = initial(origin_machine.name) + if(fake) + var/obj/machinery/vending/prototype = pick(subtypesof(/obj/machinery/vending)) + machine_name = initial(prototype.name) + priority_announce("Rampant brand intelligence has been detected aboard [station_name()]. Please inspect any [origin_machine] brand vendors for aggressive marketing tactics, and reboot them if necessary.", "Machine Learning Alert", ANNOUNCER_BRANDINTELLIGENCE) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Rampant brand intelligence has been detected aboard [station_name()]. Please inspect any [machine_name] brand vendors for aggressive marketing tactics, and reboot them if necessary.", "Machine Learning Alert") /datum/round_event/brand_intelligence/start() origin_machine.shut_up = FALSE diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index b1d7f764140..38b313a6417 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -104,6 +104,23 @@ var/list/afflicted = list() /datum/round_event/disease_outbreak/announce(fake) + if(isnull(illness_type)) + var/list/virus_candidates = list( + /datum/disease/anxiety, + /datum/disease/beesease, + /datum/disease/brainrot, + /datum/disease/cold9, + /datum/disease/flu, + /datum/disease/fluspanish, + /datum/disease/magnitis, + /// And here are some that will never roll for real, just to mess around. + /datum/disease/death_sandwich_poisoning, + /datum/disease/dna_retrovirus, + /datum/disease/gbs, + /datum/disease/rhumba_beat, + ) + var/datum/disease/fake_virus = pick(virus_candidates) + illness_type = initial(fake_virus.name) priority_announce("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "[illness_type] Alert", ANNOUNCER_OUTBREAK7) /datum/round_event/disease_outbreak/setup() diff --git a/code/modules/events/grey_tide.dm b/code/modules/events/grey_tide.dm index 51e74645f77..62f5a53374c 100644 --- a/code/modules/events/grey_tide.dm +++ b/code/modules/events/grey_tide.dm @@ -33,6 +33,8 @@ grey_tide_areas += pick_n_take(potential_areas) /datum/round_event/grey_tide/announce(fake) + if(fake) + severity = rand(1,3) priority_announce("Gr3y.T1d3 virus detected in [station_name()] secure locking encryption subroutines. Severity level of [severity]. Recommend station AI involvement.", "Security Alert") /datum/round_event/grey_tide/start() diff --git a/code/modules/events/shuttle_loan/shuttle_loan_event.dm b/code/modules/events/shuttle_loan/shuttle_loan_event.dm index c7248a36266..6eeddea0214 100644 --- a/code/modules/events/shuttle_loan/shuttle_loan_event.dm +++ b/code/modules/events/shuttle_loan/shuttle_loan_event.dm @@ -39,7 +39,11 @@ situation = new situation() /datum/round_event/shuttle_loan/announce(fake) - priority_announce("Cargo: [situation.announcement_text]", situation.sender) + var/announcement_text = situation?.announcement_text + if(isnull(announcement_text) || fake) + var/datum/shuttle_loan_situation/fake_situation = pick(subtypesof(/datum/shuttle_loan_situation)) + announcement_text = initial(fake_situation.announcement_text) + priority_announce("Cargo: [announcement_text]", situation.sender) SSshuttle.shuttle_loan = src /datum/round_event/shuttle_loan/proc/loan_shuttle() diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index 3a0b1b4c183..c6f52ab50ca 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -36,8 +36,9 @@ ///The list of decals we will choose from to spawn when producing a mob var/list/filth_spawn_types = list() -/datum/round_event/vent_clog/announce() - priority_announce("Minor biological obstruction detected in the ventilation network. Blockage is believed to be in the [get_area_name(vent)].", "Custodial Notification") +/datum/round_event/vent_clog/announce(fake) + var/area/event_area = fake ? pick(GLOB.teleportlocs) : get_area_name(vent) + priority_announce("Minor biological obstruction detected in the ventilation network. Blockage is believed to be in the [event_area].", "Custodial Notification") /datum/round_event/vent_clog/setup() vent = get_vent() @@ -227,8 +228,9 @@ ) return pick(mob_list) -/datum/round_event/vent_clog/major/announce() - priority_announce("Major biological obstruction detected in the ventilation network. Blockage is believed to be in the [get_area_name(vent)] area.", "Infestation Alert") +/datum/round_event/vent_clog/major/announce(fake) + var/area/event_area = fake ? pick(GLOB.teleportlocs) : get_area_name(vent) + priority_announce("Major biological obstruction detected in the ventilation network. Blockage is believed to be in the [event_area] area.", "Infestation Alert") /datum/round_event_control/vent_clog/critical name = "Ventilation Clog: Critical" @@ -250,8 +252,9 @@ /obj/effect/decal/cleanable/blood/splatter, ) -/datum/round_event/vent_clog/critical/announce() - priority_announce("Potentially hazardous lifesigns detected in the [get_area_name(vent)] ventilation network.", "Security Alert") +/datum/round_event/vent_clog/critical/announce(fake) + var/area/event_area = fake ? pick(GLOB.teleportlocs) : get_area_name(vent) + priority_announce("Potentially hazardous lifesigns detected in the [event_area] ventilation network.", "Security Alert") /datum/round_event/vent_clog/critical/get_mob() var/static/list/mob_list = list( @@ -282,8 +285,9 @@ /obj/effect/decal/cleanable/vomit, ) -/datum/round_event/vent_clog/strange/announce() - priority_announce("Unusual lifesign readings detected in the [get_area_name(vent)] ventilation network.", "Lifesign Alert", ANNOUNCER_ALIENS) +/datum/round_event/vent_clog/strange/announce(fake) + var/area/event_area = fake ? pick(GLOB.teleportlocs) : get_area_name(vent) + priority_announce("Unusual lifesign readings detected in the [event_area] ventilation network.", "Lifesign Alert", ANNOUNCER_ALIENS) /datum/round_event/vent_clog/strange/get_mob() var/static/list/mob_list = list(