cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes certain firework stars from not working and nighttime changes (#8299)

Browse Source
This commit is contained in:
tacoguy7765093
2024-04-25 09:35:35 -05:00
committed by GitHub
parent 9de4c982da
commit c360092002
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/planet/sif.dm
View File

@@ -36,8 +36,8 @@ var/datum/planet/sif/planet_sif = null
switch(sun_position) switch(sun_position)
if(0 to 0.40) // Night if(0 to 0.40) // Night
low_brightness = 0.1 low_brightness = 0.15 //CHOMPedit
low_color = "#000066" low_color = "#19195c" //CHOMPedit
high_brightness = 0.3 high_brightness = 0.3
high_color = "#66004D" high_color = "#66004D"
@@ -122,7 +122,9 @@ var/datum/planet/sif/planet_sif = null
WEATHER_BLOOD_MOON = new /datum/weather/sif/blood_moon(), WEATHER_BLOOD_MOON = new /datum/weather/sif/blood_moon(),
WEATHER_EMBERFALL = new /datum/weather/sif/emberfall(), WEATHER_EMBERFALL = new /datum/weather/sif/emberfall(),
WEATHER_ASH_STORM = new /datum/weather/sif/ash_storm(), 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( roundstart_weather_chances = list(
WEATHER_CLEAR = 30, WEATHER_CLEAR = 30,
@@ -553,6 +555,7 @@ var/datum/planet/sif/planet_sif = null
transition_messages = list( transition_messages = list(
"Radioactive soot and ash start to float down around you, contaminating whatever they touch." "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 outdoor_sounds_type = /datum/looping_sound/weather/wind
indoor_sounds_type = /datum/looping_sound/weather/wind/indoors indoor_sounds_type = /datum/looping_sound/weather/wind/indoors

27
modular_chomp/code/modules/planet/sif.dm
View File

@@ -15,3 +15,30 @@
WEATHER_LIGHT_SNOW = 10, WEATHER_LIGHT_SNOW = 10,
WEATHER_RAIN = 5 WEATHER_RAIN = 5
) )
/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...?"