diff --git a/code/datums/game_masters/other_game_masters.dm b/code/datums/game_masters/other_game_masters.dm index ab8bb727f7..489c359ace 100644 --- a/code/datums/game_masters/other_game_masters.dm +++ b/code/datums/game_masters/other_game_masters.dm @@ -5,6 +5,8 @@ var/list/weighted_events = list() for(var/E in ticker.available_events) var/datum/event2/meta/event = E + if(!event.enabled) + continue weighted_events[event] = event.get_weight() var/datum/event2/meta/choice = pickweight(weighted_events) @@ -31,7 +33,7 @@ var/list/weighted_events = list() for(var/E in ticker.available_events) var/datum/event2/meta/event = E - if(!E.enabled) + if(!event.enabled) continue weighted_events[event] = event.get_weight() + (event.chaos * 2) @@ -39,4 +41,4 @@ if(choice) log_game_master("[choice.name] was chosen, and is now being ran.") - return choice \ No newline at end of file + return choice