diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index c92cb5f5a76..411abf57013 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -13,6 +13,7 @@ //#define TURF_LAYER 2 //For easy recordkeeping; this is a byond define #define MID_TURF_LAYER 2.02 #define HIGH_TURF_LAYER 2.03 +#define TURF_DECAL_LAYER 2.039 //Makes turf decals appear in DM how they will look inworld. #define ABOVE_OPEN_TURF_LAYER 2.04 #define CLOSED_TURF_LAYER 2.05 #define BULLET_HOLE_LAYER 2.06 @@ -20,7 +21,6 @@ #define LATTICE_LAYER 2.2 #define DISPOSAL_PIPE_LAYER 2.3 #define GAS_PIPE_HIDDEN_LAYER 2.35 -#define TURF_DECAL_LAYER 2.39 #define WIRE_LAYER 2.4 #define WIRE_TERMINAL_LAYER 2.45 #define GAS_SCRUBBER_LAYER 2.46 diff --git a/code/datums/components/decal.dm b/code/datums/components/decal.dm index 5f8aa3e0328..e9ddfdd5fe1 100644 --- a/code/datums/components/decal.dm +++ b/code/datums/components/decal.dm @@ -4,7 +4,7 @@ var/cleanable var/mutable_appearance/pic -/datum/component/decal/Initialize(_icon, _icon_state, _dir, _cleanable=CLEAN_GOD, _color, _layer=TURF_DECAL_LAYER) +/datum/component/decal/Initialize(_icon, _icon_state, _dir, _cleanable=CLEAN_GOD, _color, _layer=TURF_LAYER) if(!isatom(parent) || !_icon || !_icon_state) . = COMPONENT_INCOMPATIBLE CRASH("A turf decal was applied incorrectly to [parent.type]: icon:[_icon ? _icon : "none"] icon_state:[_icon_state ? _icon_state : "none"]") diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm index e2f74907f49..4f824cb9e9a 100644 --- a/code/game/objects/effects/decals/decal.dm +++ b/code/game/objects/effects/decals/decal.dm @@ -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() ..() diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 4cefe2fbcf2..6d8db55ad83 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -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) ) )