From ebb233ab36dae1d9673957e2a2586c4d00d8169c Mon Sep 17 00:00:00 2001 From: Putnam Date: Wed, 24 Mar 2021 18:21:26 -0700 Subject: [PATCH 1/2] More supernova adjustments --- code/modules/events/supernova.dm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/code/modules/events/supernova.dm b/code/modules/events/supernova.dm index a109d484e9..fcdbf3aad5 100644 --- a/code/modules/events/supernova.dm +++ b/code/modules/events/supernova.dm @@ -25,7 +25,7 @@ supernova.power_mod = 0 /datum/round_event/supernova/announce() - var/message = "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. [power > 4 ? "Short burts of radiation may be possible, so please prepare accordingly." : ""]" + var/message = "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. [power > 1 ? "Short burts of radiation may be possible, so please prepare accordingly." : ""]" if(prob(power * 25)) priority_announce(message) else @@ -47,12 +47,11 @@ /datum/round_event/supernova/tick() var/midpoint = round((endWhen-startWhen)/2) - switch(activeFor) - if(startWhen to midpoint) - supernova.power_mod = min(supernova.power_mod*1.2, power) - if(endWhen-10 to endWhen) - supernova.power_mod /= 4 - if(prob(round(supernova.power_mod / 2)) && storm_count < 4 && !SSweather.get_weather_by_type(/datum/weather/rad_storm)) + if(activeFor < midPoint) + supernova.power_mod = min(supernova.power_mod*1.2, power) + if(activeFor > endWhen-10) + supernova.power_mod /= 4 + if(prob(round(supernova.power_mod)) && prob(5) && storm_count < 5 && !SSweather.get_weather_by_type(/datum/weather/rad_storm)) SSweather.run_weather(/datum/weather/rad_storm/supernova) storm_count++ @@ -63,5 +62,7 @@ /datum/weather/rad_storm/supernova weather_duration_lower = 50 weather_duration_upper = 100 - telegraph_duration = 100 - radiation_intensity = 50 + telegraph_duration = 200 + radiation_intensity = 1000 + weather_sound = null + telegraph_message = "The air begins to grow very warm!" From ac432bdd252f3cb9b7c1fa7aefd52a8f192db567 Mon Sep 17 00:00:00 2001 From: Putnam Date: Wed, 24 Mar 2021 18:31:06 -0700 Subject: [PATCH 2/2] remember to compile before sending commits --- 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 fcdbf3aad5..6fc2fb0c4c 100644 --- a/code/modules/events/supernova.dm +++ b/code/modules/events/supernova.dm @@ -47,7 +47,7 @@ /datum/round_event/supernova/tick() var/midpoint = round((endWhen-startWhen)/2) - if(activeFor < midPoint) + if(activeFor < midpoint) supernova.power_mod = min(supernova.power_mod*1.2, power) if(activeFor > endWhen-10) supernova.power_mod /= 4