cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4082 from VOREStation/upstream-merge-5439

Browse Source 
[MIRROR] Fixes layering issues for a few things
This commit is contained in:
Spades
2018-08-17 16:12:12 -04:00
committed by GitHub
parent 4ab6d7c983 fee82be379
commit 887899f50b
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/objects/structures/flora/trees.dm
View File

@@ -4,7 +4,8 @@
anchored = 1 anchored = 1
density = 1 density = 1
pixel_x = -16 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/base_state = null // Used for stumps.
var/health = 200 // Used for chopping down trees. var/health = 200 // Used for chopping down trees.
var/max_health = 200 var/max_health = 200

4
code/game/turfs/simulated/outdoors/outdoors.dm
View File

@@ -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) 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]" var/cache_key = "[T.get_edge_icon_state()]-[checkdir]"
if(!turf_edge_cache[cache_key]) 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) 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 = 0 I.plane = TURF_PLANE
turf_edge_cache[cache_key] = I turf_edge_cache[cache_key] = I
add_overlay(turf_edge_cache[cache_key]) add_overlay(turf_edge_cache[cache_key])

2
code/modules/projectiles/targeting/targeting_overlay.dm
View File

@@ -6,7 +6,7 @@
anchored = 1 anchored = 1
density = 0 density = 0
opacity = 0 opacity = 0
layer = FLY_LAYER plane = ABOVE_PLANE
simulated = 0 simulated = 0
mouse_opacity = 0 mouse_opacity = 0