diff --git a/code/modules/planet/sif.dm b/code/modules/planet/sif.dm index f62d991e8e..320741da6e 100644 --- a/code/modules/planet/sif.dm +++ b/code/modules/planet/sif.dm @@ -36,8 +36,8 @@ var/datum/planet/sif/planet_sif = null switch(sun_position) if(0 to 0.40) // Night - low_brightness = 0.1 - low_color = "#000066" + low_brightness = 0.15 //CHOMPedit + low_color = "#19195c" //CHOMPedit high_brightness = 0.3 high_color = "#66004D" @@ -122,7 +122,9 @@ var/datum/planet/sif/planet_sif = null WEATHER_BLOOD_MOON = new /datum/weather/sif/blood_moon(), WEATHER_EMBERFALL = new /datum/weather/sif/emberfall(), WEATHER_ASH_STORM = new /datum/weather/sif/ash_storm(), - WEATHER_FALLOUT = new /datum/weather/sif/fallout() + WEATHER_FALLOUT = new /datum/weather/sif/fallout(), + WEATHER_FALLOUT_TEMP = new /datum/weather/sif/fallout/temp(), //CHOMPedit + WEATHER_CONFETTI = new /datum/weather/sif/confetti() //CHOMPedit ) roundstart_weather_chances = list( WEATHER_CLEAR = 30, @@ -553,6 +555,7 @@ var/datum/planet/sif/planet_sif = null transition_messages = list( "Radioactive soot and ash start to float down around you, contaminating whatever they touch." ) + imminent_transition_message = "Sky and clouds are growing sickly green... Radiation storm is approaching, get to cover!" outdoor_sounds_type = /datum/looping_sound/weather/wind indoor_sounds_type = /datum/looping_sound/weather/wind/indoors diff --git a/modular_chomp/code/modules/planet/sif.dm b/modular_chomp/code/modules/planet/sif.dm index 810232413b..dfa12d993f 100644 --- a/modular_chomp/code/modules/planet/sif.dm +++ b/modular_chomp/code/modules/planet/sif.dm @@ -14,4 +14,31 @@ WEATHER_OVERCAST = 15, WEATHER_LIGHT_SNOW = 10, WEATHER_RAIN = 5 - ) \ No newline at end of file + ) + +/datum/weather/sif/fallout/temp //fixys firework stars + name = "short-term fallout" + timer_low_bound = 1 + timer_high_bound = 3 + transition_chances = list( + WEATHER_FALLOUT = 10, + WEATHER_RAIN = 50, + WEATHER_FOG = 35, + WEATHER_STORM = 20, + WEATHER_OVERCAST = 5 + ) + +/datum/weather/sif/confetti //fixys firework stars + name = "confetti" + icon_state = "confetti" + + transition_chances = list( + WEATHER_CLEAR = 50, + WEATHER_OVERCAST = 20, + WEATHER_CONFETTI = 5 + ) + observed_message = "Confetti is raining from the sky." + transition_messages = list( + "Suddenly, colorful confetti starts raining from the sky." + ) + imminent_transition_message = "A rain is starting... A rain of confetti...?"