From f821315263fe09b85d91acb235ef1d8452ac564c Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Thu, 5 Aug 2021 06:14:38 -0700 Subject: [PATCH 1/3] Halves probability on supernova rads --- code/modules/events/supernova.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/supernova.dm b/code/modules/events/supernova.dm index ca64984cde..6357ec5588 100644 --- a/code/modules/events/supernova.dm +++ b/code/modules/events/supernova.dm @@ -56,7 +56,7 @@ supernova.power_mod = min(supernova.power_mod*1.2, power) if(activeFor > endWhen-10) supernova.power_mod /= 4 - if(prob(round(supernova.power_mod*2)) && prob(3) && storm_count < 5 && !SSweather.get_weather_by_type(/datum/weather/rad_storm)) + if(prob(round(supernova.power_mod)) && prob(3) && storm_count < 5 && !SSweather.get_weather_by_type(/datum/weather/rad_storm)) SSweather.run_weather(/datum/weather/rad_storm/supernova) storm_count++ From 571c017eec85bcf3caaa60bf9038316b1834cb3b Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Thu, 5 Aug 2021 06:18:33 -0700 Subject: [PATCH 2/3] Also makes the end stuff only show if announced --- code/modules/events/supernova.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/events/supernova.dm b/code/modules/events/supernova.dm index 6357ec5588..8cd0be77d3 100644 --- a/code/modules/events/supernova.dm +++ b/code/modules/events/supernova.dm @@ -12,6 +12,7 @@ var/power = 1 var/datum/sun/supernova var/storm_count = 0 + var/announced = FALSE /datum/round_event/supernova/setup() announceWhen = rand(4, 60) @@ -33,6 +34,7 @@ var/message = "[station_name()]: Our tachyon-doppler array has detected a supernova in your vicinity. Peak flux from the supernova estimated to be [round(power,0.1)] times current solar flux; if the supernova is close to your sun in the sky, your solars may receive this as a power boost.[power > 1 ? " Short burts of radiation may be possible, so please prepare accordingly." : ""] We hope you enjoy the light." if(prob(power * 25)) priority_announce(message, sender_override = "Nanotrasen Meteorology Division") + announced = TRUE else print_command_report(message) @@ -63,8 +65,9 @@ /datum/round_event/supernova/end() SSsun.suns -= supernova qdel(supernova) - priority_announce("The supernova's flux is now negligible. Radiation storms have ceased. Have a pleasant shift, [station_name()], and thank you for bearing with nature.", - sender_override = "Nanotrasen Meteorology Division") + if(announced) + priority_announce("The supernova's flux is now negligible. Radiation storms have ceased. Have a pleasant shift, [station_name()], and thank you for bearing with nature.", + sender_override = "Nanotrasen Meteorology Division") /datum/weather/rad_storm/supernova weather_duration_lower = 50 From 39679ea239796608e349204b1b9a60383e3b633e Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Thu, 5 Aug 2021 06:19:29 -0700 Subject: [PATCH 3/3] explicit "no rads" sentence --- code/modules/events/supernova.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/supernova.dm b/code/modules/events/supernova.dm index 8cd0be77d3..e1d6991c89 100644 --- a/code/modules/events/supernova.dm +++ b/code/modules/events/supernova.dm @@ -31,7 +31,7 @@ supernova.power_mod = 0 /datum/round_event/supernova/announce() - var/message = "[station_name()]: Our tachyon-doppler array has detected a supernova in your vicinity. Peak flux from the supernova estimated to be [round(power,0.1)] times current solar flux; if the supernova is close to your sun in the sky, your solars may receive this as a power boost.[power > 1 ? " Short burts of radiation may be possible, so please prepare accordingly." : ""] We hope you enjoy the light." + var/message = "[station_name()]: Our tachyon-doppler array has detected a supernova in your vicinity. Peak flux from the supernova estimated to be [round(power,0.1)] times current solar flux; if the supernova is close to your sun in the sky, your solars may receive this as a power boost.[power > 1 ? " Short burts of radiation may be possible, so please prepare accordingly." : "We expect no radiation bursts from this one."] We hope you enjoy the light." if(prob(power * 25)) priority_announce(message, sender_override = "Nanotrasen Meteorology Division") announced = TRUE