Merge branch 'master' into upstream-merge-32757

code/modules/atmospherics/environmental/LINDA_turf_tile.dm

@@ -97,9 +97,8 @@
 
 /turf/open/proc/update_visuals()
 	var/list/new_overlay_types = tile_graphic()
+	var/list/atmos_overlay_types = src.atmos_overlay_types // Cache for free performance
 
-<<<<<<< HEAD
-=======
 	#if DM_VERSION >= 513
 	#warning 512 is stable now for sure, remove the old code
 	#endif
@@ -115,7 +114,6 @@
 		else
 			vars["vis_contents"] += new_overlay_types
 	#else
->>>>>>> 5941e80... 511 client fix and a config to make the version warning a popup (#32757)
 	if (atmos_overlay_types)
 		for(var/overlay in atmos_overlay_types-new_overlay_types) //doesn't remove overlays that would only be added
 			cut_overlay(overlay)
@@ -125,6 +123,7 @@
 			add_overlay(new_overlay_types - atmos_overlay_types) //don't add overlays that already exist
 		else
 			add_overlay(new_overlay_types)
+	#endif
 
 	UNSETEMPTY(new_overlay_types)
 	src.atmos_overlay_types = new_overlay_types