progress, just need to fiddle with footprints again
This commit is contained in:
@@ -138,7 +138,7 @@
|
||||
|
||||
if(iscarbon(AM))
|
||||
var/mob/living/carbon/C = AM
|
||||
for(var/bluhduh in GLOB.blood_types[blood_id])
|
||||
for(var/datum/reagent/blood/bluhduh in GLOB.blood_types[blood_id])
|
||||
if(blood_id == C.get_blood_id())//both mobs have the same blood substance
|
||||
if(bluhduh) //actual blood reagent
|
||||
if(blood_data["viruses"])
|
||||
@@ -171,7 +171,7 @@
|
||||
return
|
||||
|
||||
/mob/living/carbon/get_blood_data(blood_id)
|
||||
for(var/bluhduh in GLOB.blood_types[blood_id])
|
||||
for(var/datum/reagent/blood/bluhduh in GLOB.blood_types[blood_id])
|
||||
if(bluhduh) //actual blood reagent
|
||||
var/blood_data = list()
|
||||
//set the blood data
|
||||
@@ -183,6 +183,7 @@
|
||||
blood_data["viruses"] += D.Copy()
|
||||
|
||||
blood_data["blood_DNA"] = copytext(dna.unique_enzymes,1,0)
|
||||
blood_data["bloodcolor"] = bloodtype_to_color(dna.blood_type)
|
||||
if(disease_resistances && disease_resistances.len)
|
||||
blood_data["resistances"] = disease_resistances.Copy()
|
||||
var/list/temp_chem = list()
|
||||
@@ -201,7 +202,6 @@
|
||||
if(!suiciding)
|
||||
blood_data["cloneable"] = 1
|
||||
blood_data["blood_type"] = copytext(dna.blood_type,1,0)
|
||||
blood_data["bloodcolor"] = bloodtype_to_color(dna.blood_type)
|
||||
blood_data["gender"] = gender
|
||||
blood_data["real_name"] = real_name
|
||||
blood_data["features"] = dna.features
|
||||
@@ -234,7 +234,8 @@
|
||||
return dna.species.exotic_blood
|
||||
else if((NOBLOOD in dna.species.species_traits) || (has_trait(TRAIT_NOCLONE)))
|
||||
return null
|
||||
return "blood"
|
||||
else
|
||||
return "blood"
|
||||
|
||||
// This is has more potential uses, and is probably faster than the old proc.
|
||||
/proc/get_safe_blood(bloodtype)
|
||||
|
||||
@@ -45,6 +45,8 @@
|
||||
|
||||
var/blood_state = BLOOD_STATE_NOT_BLOODY
|
||||
var/list/blood_smear = list(BLOOD_STATE_BLOOD = 0, BLOOD_STATE_OIL = 0, BLOOD_STATE_NOT_BLOODY = 0)
|
||||
var/last_bloodtype = ""//used to track the last bloodtype to have graced this smelly person. for smears on the floor
|
||||
var/last_blood_DNA = ""//same as last one
|
||||
|
||||
var/name_override //For temporary visible name changes
|
||||
|
||||
|
||||
@@ -66,10 +66,7 @@
|
||||
FP.blood_state = S.blood_state
|
||||
FP.entered_dirs |= dir
|
||||
FP.bloodiness = S.bloody_shoes[S.blood_state]
|
||||
FP.color = blood_DNA_to_color() //Color the blood with our dna stuff
|
||||
if(S.last_blood_DNA && S.last_bloodtype)
|
||||
FP.blood_DNA += list(S.last_blood_DNA = S.last_bloodtype)
|
||||
//hacky as heck; we need to move the LAST entry to there, otherwise we mix all the blood
|
||||
FP.color = bloodtype_to_color(S.last_bloodtype)
|
||||
FP.update_icon()
|
||||
update_inv_shoes()
|
||||
//End bloody footprints
|
||||
@@ -112,8 +109,7 @@
|
||||
FP.blood_state = blood_state
|
||||
FP.entered_dirs |= dir
|
||||
FP.bloodiness = blood_smear - BLOOD_LOSS_IN_SPREAD
|
||||
FP.transfer_blood_dna(blood_DNA)
|
||||
FP.color = blood_DNA_to_color() //Color the blood with our dna stuff
|
||||
FP.color = bloodtype_to_color(last_bloodtype)
|
||||
FP.update_icon()
|
||||
|
||||
else //we're on the floor, smear some stuff around
|
||||
@@ -133,8 +129,7 @@
|
||||
FP.blood_state = blood_state
|
||||
FP.entered_dirs |= dir
|
||||
FP.bloodiness = blood_smear - BLOOD_LOSS_IN_SPREAD
|
||||
FP.transfer_blood_dna(blood_DNA)
|
||||
FP.color = blood_DNA_to_color() //Color the blood with our dna stuff
|
||||
FP.color = bloodtype_to_color(last_bloodtype)
|
||||
FP.update_icon()
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user