Skip to content

Commit

Permalink
bugfix: Blood and cleanables are now rendered upon stone tiles (#4905)
Browse files Browse the repository at this point in the history
  • Loading branch information
Vladisvell authored Apr 18, 2024
1 parent 33fa560 commit 6057dc2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions code/__DEFINES/layers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
#define TURF_PLATING_DECAL_LAYER 2.031
#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 CLEANABLES_LAYER 2.045
#define CLOSED_TURF_LAYER 2.05
#define BULLET_HOLE_LAYER 2.06
#define ABOVE_NORMAL_TURF_LAYER 2.08
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/decals/Cleanable/humans.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
gender = PLURAL
density = FALSE
anchored = TRUE
layer = TURF_LAYER
layer = CLEANABLES_LAYER
plane = GAME_PLANE
icon = 'icons/effects/blood.dmi'
icon_state = "mfloor1"
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/effects/decals/cleanable.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
var/list/random_icon_states = list()
var/bloodiness = 0 //0-100, amount of blood in this decal, used for making footprints and affecting the alpha of bloody footprints
var/mergeable_decal = TRUE //when two of these are on a same tile or do we need to merge them into just one?
layer = CLEANABLES_LAYER

/obj/effect/decal/cleanable/proc/replace_decal(obj/effect/decal/cleanable/C) // Returns true if we should give up in favor of the pre-existing decal
if(mergeable_decal)
Expand Down

0 comments on commit 6057dc2

Please sign in to comment.