finally actually fixes the blood decals

This commit is contained in:
paprka
2015-02-01 00:29:37 -08:00
parent 0b64a23310
commit d6dce069f4
2 changed files with 10 additions and 11 deletions
@@ -18,13 +18,13 @@
/obj/effect/decal/cleanable/blood/New()
..()
remove_ex_blood()
/obj/effect/decal/cleanable/blood/proc/remove_ex_blood() //removes existant blood on the turf
if(src.loc && isturf(src.loc))
for(var/obj/effect/decal/cleanable/blood/B in src.loc)
if(B != src)
qdel(B)
if(src.type == /obj/effect/decal/cleanable/blood)
if(src.loc && isturf(src.loc))
for(var/obj/effect/decal/cleanable/blood/B in src.loc)
if(B != src)
if (B.blood_DNA)
blood_DNA |= B.blood_DNA.Copy()
qdel(B)
/obj/effect/decal/cleanable/blood/splatter
random_icon_states = list("gibbl1", "gibbl2", "gibbl3", "gibbl4", "gibbl5")
@@ -61,9 +61,6 @@
/obj/effect/decal/cleanable/blood/gibs/ex_act(severity, target)
return
/obj/effect/decal/cleanable/blood/gibs/remove_ex_blood()
return
/obj/effect/decal/cleanable/blood/gibs/up
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6","gibup1","gibup1","gibup1")
@@ -95,8 +92,9 @@
break
/obj/effect/decal/cleanable/blood/drip
name = "drip of blood"
name = "drips of blood"
desc = "It's red."
gender = PLURAL
icon = 'icons/effects/drip.dmi'
icon_state = "1"
random_icon_states = list("1","2","3","4","5")
@@ -258,6 +258,7 @@ proc/blood_incompatible(donor,receiver,donor_species,receiver_species)
return 0
proc/blood_splatter(var/target,var/datum/reagent/blood/source,var/large)
var/obj/effect/decal/cleanable/blood/B
var/decal_type = /obj/effect/decal/cleanable/blood/splatter
var/turf/T = get_turf(target)