get blood id is my foe now.

This commit is contained in:
Poojawa
2019-05-08 04:53:51 -05:00
parent 69eca2ae4b
commit 5a67114d33
11 changed files with 278 additions and 61 deletions
+10 -7
View File
@@ -229,13 +229,16 @@
if(!(has_trait(TRAIT_NOCLONE)))
return "blood"
/mob/living/carbon/human/get_blood_id()
if(dna.species.exotic_blood)
return dna.species.exotic_blood
else if((NOBLOOD in dna.species.species_traits) || (has_trait(TRAIT_NOCLONE)))
return null
else
return "blood"
/mob/living/carbon/get_blood_id()
var/mob/living/carbon/human/H = src
for(var/bluhduh in GLOB.blood_types[H.dna.species.exotic_blood])
if(!bluhduh)
to_chat(world, "[H] has [H.dna.species.exotic_blood] for blood")
return H.dna.species.exotic_blood
else if((NOBLOOD in H.dna.species.species_traits) || (has_trait(TRAIT_NOCLONE)))
return null
else
return bluhduh
// This is has more potential uses, and is probably faster than the old proc.
/proc/get_safe_blood(bloodtype)
+19 -3
View File
@@ -5,10 +5,26 @@
new /obj/effect/temp_visual/dust_animation(loc, "dust-h")
/mob/living/carbon/human/spawn_gibs(with_bodyparts)
if(with_bodyparts)
new /obj/effect/gibspawner/human(drop_location(), dna, get_static_viruses())
if(isjellyperson(src))
if(with_bodyparts)
new /obj/effect/gibspawner/slimeperson(drop_location(), dna, get_static_viruses())
else
new /obj/effect/gibspawner/slimeperson/bodypartless(drop_location(), dna, get_static_viruses())
if(isipcperson(src))
new /obj/effect/gibspawner/ipc(drop_location(), dna, get_static_viruses())
if(isxenoperson(src))
if(with_bodyparts)
new /obj/effect/gibspawner/xeno(drop_location(), dna, get_static_viruses())
else
new /obj/effect/gibspawner/xeno/bodypartless(drop_location(), dna, get_static_viruses())
else
new /obj/effect/gibspawner/human/bodypartless(drop_location(), dna, get_static_viruses())
if(with_bodyparts)
new /obj/effect/gibspawner/human(drop_location(), dna, get_static_viruses())
else
new /obj/effect/gibspawner/human/bodypartless(drop_location(), dna, get_static_viruses())
/mob/living/carbon/human/spawn_dust(just_ash = FALSE)
if(just_ash)
@@ -66,7 +66,6 @@
FP.blood_state = S.blood_state
FP.entered_dirs |= dir
FP.bloodiness = S.bloody_shoes[S.blood_state]
FP.color = bloodtype_to_color(S.last_bloodtype)
FP.update_icon()
update_inv_shoes()
//End bloody footprints
@@ -109,7 +108,6 @@
FP.blood_state = blood_state
FP.entered_dirs |= dir
FP.bloodiness = blood_smear - BLOOD_LOSS_IN_SPREAD
FP.color = bloodtype_to_color(last_bloodtype)
FP.update_icon()
else //we're on the floor, smear some stuff around
@@ -129,7 +127,6 @@
FP.blood_state = blood_state
FP.entered_dirs |= dir
FP.bloodiness = blood_smear - BLOOD_LOSS_IN_SPREAD
FP.color = bloodtype_to_color(last_bloodtype)
FP.update_icon()
@@ -4,7 +4,7 @@
id = "jelly"
default_color = "00FF90"
say_mod = "chirps"
species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,NOBLOOD)
species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR)
mutant_bodyparts = list("mam_tail", "mam_ears", "mam_snouts", "taur") //CIT CHANGE
default_features = list("mcolor" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "mam_snouts" = "None", "taur" = "None") //CIT CHANGE
inherent_traits = list(TRAIT_TOXINLOVER)