Skip to content

Commit

Permalink
fix for harvest ball (#4003)
Browse files Browse the repository at this point in the history
  • Loading branch information
dwasint authored Oct 28, 2024
1 parent 5a195d5 commit e0aca34
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
1 change: 1 addition & 0 deletions code/__DEFINES/maps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ Always compile, always use that verb, and always make sure that it works for wha
#define WEATHER_MESSAGE_DELAY 30 SECONDS
#define ZTRAIT_DAYCYCLE "Daycycle"
#define ZTRAIT_STARLIGHT "Starlight"
#define ZTRAIT_JUSTWEATHER "WeatherOnly"
#define PARTICLEWEATHER_RAIN "weather_rain"
#define PARTICLEWEATHER_SNOW "weather_snow"
#define PARTICLEWEATHER_DUST "weather_dust"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,15 +135,23 @@ SUBSYSTEM_DEF(outdoor_effects)
fire(FALSE, TRUE)

var/daylight = FALSE
var/dark_days = FALSE
for (var/z in (SSmapping.levels_by_trait(ZTRAIT_DAYCYCLE) + SSmapping.levels_by_trait(ZTRAIT_STARLIGHT)))
if(SSmapping.level_trait(z, ZTRAIT_JUSTWEATHER))
dark_days = TRUE
continue
if(SSmapping.level_trait(z, ZTRAIT_DAYCYCLE))
daylight = TRUE
continue

if(!daylight)
if(!daylight && !dark_days)
for(var/datum/time_of_day/listed_time as anything in time_cycle_steps)
listed_time.color = GLOB.starlight_color

if(dark_days)
for(var/datum/time_of_day/listed_time as anything in time_cycle_steps)
listed_time.color = COLOR_BLACK

return SS_INIT_SUCCESS

/datum/controller/subsystem/outdoor_effects/proc/InitializeTurfs()
Expand Down

0 comments on commit e0aca34

Please sign in to comment.