Skip to content

Commit

Permalink
fix errors slowly a few at a time
Browse files Browse the repository at this point in the history
  • Loading branch information
GenericDM committed Nov 22, 2023
1 parent bc75374 commit 8c5c976
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
2 changes: 2 additions & 0 deletions code/__DEFINES/colors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@
#define LIGHT_COLOR_LAVA "#C48A18"
/// Bright, non-saturated red. Leaning slightly towards pink for visibility. rgb(250, 100, 75)
#define LIGHT_COLOR_FLARE "#FA644B"
/// Vivid red. Leans a bit darker to accentuate red colors and leave other channels a bit dry. rgb(200, 25, 25)
#define LIGHT_COLOR_INTENSE_RED "#C81919"
/// Weird color, between yellow and green, very slimy. rgb(175, 200, 75)
#define LIGHT_COLOR_SLIME_LAMP "#AFC84B"
/// Extremely diluted yellow, close to skin color (for some reason). rgb(250, 225, 175)
Expand Down
12 changes: 7 additions & 5 deletions code/datums/components/weatherannouncer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
if(WEATHER_ALERT_CLEAR)
light.set_light_color(LIGHT_COLOR_GREEN)
if(WEATHER_ALERT_INCOMING)
light.set_light_color(LIGHT_COLOR_DIM_YELLOW)
light.set_light_color(LIGHT_COLOR_YELLOW)
if(WEATHER_ALERT_IMMINENT_OR_ACTIVE)
light.set_light_color(LIGHT_COLOR_INTENSE_RED)
light.update_light()
Expand All @@ -109,12 +109,14 @@
return "Error in meteorological calculation. Please report this deviation to a trained programmer."

/datum/component/weather_announcer/proc/time_till_storm()
var/list/mining_z_levels = SSmapping.levels_by_trait(ZTRAIT_MINING)
if(!length(mining_z_levels))
return // No problems if there are no mining z levels
//var/list/mining_z_levels = SSmapping.levels_by_trait(ZTRAIT_MINING)
//if(!length(mining_z_levels))
// return // No problems if there are no mining z levels
var/turf/
var/datum/weather_controller/local_weather_controller = SSmapping.get_map_zone_weather_controller


for(var/datum/weather/check_weather as anything in SSweather.processing)
for(var/datum/weather/check_weather as anything in local_weather_controller.current_weathers)
if(!check_weather.barometer_predictable || check_weather.stage == WIND_DOWN_STAGE || check_weather.stage == END_STAGE)
continue
for (var/mining_level in mining_z_levels)
Expand Down

0 comments on commit 8c5c976

Please sign in to comment.