Removes unexplainable second variable for human blood type (sincerely what the fuck)

code/datums/datacore.dm

@@ -72,7 +72,7 @@
 		var/datum/data/record/M = new()
 		M.fields["id"]			= id
 		M.fields["name"]		= H.real_name
-		M.fields["b_type"]		= H.b_type
+		M.fields["b_type"]		= H.dna.b_type
 		M.fields["b_dna"]		= H.dna.unique_enzymes
 		M.fields["mi_dis"]		= "None"
 		M.fields["mi_dis_d"]	= "No minor disabilities have been declared."
@@ -111,7 +111,7 @@
 		L.fields["rank"] 		= H.mind.assigned_role
 		L.fields["age"]			= H.age
 		L.fields["sex"]			= H.gender
-		L.fields["b_type"]		= H.b_type
+		L.fields["b_type"]		= H.dna.b_type
 		L.fields["b_dna"]		= H.dna.unique_enzymes
 		L.fields["enzymes"]		= H.dna.SE // Used in respawning
 		L.fields["identity"]	= H.dna.UI // "

code/game/machinery/computer/Operating.dm

@@ -62,7 +62,7 @@
 <BR>
 <B>Name:</B> [src.victim.real_name]<BR>
 <B>Age:</B> [src.victim.age]<BR>
-<B>Blood Type:</B> [src.victim.b_type]<BR>
+<B>Blood Type:</B> [src.victim.dna.b_type]<BR>
 <BR>
 <B>Health:</B> [src.victim.health]<BR>
 <B>Brute Damage:</B> [src.victim.getBruteLoss()]<BR>

code/modules/admin/topic.dm

@@ -3118,7 +3118,7 @@
 				dat += "<table cellspacing=5><tr><th>Name</th><th>DNA</th><th>Blood Type</th></tr>"
 				for(var/mob/living/carbon/human/H in mob_list)
 					if(H.dna && H.ckey)
-						dat += "<tr><td>[H]</td><td>[H.dna.unique_enzymes]</td><td>[H.b_type]</td></tr>"
+						dat += "<tr><td>[H]</td><td>[H.dna.unique_enzymes]</td><td>[H.dna.b_type]</td></tr>"
 				dat += "</table>"
 				usr << browse(dat, "window=DNA;size=440x410")
 			if("fingerprints")

code/modules/admin/verbs/randomverbs.dm

@@ -445,7 +445,6 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		new_character.real_name = record_found.fields["name"]
 		new_character.setGender(record_found.fields["sex"])
 		new_character.age = record_found.fields["age"]
-		new_character.b_type = record_found.fields["b_type"]
 	else
 		new_character.setGender(pick(MALE,FEMALE))
 		var/datum/preferences/A = new()
@@ -467,6 +466,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if(record_found)//Pull up their name from database records if they did have a mind.
 		new_character.dna = new()//Let's first give them a new DNA.
 		new_character.dna.unique_enzymes = record_found.fields["b_dna"]//Enzymes are based on real name but we'll use the record for conformity.
+		new_character.dna.b_type = record_found.fields["b_type"]
 
 		// I HATE BYOND.  HATE.  HATE. - N3X
 		var/list/newSE= record_found.fields["enzymes"]

code/modules/client/preferences.dm

@@ -1258,6 +1258,7 @@ NOTE:  The change will take effect AFTER any current recruiting periods."}
 	character.name = character.real_name
 	if(character.dna)
 		character.dna.real_name = character.real_name
+		character.dna.b_type = b_type
 
 	character.flavor_text = flavor_text
 	character.med_record = med_record
@@ -1266,7 +1267,6 @@ NOTE:  The change will take effect AFTER any current recruiting periods."}
 
 	character.setGender(gender)
 	character.age = age
-	character.b_type = b_type
 
 	character.r_eyes = r_eyes
 	character.g_eyes = g_eyes

code/modules/mob/living/carbon/human/human_defines.dm

@@ -25,7 +25,7 @@
 	mob_swap_flags = ALLMOBS
 
 	var/age = 30		//Player's age (pure fluff)
-	var/b_type = "A+"	//Player's bloodtype
+	//var/b_type = "A+"	//Player's bloodtype //NOW HANDLED IN THEIR DNA
 
 	var/underwear = 1	//Which underwear the player wants
 	var/backbag = 2		//Which backpack type the player has chosen. Nothing, Satchel or Backpack.
@@ -76,4 +76,4 @@
 
 
 	fire_dmi = 'icons/mob/OnFire.dmi'
-	fire_sprite = "Standing"
+	fire_sprite = "Standing"