cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 15:47:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes weather getting stuck and not affecting mobs (#90691)

Browse Source 
## About The Pull Request

Weather subsystem code mixed up defines and indexes resulting in broken
behavior when you only had mobs and thunder defined in a subsystem.
Solved this by converting currentpart from define to active task index

Closes #90677

## Changelog
🆑
fix: Ash storms do damage again
/🆑
This commit is contained in:
SmArtKar
2025-04-29 18:03:35 -06:00
committed by Shadow-Quill
parent 1bd3ac3d3e
commit e14634872e
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/weather.dm
+6 -6
View File
@@ -17,7 +17,7 @@ SUBSYSTEM_DEF(weather)
if(!length(weather_event.subsystem_tasks) || weather_event.stage != MAIN_STAGE)
continue
if(weather_event.currentpart == SSWEATHER_MOBS)
if(weather_event.subsystem_tasks[weather_event.task_index] == SSWEATHER_MOBS)
if(!resumed)
weather_event.current_mobs = GLOB.mob_living_list.Copy()
var/list/current_mobs_cache = weather_event.current_mobs // cache for performance
@@ -31,9 +31,9 @@ SUBSYSTEM_DEF(weather)
if(MC_TICK_CHECK)
return
resumed = FALSE
weather_event.currentpart = weather_event.subsystem_tasks[WRAP_UP(weather_event.currentpart, weather_event.subsystem_tasks.len)]
weather_event.task_index = WRAP_UP(weather_event.task_index, weather_event.subsystem_tasks.len)
if(weather_event.currentpart == SSWEATHER_TURFS)
if(weather_event.subsystem_tasks[weather_event.task_index] == SSWEATHER_TURFS)
if(!resumed)
weather_event.turf_iteration = ROUND_PROB(weather_event.weather_turfs_per_tick)
while(weather_event.turf_iteration)
@@ -44,9 +44,9 @@ SUBSYSTEM_DEF(weather)
if(MC_TICK_CHECK)
return
resumed = FALSE
weather_event.currentpart = weather_event.subsystem_tasks[WRAP_UP(weather_event.currentpart, weather_event.subsystem_tasks.len)]
weather_event.task_index = WRAP_UP(weather_event.task_index, weather_event.subsystem_tasks.len)
if(weather_event.currentpart == SSWEATHER_THUNDER)
if(weather_event.subsystem_tasks[weather_event.task_index] == SSWEATHER_THUNDER)
if(!resumed)
weather_event.thunder_iteration = ROUND_PROB(weather_event.thunder_turfs_per_tick)
while(weather_event.thunder_iteration)
@@ -57,7 +57,7 @@ SUBSYSTEM_DEF(weather)
if(MC_TICK_CHECK)
return
resumed = FALSE
weather_event.currentpart = weather_event.subsystem_tasks[WRAP_UP(weather_event.currentpart, weather_event.subsystem_tasks.len)]
weather_event.task_index = WRAP_UP(weather_event.task_index, weather_event.subsystem_tasks.len)
// start random weather on relevant levels
for(var/z in eligible_zlevels)