From 5d902525cf275b4a893ec875ab41532f7cdab80e Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sun, 29 Dec 2013 02:47:46 +1030 Subject: [PATCH] Fixed up human and xeno blood procs, stopped gibs being shaded until we can rewrite them to work with blood colour. --- code/game/objects/effects/decals/Cleanable/aliens.dm | 3 +-- code/game/objects/effects/decals/Cleanable/humans.dm | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/objects/effects/decals/Cleanable/aliens.dm b/code/game/objects/effects/decals/Cleanable/aliens.dm index d84d2f53200..957369f3bf6 100644 --- a/code/game/objects/effects/decals/Cleanable/aliens.dm +++ b/code/game/objects/effects/decals/Cleanable/aliens.dm @@ -7,10 +7,9 @@ /obj/effect/decal/cleanable/blood/gibs/xeno name = "xeno gibs" desc = "Gnarly..." - gender = PLURAL - icon = 'icons/effects/blood.dmi' icon_state = "xgib1" random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6") + basecolor = "#05EE05" /obj/effect/decal/cleanable/blood/gibs/xeno/up random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6","xgibup1","xgibup1","xgibup1") diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 779fb86a5e7..789d57eb44e 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -139,9 +139,9 @@ var/global/list/image/splatter_cache=list() random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6") /obj/effect/decal/cleanable/blood/gibs/update_icon() - overlays.Cut() - ..() - overlays += image(icon, src, "[icon_state]_flesh") + //overlays.Cut() + //..() + //overlays += image(icon, src, "[icon_state]_flesh") /obj/effect/decal/cleanable/blood/gibs/up random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6","gibup1","gibup1","gibup1") @@ -167,6 +167,7 @@ var/global/list/image/splatter_cache=list() if (i > 0) var/obj/effect/decal/cleanable/blood/b = new /obj/effect/decal/cleanable/blood/splatter(src.loc) b.basecolor = src.basecolor + b.update_icon() for(var/datum/disease/D in src.viruses) var/datum/disease/ND = D.Copy(1) b.viruses += ND