This commit is contained in:
Segrain
2014-02-22 06:53:37 +03:00
parent c6d39deac0
commit ef3b565f64
4 changed files with 14 additions and 7 deletions

View File

@@ -268,10 +268,12 @@
if(H.belt)
if(H.belt.clean_blood())
H.update_inv_belt(0)
H.clean_blood(washshoes)
else
if(M.wear_mask) //if the mob is not human, it cleans the mask without asking for bitflags
if(M.wear_mask.clean_blood())
M.update_inv_wear_mask(0)
M.clean_blood()
else
O.clean_blood()
@@ -413,4 +415,4 @@
/obj/structure/sink/puddle/attackby(obj/item/O as obj, mob/user as mob)
icon_state = "puddle-splash"
..()
icon_state = "puddle"
icon_state = "puddle"

View File

@@ -47,7 +47,7 @@
if(!dna)
dna = new /datum/dna(null)
dna.species=species.name
dna.species=species.name
for(var/i=0;i<7;i++) // 2 for medHUDs and 5 for secHUDs
hud_list += image('icons/mob/hud.dmi', src, "hudunknown")
@@ -1113,10 +1113,12 @@
verbs += /mob/living/carbon/human/proc/bloody_doodle
return 1 //we applied blood to the item
/mob/living/carbon/human/clean_blood()
/mob/living/carbon/human/clean_blood(var/clean_feet)
.=..()
if(istype(feet_blood_DNA, /list) && feet_blood_DNA.len)
if(clean_feet && !shoes && istype(feet_blood_DNA, /list) && feet_blood_DNA.len)
feet_blood_color = null
del(feet_blood_DNA)
update_inv_shoes(1)
return 1
/mob/living/carbon/human/get_visible_implants(var/class = 0)
@@ -1193,7 +1195,7 @@
if(!new_species)
new_species = dna.species
else
dna.species = new_species
dna.species = new_species
if(species && (species.name && species.name == new_species))
return

View File

@@ -1189,7 +1189,7 @@
if(cleaned_human.shoes)
cleaned_human.shoes.clean_blood()
cleaned_human.update_inv_shoes(0)
cleaned_human.clean_blood()
cleaned_human.clean_blood(1)
cleaned_human << "\red [src] cleans your face!"
return

View File

@@ -962,6 +962,9 @@ datum
if(H.shoes)
if(H.shoes.clean_blood())
H.update_inv_shoes(0)
else
H.clean_blood(1)
return
M.clean_blood()
leporazine
@@ -3696,4 +3699,4 @@ datum
return
// Undefine the alias for REAGENTS_EFFECT_MULTIPLER
#undef REM
#undef REM