shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3856 from Citadel-Station-13/upstream-merge-32466

Browse Source 
[MIRROR] Fixes turf_decal layering
This commit is contained in:
LetterJay
2017-11-08 02:21:13 -06:00
committed by GitHub
parent 1abde42c7a 88e7e8d2cb
commit 448326cd60
4 changed files with 59 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/decal.dm
+1
View File
@@ -20,6 +20,7 @@
/obj/effect/turf_decal
icon = 'icons/turf/decals.dmi'
icon_state = "warningline"
layer = TURF_DECAL_LAYER
/obj/effect/turf_decal/Initialize()
..()
code/game/turfs/simulated/walls.dm
+4 -4
View File
@@ -29,12 +29,12 @@
var/static/list/dent_decal_list = list(
WALL_DENT_HIT = list(
mutable_appearance('icons/effects/effects.dmi', "impact1", TURF_DECAL_LAYER),
mutable_appearance('icons/effects/effects.dmi', "impact2", TURF_DECAL_LAYER),
mutable_appearance('icons/effects/effects.dmi', "impact3", TURF_DECAL_LAYER)
mutable_appearance('icons/effects/effects.dmi', "impact1", BULLET_HOLE_LAYER),
mutable_appearance('icons/effects/effects.dmi', "impact2", BULLET_HOLE_LAYER),
mutable_appearance('icons/effects/effects.dmi', "impact3", BULLET_HOLE_LAYER)
),
WALL_DENT_SHOT = list(
mutable_appearance('icons/effects/effects.dmi', "bullet_hole", TURF_DECAL_LAYER)
mutable_appearance('icons/effects/effects.dmi', "bullet_hole", BULLET_HOLE_LAYER)
)
)