fixes xeno species bleeding

This commit is contained in:
TalkingCactus
2016-08-23 20:25:04 -04:00
parent 101699b7b7
commit 9377971623
2 changed files with 6 additions and 4 deletions
@@ -10,7 +10,7 @@
icon_state = "xfloor1"
random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
var/list/viruses = list()
blood_DNA = list("UNKNOWN DNA" = "X*")
blood_DNA = list()
bloodiness = MAX_SHOE_BLOODINESS
blood_state = BLOOD_STATE_XENO
@@ -82,10 +82,12 @@
name = "drips of blood"
desc = "It's green."
gender = PLURAL
icon = 'icons/effects/blood.dmi'
icon_state = "1"
random_icon_states = list("xdrip1","xdrip2","xdrip3","xdrip4","xdrip5")
bloodiness = 0
var/drips = 1
blood_DNA = list()
/obj/effect/decal/cleanable/xdrip/can_bloodcrawl_in()
return 1
+3 -3
View File
@@ -230,7 +230,7 @@
// Only a certain number of drips (or one large splatter) can be on a given turf.
if(ishuman(src))
var/mob/living/carbon/human/H = src
if(H.dna.species == "xeno")
if(H.dna.species.id == "xeno")
var/obj/effect/decal/cleanable/xdrip/xdrop = locate() in T
if(xdrop)
if(xdrop.drips < 3)
@@ -240,7 +240,7 @@
return
else
temp_blood_DNA = list()
temp_blood_DNA |= xdrop.blood_DNA.Copy() //we transfer the dna from the drip to the splatter
temp_blood_DNA |= xdrop.blood_DNA.Copy()
qdel(xdrop)//the drip is replaced by a bigger splatter
else
xdrop = new(T)
@@ -268,7 +268,7 @@
if(!B)
if(ishuman(src))
var/mob/living/carbon/human/H = src
if(H.dna.species == "xeno")
if(H.dna.species.id == "xeno")
B = new /obj/effect/decal/cleanable/xenoblood(T)
else
B = new /obj/effect/decal/cleanable/blood/splatter(T)