From 21171a35f5071b67fe7d84cde4cb2ba08abdb890 Mon Sep 17 00:00:00 2001 From: Kyep Date: Sat, 9 Jan 2016 23:41:10 -0800 Subject: [PATCH 1/6] clarifying Blob vs Virus --- code/modules/events/blob.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm index 3fc9d3f1bdc..7532a3c98be 100644 --- a/code/modules/events/blob.dm +++ b/code/modules/events/blob.dm @@ -4,7 +4,7 @@ var/obj/effect/blob/core/Blob /datum/event/blob/announce() - command_announcement.Announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak5.ogg') + command_announcement.Announce("Confirmed outbreak of level 5 BLOB biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak5.ogg') /datum/event/blob/start() var/turf/T = pick(blobstart) From 3e39a352a5e9c7b6a76b81adffb766463a1028e9 Mon Sep 17 00:00:00 2001 From: Kyep Date: Sat, 9 Jan 2016 23:41:53 -0800 Subject: [PATCH 2/6] clarifying Blob vs Virus vs Spacevine --- code/modules/events/spacevine.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index cf00e4f78b9..ba791732c25 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -8,4 +8,4 @@ spacevines_spawned = 1 /datum/event/spacevine/announce() - command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg') + command_announcement.Announce("Confirmed outbreak of level 7 VINE biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg') From d00039f9718fa253cb9d5d5025b9152e7d2df2c1 Mon Sep 17 00:00:00 2001 From: Kyep Date: Sat, 9 Jan 2016 23:43:36 -0800 Subject: [PATCH 3/6] Made virus v blob v spacevine clearer --- code/modules/events/viral_infection.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/viral_infection.dm b/code/modules/events/viral_infection.dm index 456ca576d38..cb889499c55 100644 --- a/code/modules/events/viral_infection.dm +++ b/code/modules/events/viral_infection.dm @@ -7,7 +7,7 @@ severity = rand(1, 3) /datum/event/viral_infection/announce() - command_announcement.Announce("Confirmed outbreak of level five viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak5.ogg') + command_announcement.Announce("Confirmed outbreak of level five VIRAL biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak5.ogg') /datum/event/viral_infection/start() var/list/candidates = list() //list of candidate keys From a48ee3af058fd4af60f4b0cbb9d95b7ffd720c65 Mon Sep 17 00:00:00 2001 From: Kyep Date: Sat, 9 Jan 2016 23:44:18 -0800 Subject: [PATCH 4/6] Making virus v blob v vine clearer --- code/modules/events/viral_outbreak.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/viral_outbreak.dm b/code/modules/events/viral_outbreak.dm index 605f73cddf4..af3f757a355 100644 --- a/code/modules/events/viral_outbreak.dm +++ b/code/modules/events/viral_outbreak.dm @@ -7,7 +7,7 @@ severity = rand(2, 4) /datum/event/viral_outbreak/announce() - command_announcement.Announce("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg') + command_announcement.Announce("Confirmed outbreak of level 7 VIRAL biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg') /datum/event/viral_outbreak/start() var/list/candidates = list() //list of candidate keys From 31a45f5dd3ac1a6df136d596cbb09f3cd4c344cc Mon Sep 17 00:00:00 2001 From: Kyep Date: Sun, 10 Jan 2016 02:53:26 -0800 Subject: [PATCH 5/6] Added changelog --- html/changelogs/Kyep-3179.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 html/changelogs/Kyep-3179.yml diff --git a/html/changelogs/Kyep-3179.yml b/html/changelogs/Kyep-3179.yml new file mode 100644 index 00000000000..de81dc614b5 --- /dev/null +++ b/html/changelogs/Kyep-3179.yml @@ -0,0 +1,9 @@ + +# Your name. Remove the quotation mark and put in your name when copy+pasting the example changelog. +author: Kyep + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +changes: + - rscadd: "Blob, vine and virus outbreaks are now more clearly labeled as such, to avoid people confusing them with each other" From d6237b83cab1d279727736545a1b59b6fd46287c Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 13 Jan 2016 01:39:17 -0800 Subject: [PATCH 6/6] Reclassified events based on github feedback Blob is now "level 5 biohazard", spacevine is now "level 7 biohazard", viral infection is now "level 7 viral biohazard" and viral outbreak is now "level 7 major viral biohazard". This is very close to how it was originally, the only changes being (A) viral infection moving from 5 to 7, which the other viral event was already at anyway, and (B) viral outbreak being called 'major viral' instead of just 'viral' so outbreaks and infections are subtly different. This makes it a little easier to distinguish blob (now the only 5) from the others, and still preserves the numbered levels, making the handling of virus events slightly more consistent in the process. If you want to stick with numbered levels, I'd like to split them up a bit more (as tigercat suggested), but I cannot make new sound/AI/outbreak*.ogg files, so this is a compromise which makes blob a little easier to distinguish, makes viruses more consistent, and does so without requiring new sound files. --- code/modules/events/blob.dm | 2 +- code/modules/events/spacevine.dm | 2 +- code/modules/events/viral_infection.dm | 2 +- code/modules/events/viral_outbreak.dm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm index 7532a3c98be..3fc9d3f1bdc 100644 --- a/code/modules/events/blob.dm +++ b/code/modules/events/blob.dm @@ -4,7 +4,7 @@ var/obj/effect/blob/core/Blob /datum/event/blob/announce() - command_announcement.Announce("Confirmed outbreak of level 5 BLOB biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak5.ogg') + command_announcement.Announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak5.ogg') /datum/event/blob/start() var/turf/T = pick(blobstart) diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index ba791732c25..cf00e4f78b9 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -8,4 +8,4 @@ spacevines_spawned = 1 /datum/event/spacevine/announce() - command_announcement.Announce("Confirmed outbreak of level 7 VINE biohazard aboard [station_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 [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg') diff --git a/code/modules/events/viral_infection.dm b/code/modules/events/viral_infection.dm index cb889499c55..362093b62ee 100644 --- a/code/modules/events/viral_infection.dm +++ b/code/modules/events/viral_infection.dm @@ -7,7 +7,7 @@ severity = rand(1, 3) /datum/event/viral_infection/announce() - command_announcement.Announce("Confirmed outbreak of level five VIRAL biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak5.ogg') + command_announcement.Announce("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg') /datum/event/viral_infection/start() var/list/candidates = list() //list of candidate keys diff --git a/code/modules/events/viral_outbreak.dm b/code/modules/events/viral_outbreak.dm index af3f757a355..6c24c37137e 100644 --- a/code/modules/events/viral_outbreak.dm +++ b/code/modules/events/viral_outbreak.dm @@ -7,7 +7,7 @@ severity = rand(2, 4) /datum/event/viral_outbreak/announce() - command_announcement.Announce("Confirmed outbreak of level 7 VIRAL biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg') + command_announcement.Announce("Confirmed outbreak of level 7 major viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg') /datum/event/viral_outbreak/start() var/list/candidates = list() //list of candidate keys