From 066975bad06b6208fa4b997324282a39d38d4758 Mon Sep 17 00:00:00 2001 From: Neerti Date: Tue, 24 Jul 2018 13:30:09 -0400 Subject: [PATCH] Fixes some layering issues with trees, outdoor turf edges, and the targeting indicator. --- code/game/objects/structures/flora/trees.dm | 3 ++- code/game/turfs/simulated/outdoors/outdoors.dm | 4 ++-- code/modules/projectiles/targeting/targeting_overlay.dm | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/flora/trees.dm b/code/game/objects/structures/flora/trees.dm index ef58518e489..f0a7498390f 100644 --- a/code/game/objects/structures/flora/trees.dm +++ b/code/game/objects/structures/flora/trees.dm @@ -4,7 +4,8 @@ anchored = 1 density = 1 pixel_x = -16 - layer = MOB_LAYER // You know what, let's play it safe. + plane = MOB_LAYER // You know what, let's play it safe. + layer = ABOVE_MOB_LAYER var/base_state = null // Used for stumps. var/health = 200 // Used for chopping down trees. var/max_health = 200 diff --git a/code/game/turfs/simulated/outdoors/outdoors.dm b/code/game/turfs/simulated/outdoors/outdoors.dm index 861b34d9ead..f56d5a2da36 100644 --- a/code/game/turfs/simulated/outdoors/outdoors.dm +++ b/code/game/turfs/simulated/outdoors/outdoors.dm @@ -54,8 +54,8 @@ var/list/turf_edge_cache = list() if(istype(T) && T.edge_blending_priority && edge_blending_priority < T.edge_blending_priority && icon_state != T.icon_state) var/cache_key = "[T.get_edge_icon_state()]-[checkdir]" if(!turf_edge_cache[cache_key]) - var/image/I = image(icon = 'icons/turf/outdoors_edge.dmi', icon_state = "[T.get_edge_icon_state()]-edge", dir = checkdir) - I.plane = 0 + var/image/I = image(icon = 'icons/turf/outdoors_edge.dmi', icon_state = "[T.get_edge_icon_state()]-edge", dir = checkdir, layer = ABOVE_TURF_LAYER) + I.plane = TURF_PLANE turf_edge_cache[cache_key] = I add_overlay(turf_edge_cache[cache_key]) diff --git a/code/modules/projectiles/targeting/targeting_overlay.dm b/code/modules/projectiles/targeting/targeting_overlay.dm index 00a380dedf0..76d18042654 100644 --- a/code/modules/projectiles/targeting/targeting_overlay.dm +++ b/code/modules/projectiles/targeting/targeting_overlay.dm @@ -6,7 +6,7 @@ anchored = 1 density = 0 opacity = 0 - layer = FLY_LAYER + plane = ABOVE_PLANE simulated = 0 mouse_opacity = 0