511 client fix and a config to make the version warning a popup
This commit is contained in:
committed by
CitadelStationBot
parent
809951c56c
commit
ab21f8d5ed
@@ -98,6 +98,24 @@
|
||||
/turf/open/proc/update_visuals()
|
||||
var/list/new_overlay_types = tile_graphic()
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
#if DM_VERSION >= 513
|
||||
#warning 512 is stable now for sure, remove the old code
|
||||
#endif
|
||||
|
||||
#if DM_VERSION >= 512
|
||||
if (atmos_overlay_types)
|
||||
for(var/overlay in atmos_overlay_types-new_overlay_types) //doesn't remove overlays that would only be added
|
||||
vars["vis_contents"] -= overlay
|
||||
|
||||
if (new_overlay_types.len)
|
||||
if (atmos_overlay_types)
|
||||
vars["vis_contents"] += new_overlay_types - atmos_overlay_types //don't add overlays that already exist
|
||||
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)
|
||||
@@ -109,7 +127,7 @@
|
||||
add_overlay(new_overlay_types)
|
||||
|
||||
UNSETEMPTY(new_overlay_types)
|
||||
atmos_overlay_types = new_overlay_types
|
||||
src.atmos_overlay_types = new_overlay_types
|
||||
|
||||
/turf/open/proc/tile_graphic()
|
||||
. = new /list
|
||||
|
||||
Reference in New Issue
Block a user