Fixes Blood Types (#12520)

This commit is contained in:
Fox McCloud
2019-10-07 23:15:54 -04:00
committed by variableundefined
parent 36e464cf7e
commit 93fa76bee0
16 changed files with 44 additions and 85 deletions
+1 -1
View File
@@ -41,7 +41,7 @@
gib.blood_DNA = list()
if(MobDNA)
gib.blood_DNA[MobDNA.unique_enzymes] = MobDNA.b_type
gib.blood_DNA[MobDNA.unique_enzymes] = MobDNA.blood_type
else if(istype(src, /obj/effect/gibspawner/xeno))
gib.blood_DNA["UNKNOWN DNA"] = "X*"
else if(istype(src, /obj/effect/gibspawner/human)) // Probably a monkey
+1 -1
View File
@@ -245,7 +245,7 @@ REAGENT SCANNER
if(H.bleed_rate)
to_chat(user, "<span class='danger'>Subject is bleeding!</span>")
var/blood_percent = round((H.blood_volume / BLOOD_VOLUME_NORMAL)*100)
var/blood_type = H.b_type
var/blood_type = H.dna.blood_type
if(blood_id != "blood")//special blood substance
var/datum/reagent/R = GLOB.chemical_reagents_list[blood_id]
if(R)
+2 -2
View File
@@ -162,7 +162,7 @@
sex = capitalize(H.gender)
age = H.age
blood_type = H.dna.b_type
blood_type = H.dna.blood_type
dna_hash = H.dna.unique_enzymes
fingerprint_hash = md5(H.dna.uni_identity)
@@ -526,7 +526,7 @@
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(H.dna)
default = H.dna.b_type
default = H.dna.blood_type
var/new_blood_type = sanitize(input(user,"What blood type would you like to be written on this card?","Agent Card Blood Type",default) as text)
if(!Adjacent(user))