Merge pull request #2287 from Citadel-Station-13/upstream-merge-29734

[MIRROR] Fixes certain things clearing weather overlays
2017-08-07 07:24:05 -05:00
parent 173061aa26 5d80d2df4b
commit ecb68a4ccc
1 changed files with 8 additions and 1 deletions
@@ -338,7 +338,14 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 		else
 			icon_state = "blue-red"
 	else
-		icon_state = null
+		var/weather_icon
+		for(var/V in SSweather.existing_weather)
+			var/datum/weather/W = V
+			if(src in W.impacted_areas)
+				W.update_areas()
+				weather_icon = TRUE
+		if(!weather_icon)
+			icon_state = null

 /area/space/updateicon()
 	icon_state = null