Merge branch 'patch-3' into 'pregmod-master'

adds error handle to weather

See merge request !8068

src/uncategorized/weather.tw

@@ -33,6 +33,9 @@
 <<set $weatherRemaining = random (3,6)>>
 <</if>>
 
+<<if $weatherLastWeek == 0>>
+<<set $weatherLastWeek = 1>>
+<</if>>
 
 <<set _seed = random(1,10)>>
 <<if $weatherType == 1>>