diff --git a/code/game/objects/effects/decals/cleanable/aliens.dm b/code/game/objects/effects/decals/cleanable/aliens.dm index 2b9ac1cbe1..43b2765a51 100644 --- a/code/game/objects/effects/decals/cleanable/aliens.dm +++ b/code/game/objects/effects/decals/cleanable/aliens.dm @@ -10,19 +10,13 @@ /obj/effect/decal/cleanable/blood/gibs/xeno color = BLOOD_COLOR_XENO + guts_colors = BLOOD_COLOR_XENO + racial = "alien" /obj/effect/decal/cleanable/blood/gibs/xeno/Initialize(mapload, list/datum/disease/diseases) . = ..() reagents.add_reagent("liquidxenogibs", 5) -/obj/effect/decal/cleanable/blood/gibs/xeno/update_icon() - if(gib_overlay) - var/icon/blood = new(icon,"[icon_state]",dir) - var/image/gibz = new(icon, icon_state + "x-overlay") - blood.Blend(blood_DNA_to_color(),ICON_MULTIPLY) - gibz.appearance_flags = RESET_COLOR - add_overlay(gibz) - /obj/effect/decal/cleanable/blood/gibs/xeno/streak(list/directions) set waitfor = 0 var/direction = pick(directions) diff --git a/code/game/objects/effects/decals/cleanable/gibs.dm b/code/game/objects/effects/decals/cleanable/gibs.dm index 55ad9b4551..f5b87de9b9 100644 --- a/code/game/objects/effects/decals/cleanable/gibs.dm +++ b/code/game/objects/effects/decals/cleanable/gibs.dm @@ -8,7 +8,7 @@ var/gib_overlay = FALSE var/body_colors = "#e3ba84" //a default color just in case. var/guts_colors = "#4c276d" - var/racial = "c" + var/racial = "carbon" /obj/effect/decal/cleanable/blood/gibs/Initialize(mapload, list/datum/disease/diseases) . = ..() @@ -24,9 +24,9 @@ colorlist[index] = colorlist[index]/255 cut_overlays() if(gib_overlay) - var/mutable_appearance/gibs = new(icon, "[icon_state]_[racial]_[gib_overlay]") + var/image/gibs = image(icon, "[icon_state]_[racial]_[gib_overlay]") gibs.color = colorlist - add_overlay(gibs) + icon_state = gibs /obj/effect/decal/cleanable/blood/gibs/ex_act(severity, target) return diff --git a/icons/effects/blood.dmi b/icons/effects/blood.dmi index 09576e9f1b..0ec32d43c9 100644 Binary files a/icons/effects/blood.dmi and b/icons/effects/blood.dmi differ diff --git a/icons/effects/blood_to_convert.dmi b/icons/effects/blood_to_convert.dmi new file mode 100644 index 0000000000..f1bd580880 Binary files /dev/null and b/icons/effects/blood_to_convert.dmi differ