diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm index 033183a639..299c75b58a 100644 --- a/code/defines/procs/announce.dm +++ b/code/defines/procs/announce.dm @@ -128,7 +128,7 @@ // Format currently matches that of newscaster feeds: Registered Name (Assigned Rank) return I.assignment ? "[I.registered_name] ([I.assignment])" : I.registered_name -/proc/level_seven_announcement() +/proc/level_seven_announcement() // Chomp note - Do not use this. command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard \the [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg') /proc/ion_storm_announcement() diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 48c9b91c22..9fb6683cfd 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -8,4 +8,5 @@ spacevines_spawned = 1 /datum/event/spacevine/announce() - level_seven_announcement() + //level_seven_announcement() // Chomp Edit, this was stupid and vague and wrong. + command_announcement.Announce("Hazardous plant infestation detected on \the [station_name()]. Station facilities may be overgrown.", "Hazardous Biomass") \ No newline at end of file diff --git a/code/modules/events/viral_infection.dm b/code/modules/events/viral_infection.dm index d596466585..aed3c79e3c 100644 --- a/code/modules/events/viral_infection.dm +++ b/code/modules/events/viral_infection.dm @@ -22,16 +22,18 @@ var/global/list/event_viruses = list() // so that event viruses are kept around viruses += D /datum/event/viral_infection/announce() - var/level + /*var/level if (severity == EVENT_LEVEL_MUNDANE) return else if (severity == EVENT_LEVEL_MODERATE) level = pick("one", "two", "three", "four") else - level = "five" + level = "five"*/ + // Chomp removal if (severity == EVENT_LEVEL_MAJOR || prob(60)) - command_announcement.Announce("Confirmed outbreak of level [level] biohazard aboard \the [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak5.ogg') + command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard \the [station_name()]. All personnel must contain the outbreak.", "Viral Outbreak", new_sound = 'sound/AI/outbreak7.ogg') + // Chomp edit: Changed "Biohazard Alert" to "Viral Outbreak" and also changed level level 5 to level 7. Lower = More urgent. /datum/event/viral_infection/start() if(!viruses.len) return diff --git a/code/modules/events/viral_outbreak.dm b/code/modules/events/viral_outbreak.dm index 453d101773..7eb310f0ab 100644 --- a/code/modules/events/viral_outbreak.dm +++ b/code/modules/events/viral_outbreak.dm @@ -8,8 +8,9 @@ severity = rand(2, 4) /datum/event/viral_outbreak/announce() - command_alert("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") + command_alert("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Viral Outbreak") world << sound('sound/AI/outbreak7.ogg') + // Chomp edit: Changed "Biohazard Alert" to "Viral Outbreak" and yes I know this file isn't used anymore but I'm going to be consistent in case it does get used. /datum/event/viral_outbreak/start() var/list/candidates = list() //list of candidate keys diff --git a/code/modules/events/wallrot.dm b/code/modules/events/wallrot.dm index 1909fc5d00..ad7c8bc967 100644 --- a/code/modules/events/wallrot.dm +++ b/code/modules/events/wallrot.dm @@ -18,7 +18,8 @@ /datum/event/wallrot/announce() if(center) - command_announcement.Announce("Harmful fungi detected on \the [station_name()] nearby [center.loc.name]. Station structures may be contaminated.", "Biohazard Alert") + command_announcement.Announce("Harmful fungi detected on \the [station_name()]. Hull integrity near [center.loc.name] may be compromised.", "Hazardous Biomass") + // Chomp edit - Better wording as to what the hell it actually does. /datum/event/wallrot/start() spawn() diff --git a/code/modules/gamemaster/event2/events/engineering/blob.dm b/code/modules/gamemaster/event2/events/engineering/blob.dm index 199204721a..d5ea823577 100644 --- a/code/modules/gamemaster/event2/events/engineering/blob.dm +++ b/code/modules/gamemaster/event2/events/engineering/blob.dm @@ -143,8 +143,8 @@ multiblob = TRUE var/list/lines = list() - lines += "Confirmed outbreak of level [7 + danger_level] biohazard[multiblob ? "s": ""] \ - aboard [location_name()]. All personnel must contain the outbreak." + //lines += "Confirmed outbreak of level [7 + danger_level] biohazard[multiblob ? "s": ""] + lines += "Confirmed outbreak of level 5 biohazard[multiblob ? "s": ""] aboard [location_name()]. All personnel must contain the outbreak." if(danger_level >= BLOB_DIFFICULTY_MEDIUM) // Tell them what kind of blob it is if it's tough. lines += "The biohazard[multiblob ? "s have": " has"] been identified as [english_list(blob_type_names)]." @@ -157,4 +157,6 @@ if(danger_level >= BLOB_DIFFICULTY_SUPERHARD) lines += "Extreme caution is advised." - command_announcement.Announce(lines.Join("\n"), "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg') + //command_announcement.Announce(lines.Join("\n"), "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg') + command_announcement.Announce(lines.Join("\n"), "Hazardous Biomass - URGENT!", new_sound = 'sound/AI/outbreak5.ogg') + // Chomp edit - Better wording and also made the alert level 5. Lower number = More urgent. \ No newline at end of file diff --git a/code/modules/gamemaster/event2/events/engineering/spacevine.dm b/code/modules/gamemaster/event2/events/engineering/spacevine.dm index 53fc9fd5bb..374fd76ab7 100644 --- a/code/modules/gamemaster/event2/events/engineering/spacevine.dm +++ b/code/modules/gamemaster/event2/events/engineering/spacevine.dm @@ -11,7 +11,8 @@ /datum/event2/event/spacevine/announce() - level_seven_announcement() + //level_seven_announcement() // Chomp Edit + command_announcement.Announce("Hazardous plant infestation detected on \the [station_name()]. Station facilities may be overgrown.", "Hazardous Biomass") /datum/event2/event/spacevine/start() spacevine_infestation() diff --git a/code/modules/gamemaster/event2/events/medical/virus.dm b/code/modules/gamemaster/event2/events/medical/virus.dm index 6ace7c8755..30eccd2b2f 100644 --- a/code/modules/gamemaster/event2/events/medical/virus.dm +++ b/code/modules/gamemaster/event2/events/medical/virus.dm @@ -49,8 +49,8 @@ candidates = shuffle(candidates) /datum/event2/event/virus/announce() - command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard \the [location_name()]. \ - All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg') + command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard \the [location_name()]. All personnel must contain the outbreak.", "Viral Outbreak", new_sound = 'sound/AI/outbreak7.ogg') + // Chomp edit: Changed "Biohazard Alert" to "Viral Outbreak" /datum/event2/event/virus/start() if(!candidates.len) diff --git a/modular_chomp/code/modules/event/infectedroom.dm b/modular_chomp/code/modules/event/infectedroom.dm index 830cdd82a4..8e7362e297 100644 --- a/modular_chomp/code/modules/event/infectedroom.dm +++ b/modular_chomp/code/modules/event/infectedroom.dm @@ -90,8 +90,7 @@ message_admins("Infected room event started; Virus: [virus.name()]") /datum/event/infectedroom/announce() - command_announcement.Announce("Confirmed outbreak of level 5 biohazard aboard \the [location_name()]. \ - All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak5.ogg') + command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard \the [location_name()]. All personnel must contain the outbreak.", "Infectious Contaminant in [target_area.name]", new_sound = 'sound/AI/outbreak7.ogg') /datum/event/infectedroom/start() var/obj/effect/decal/cleanable/mucus/mapped/M