Revert "Revert "Upgrades Planetary Weather to vis_contents (#5170)""

This commit is contained in:
Aronai Sieyes
2018-06-01 20:35:28 -04:00
committed by GitHub
parent e04212d616
commit 40b1a56bdc
6 changed files with 16 additions and 36 deletions

View File

@@ -84,9 +84,6 @@ var/image/no_ceiling_image = null
if(!isnull(burnt) && (flooring.flags & TURF_CAN_BURN))
add_overlay(get_flooring_overlay("[flooring.icon_base]-burned-[burnt]","burned[burnt]")) // VOREStation Edit - Eris overlays
if(weather_overlay)
add_overlay(weather_overlay)
if(update_neighbors)
for(var/turf/simulated/floor/F in range(src, 1))
if(F == src)

View File

@@ -7,8 +7,6 @@ var/list/outdoor_turfs = list()
var/edge_blending_priority = 0
// Outdoors var determines if the game should consider the turf to be 'outdoors', which controls certain things such as weather effects.
var/outdoors = FALSE
// This holds the image for the current weather effect.
var/image/weather_overlay = null
/turf/simulated/floor/outdoors
name = "generic ground"
@@ -32,7 +30,7 @@ var/list/outdoor_turfs = list()
/turf/simulated/floor/Destroy()
if(outdoors)
planet_controller.unallocateTurf(src)
..()
return ..()
/turf/simulated/proc/make_outdoors()
outdoors = TRUE
@@ -44,20 +42,14 @@ var/list/outdoor_turfs = list()
planet_controller.unallocateTurf(src)
else // This is happening during map gen, if there's no planet_controller (hopefully).
outdoor_turfs -= src
if(weather_overlay)
cut_overlay(weather_overlay)
qdel_null(weather_overlay)
update_icon()
/turf/simulated/post_change()
..()
// If it was outdoors and still is, it will not get added twice when the planet controller gets around to putting it in.
if(outdoors)
make_outdoors()
// outdoor_turfs += src
else
make_indoors()
// planet_controller.unallocateTurf(src)
/turf/simulated/proc/update_icon_edge()
if(edge_blending_priority)

View File

@@ -39,7 +39,6 @@
var/old_dynamic_lighting = dynamic_lighting
var/old_affecting_lights = affecting_lights
var/old_lighting_overlay = lighting_overlay
var/old_weather_overlay = weather_overlay
var/old_corners = corners
//world << "Replacing [src.type] with [N]"
@@ -58,9 +57,6 @@
if(old_fire)
fire = old_fire
if(old_weather_overlay)
W.weather_overlay = old_weather_overlay
if (istype(W,/turf/simulated/floor))
W.RemoveLattice()
@@ -85,9 +81,6 @@
if(old_fire)
old_fire.RemoveFire()
if(old_weather_overlay)
W.weather_overlay = old_weather_overlay
if(tell_universe)
universe.OnTurfChange(W)