Merge remote-tracking branch 'upstream/master' into shuttle_hijack2

This commit is contained in:
Tigercat2000
2017-02-05 07:41:14 -08:00
746 changed files with 22204 additions and 13037 deletions
+1 -1
View File
@@ -33,7 +33,7 @@ var/global/datum/controller/process/weather/weather_master
var/list/possible_weather_for_this_z = list()
for(var/V in existing_weather)
var/datum/weather/WE = V
if(WE.target_level == Z && WE.probability) //Another check so that it doesn't run extra weather
if(WE.target_z == Z && WE.probability) //Another check so that it doesn't run extra weather
possible_weather_for_this_z[WE] = WE.probability
var/datum/weather/W = pickweight(possible_weather_for_this_z)
run_weather(W.name)