Replace get blood type with set blood type

code/datums/dna.dm

@@ -109,7 +109,7 @@
 		return
 	destination.dna.unique_enzymes = unique_enzymes
 	destination.dna.unique_identity = unique_identity
-	destination.dna.human_blood_type = human_blood_type
+	destination.dna.set_human_blood_type(human_blood_type)
 	destination.dna.unique_features = unique_features
 	destination.dna.features = features.Copy()
 	destination.dna.real_name = real_name
@@ -126,7 +126,7 @@
 	new_dna.default_mutation_genes = default_mutation_genes
 	new_dna.unique_identity = unique_identity
 	new_dna.unique_features = unique_features
-	new_dna.human_blood_type = human_blood_type
+	new_dna.set_human_blood_type(human_blood_type)
 	new_dna.features = features.Copy()
 	//if the new DNA has a holder, transform them immediately, otherwise save it
 	if(new_dna.holder)
@@ -481,7 +481,7 @@
  */
 /datum/dna/proc/initialize_dna(newblood_type = random_human_blood_type(), create_mutation_blocks = TRUE, randomize_features = TRUE) // NON-MODULE CHANGE
 	if(newblood_type)
-		human_blood_type = newblood_type
+		set_human_blood_type(newblood_type)
 	if(create_mutation_blocks) //I hate this
 		generate_dna_blocks(mutation_blacklist = list(/datum/mutation/human/headless))
 	if(randomize_features)
@@ -494,6 +494,18 @@
 
 	update_dna_identity()
 
+/// Updates human blood type and updates the holder's blood type if the holder is human
+/datum/dna/proc/set_human_blood_type(new_type, update = TRUE)
+	var/datum/blood_type/found = find_blood_type(new_type)
+	if(!found)
+		CRASH("Tried to set blood type to an invalid blood type [new_type]")
+	var/found_key = found.type_key()
+	if(human_blood_type == found_key)
+		return
+	human_blood_type = found_key
+	if(istype(holder.blood_type, /datum/blood_type/crew/human))
+		holder.set_blood_type(new_type, update)
+
 /datum/dna/stored //subtype used by brain mob's stored_dna
 
 /datum/dna/stored/add_mutation(mutation_name) //no mutation changes on stored dna.
@@ -594,7 +606,7 @@
 		dna.generate_unique_enzymes()
 
 	if(newblood_type)
-		dna.human_blood_type = newblood_type
+		dna.set_human_blood_type(newblood_type)
 
 	if(unique_identity)
 		dna.unique_identity = unique_identity
@@ -621,6 +633,7 @@
 	if(!dna.species)
 		var/rando_race = pick(get_selectable_species())
 		dna.species = new rando_race()
+	initial_blood_type = dna.human_blood_type
 
 //proc used to update the mob's appearance after its dna UI has been changed
 /mob/living/carbon/proc/updateappearance(icon_update=1, mutcolor_update=0, mutations_overlay_update=0)

code/datums/quirks/negative_quirks/blood_deficiency.dm

@@ -46,7 +46,7 @@
 
 	mail_goodies.Cut()
 
-	var/datum/blood_type/new_type = quirk_holder.get_blood_type()
+	var/datum/blood_type/new_type = quirk_holder.blood_type
 	if(isnull(new_type))
 		return
 

code/datums/records/manifest.dm

@@ -118,7 +118,7 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new)
 
 	var/datum/record/locked/lockfile = new(
 		age = person.age,
-		blood_type = "[person.get_blood_type() || "None"]", // NON-MODULE CHANGE / NEEDS TESTING
+		blood_type = "[person.blood_type || "None"]", // NON-MODULE CHANGE / NEEDS TESTING
 		character_appearance = character_appearance,
 		dna_string = record_dna.unique_enzymes,
 		fingerprint = md5(record_dna.unique_identity),
@@ -135,7 +135,7 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new)
 
 	new /datum/record/crew(
 		age = person.age,
-		blood_type = "[person.get_blood_type() || "None"]", // NON-MODULE CHANGE / NEEDS TESTING
+		blood_type = "[person.blood_type || "None"]", // NON-MODULE CHANGE / NEEDS TESTING
 		character_appearance = character_appearance,
 		dna_string = record_dna.unique_enzymes,
 		fingerprint = md5(record_dna.unique_identity),

code/game/atom/_atom.dm

@@ -503,19 +503,20 @@
 
 ///returns the mob's dna info as a list, to be inserted in an object's blood_DNA list
 /mob/living/proc/get_blood_dna_list()
-	var/datum/blood_type/blood = get_blood_type()
-	if(!isnull(blood))
-		return list("UNKNOWN DNA" = blood.type_key())
-	return null
+	if(!has_blood())
+		return null
+	return list("UNKNOWN DNA" = blood_type.type_key())
 
 ///Get the mobs dna list
 /mob/living/carbon/get_blood_dna_list()
-	if(isnull(dna)) // Xenos
+	if(isnull(dna)) // ???
 		return ..()
-	var/datum/blood_type/blood = get_blood_type()
-	if(isnull(blood)) // Skeletons?
+	if(!has_blood())
 		return null
-	return list("[dna.unique_enzymes]" = blood.type_key())
+	return list("[dna.unique_enzymes]" = blood_type.type_key())
+
+/mob/living/carbon/alien/get_blood_dna_list()
+	return list("UNKNOWN ALIEN DNA" = blood_type.type_key())
 
 // NON-MODULE CHANGE END
 

code/game/atom/atom_examine.dm

@@ -279,7 +279,7 @@
 			if(iscarbon(old_wearer))
 				var/mob/living/carbon/carbon_wearer = old_wearer
 				id_species ||= carbon_wearer.dna.species.name
-				id_blood_type ||= find_blood_type(carbon_wearer.dna?.species?.exotic_bloodtype || carbon_wearer.dna?.human_blood_type)?.name
+				id_blood_type ||= "[find_blood_type(carbon_wearer.dna?.species?.exotic_bloodtype || carbon_wearer.dna?.human_blood_type || random_human_blood_type())]"
 
 		var/id_examine = span_slightly_larger(separator_hr("This is <em>[old_wearer]'s ID card</em>."))
 		id_examine += "<div class='img_by_text_container'>"

code/game/machinery/computer/dna_console.dm

@@ -1770,7 +1770,7 @@
 			scanner_occupant.real_name = buffer_slot["name"]
 			scanner_occupant.name = buffer_slot["name"]
 			scanner_occupant.dna.unique_enzymes = buffer_slot["UE"]
-			scanner_occupant.dna.human_blood_type = find_blood_type(buffer_slot["blood_type"]).type_key()
+			scanner_occupant.dna.set_human_blood_type(buffer_slot["blood_type"])
 			scanner_occupant.apply_status_effect(/datum/status_effect/genetic_damage, damage_increase)
 			scanner_occupant.domutcheck()
 			return TRUE
@@ -1788,7 +1788,7 @@
 			scanner_occupant.real_name = buffer_slot["name"]
 			scanner_occupant.name = buffer_slot["name"]
 			scanner_occupant.dna.unique_enzymes = buffer_slot["UE"]
-			scanner_occupant.dna.human_blood_type = find_blood_type(buffer_slot["blood_type"]).type_key()
+			scanner_occupant.dna.set_human_blood_type(buffer_slot["blood_type"])
 			scanner_occupant.apply_status_effect(/datum/status_effect/genetic_damage, damage_increase)
 			scanner_occupant.domutcheck()
 			return TRUE

code/game/machinery/computer/operating_computer.dm

@@ -202,7 +202,7 @@
 	data["patient"]["health"] = patient.health
 
 	// check here to see if the patient has standard blood reagent, or special blood (like how ethereals bleed liquid electricity) to show the proper name in the computer
-	data["patient"]["blood_type"] = "[patient.get_blood_type() || "None"]" // NON-MODULE CHANGE
+	data["patient"]["blood_type"] = "[patient.blood_type || "None"]" // NON-MODULE CHANGE
 	data["patient"]["maxHealth"] = patient.maxHealth
 	data["patient"]["minHealth"] = -1 * patient.maxHealth
 	data["patient"]["bruteLoss"] = patient.getBruteLoss()

code/game/machinery/computer/records/medical.dm

@@ -140,7 +140,7 @@
 		return FALSE
 
 	target.age = 18
-	target.blood_type = "[find_blood_type(random_human_blood_type())]" // NON-MODULE CHANGE
+	target.blood_type = "O-" // NON-MODULE CHANGE
 	target.dna_string = "Unknown"
 	target.gender = "Unknown"
 	target.major_disabilities = ""

code/game/machinery/medical_kiosk.dm

@@ -237,7 +237,7 @@
 	var/bleed_status = "Patient is not currently bleeding."
 	var/blood_status = " Patient either has no blood, or does not require it to function."
 	var/blood_percent = round((patient.blood_volume / BLOOD_VOLUME_NORMAL)*100)
-	var/blood_type = "[patient.get_blood_type() || "None"]" // NON-MODULE CHANGE
+	var/blood_type = "[patient.blood_type || "None"]" // NON-MODULE CHANGE
 	var/blood_warning = " "
 	var/blood_alcohol = patient.get_blood_alcohol_content()
 

code/game/objects/effects/decals/cleanable/aliens.dm

@@ -14,7 +14,7 @@
 
 /obj/effect/decal/cleanable/xenoblood/Initialize(mapload)
 	. = ..()
-	add_blood_DNA(list("UNKNOWN DNA" = /datum/blood_type/xenomorph)) // NON-MODULE CHANGE
+	add_blood_DNA(list("UNKNOWN ALIEN DNA" = /datum/blood_type/xenomorph)) // NON-MODULE CHANGE
 
 /obj/effect/decal/cleanable/xenoblood/xsplatter
 	random_icon_states = list("xgibbl1", "xgibbl2", "xgibbl3", "xgibbl4", "xgibbl5")

code/game/objects/effects/decals/cleanable/humans.dm

@@ -37,7 +37,7 @@
 /obj/effect/decal/cleanable/blood/Initialize(mapload, list/datum/disease/diseases)
 	. = ..()
 	if(mapload)
-		add_blood_DNA(list("UNKNOWN DNA" = random_human_blood_type()))
+		add_blood_DNA(list("UNKNOWN HUMAN DNA" = random_human_blood_type()))
 	if(dried)
 		dry()
 	else if(can_dry)
@@ -683,17 +683,17 @@
 /// Subtype which has random DNA baked in OUTSIDE of mapload.
 /// For testing, mapping, or badmins
 /obj/effect/decal/cleanable/blood/pre_dna
-	var/list/dna_types = list("UNKNOWN DNA A" = /datum/blood_type/crew/human/a_minus)
+	var/list/dna_types = list("UNKNOWN HUMAN DNA" = /datum/blood_type/crew/human/a_minus)
 
 /obj/effect/decal/cleanable/blood/pre_dna/Initialize(mapload)
 	. = ..()
 	add_blood_DNA(dna_types)
 
 /obj/effect/decal/cleanable/blood/pre_dna/lizard
-	dna_types = list("UNKNOWN DNA A" = /datum/blood_type/crew/lizard)
+	dna_types = list("UNKNOWN TIZIRAN DNA" = /datum/blood_type/crew/lizard)
 
 /obj/effect/decal/cleanable/blood/pre_dna/lizhuman
-	dna_types = list("UNKNOWN DNA A" = /datum/blood_type/crew/human/a_minus, "UNKNOWN DNA B" = /datum/blood_type/crew/lizard)
+	dna_types = list("UNKNOWN HUMAN DNA" = /datum/blood_type/crew/human/a_minus, "UNKNOWN TIZIRAN DNA" = /datum/blood_type/crew/lizard)
 
 /obj/effect/decal/cleanable/blood/pre_dna/ethereal
-	dna_types = list("UNKNOWN DNA A" = /datum/blood_type/crew/ethereal)
+	dna_types = list("UNKNOWN ETHEREAL DNA" = /datum/blood_type/crew/ethereal)

code/game/objects/effects/spawners/gibspawner.dm

@@ -39,7 +39,7 @@
 		dna_to_add = temp_mob.get_blood_dna_list()
 		qdel(temp_mob)
 	else
-		dna_to_add = list("UNKNOWN DNA" = random_human_blood_type()) //else, generate a random bloodtype for it. // NON-MODULE CHANGE
+		dna_to_add = list("UNKNOWN HUMAN DNA" = random_human_blood_type()) //else, generate a random bloodtype for it. // NON-MODULE CHANGE
 
 
 	for(var/i in 1 to gibtypes.len)

code/game/objects/items/devices/scanners/autopsy_scanner.dm

@@ -92,7 +92,7 @@
 		else
 			autopsy_information += "Severe burns.</br>"
 	else if(!HAS_TRAIT(scanned, TRAIT_NOBLOOD))
-		autopsy_information += "Blood Type: [scanned.get_blood_type() || "None"]<br>"
+		autopsy_information += "Blood Type: [scanned.blood_type || "None"]<br>"
 		autopsy_information += "Blood Volume: [scanned.blood_volume] cl ([round((scanned.blood_volume / BLOOD_VOLUME_NORMAL) * 100)]%) <br>"
 
 	for(var/datum/disease/diseases as anything in scanned.diseases)

code/game/objects/items/devices/scanners/health_analyzer.dm

@@ -370,8 +370,8 @@
 		render_list += "<span class='info ml-1'>[body_temperature_message]</span><br>"
 
 	// Blood Level
-	var/datum/blood_type/target_blood_type = target.get_blood_type()
-	if(target_blood_type)
+	var/datum/blood_type/target_blood_type = target.blood_type
+	if(target_blood_type && target.has_blood())
 		var/bpm = target.get_bpm()
 		var/needs_heart = TRUE
 		if(ishuman(target))

code/game/objects/items/dna_injector.dm

@@ -59,7 +59,7 @@
 			target.real_name = fields["name"]
 			target.dna.unique_enzymes = fields["UE"]
 			target.name = target.real_name
-			target.dna.human_blood_type = find_blood_type(fields["blood_type"]).type_key()
+			target.dna.set_human_blood_type(fields["blood_type"], update = (!fields["UI"] && !fields["UF"])) // only cause an update if we're not gonna do one later
 		if(fields["UI"]) //UI+UE
 			target.dna.unique_identity = merge_text(target.dna.unique_identity, fields["UI"])
 		if(fields["UF"])
@@ -136,7 +136,7 @@
 			target.real_name = fields["name"]
 			target.dna.unique_enzymes = fields["UE"]
 			target.name = target.real_name
-			target.dna.human_blood_type = find_blood_type(fields["blood_type"]).type_key()
+			target.dna.set_human_blood_type(fields["blood_type"], update = (!fields["UI"] && !fields["UF"])) // only cause an update if we're not gonna do one later
 			target.dna.temporary_mutations[UE_CHANGED] = endtime
 		if(fields["UI"]) //UI+UE
 			if(!target.dna.previous["UI"])

code/modules/admin/verbs/list_exposer.dm

@@ -33,7 +33,7 @@
 	for(var/entry in GLOB.human_list)
 		var/mob/living/carbon/human/subject = entry
 		if(subject.ckey)
-			data += "<tr><td>[subject]</td><td>[subject.dna.unique_enzymes]</td><td>[subject.get_blood_type()]</td></tr>" // NON-MODULE CHANGE
+			data += "<tr><td>[subject]</td><td>[subject.dna.unique_enzymes]</td><td>[subject.blood_type]</td></tr>" // NON-MODULE CHANGE
 	data += "</table>"
 	usr << browse(data, "window=DNA;size=440x410")
 

code/modules/antagonists/abductor/equipment/glands/blood.dm

@@ -16,13 +16,13 @@
 /obj/item/organ/heart/gland/blood/activate()
 	to_chat(owner, span_warning("You feel your blood heat up for a moment."))
 	new_bloodtype = get_random_reagent_id()
-	owner.dna.species.exotic_bloodtype = new_bloodtype
+	owner.set_blood_type(new_bloodtype)
 
 /obj/item/organ/heart/gland/blood/on_mob_remove(mob/living/carbon/organ_owner, special)
 	. = ..()
-	organ_owner.dna?.species?.exotic_bloodtype = initial(organ_owner.dna.species.exotic_bloodtype)
+	organ_owner.reset_blood_type()
 
 /obj/item/organ/heart/gland/blood/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags)
 	. = ..()
 	if(new_bloodtype)
-		organ_owner.dna?.species?.exotic_bloodtype = new_bloodtype
+		organ_owner.set_blood_type(new_bloodtype)

code/modules/bitrunning/antagonists/netguardian.dm

@@ -48,6 +48,7 @@
 	habitable_atmos = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	bodytemp_cold_damage_limit = TCMB
 	ai_controller = /datum/ai_controller/basic_controller/netguardian
+	initial_blood_type = /datum/blood_type/oil
 
 /mob/living/basic/netguardian/Initialize(mapload)
 	. = ..()

code/modules/detectivework/scanner.dm

@@ -142,7 +142,7 @@
 		// BUT letting players scan blood and read "There is no blood detected on the blood" is very ???
 		// So we'll just throw in a random blood type for filler
 		if(!length(blood) && istype(scanned_atom, /obj/effect/decal/cleanable/blood))
-			scanned_atom.add_blood_DNA(list("UNKNOWN DNA" = random_human_blood_type()))
+			scanned_atom.add_blood_DNA(list("UNKNOWN HUMAN DNA" = random_human_blood_type()))
 			blood = GET_ATOM_BLOOD_DNA(scanned_atom)
 
 		det_data[DETSCAN_CATEGORY_FINGERS] = GET_ATOM_FINGERPRINTS(scanned_atom)

code/modules/forensics/forensics_helpers.dm

@@ -108,7 +108,7 @@
 /obj/add_blood_DNA(list/blood_DNA_to_add)
 	if (QDELING(src))
 		return FALSE
-	if (isnull(blood_DNA_to_add))
+	if (!length(blood_DNA_to_add))
 		return FALSE
 	if (forensics)
 		forensics.inherit_new(blood_DNA = blood_DNA_to_add)

code/modules/hydroponics/grown/replicapod.dm

@@ -213,7 +213,7 @@
 
 	//if there's none: get water
 	most_plentiful_reagent ||= /datum/reagent/water
-	podman.dna.species.exotic_bloodtype = most_plentiful_reagent
+	podman.set_blood_type(most_plentiful_reagent)
 	investigate_log("[key_name(mind)] cloned as a podman via [src] in [parent]", INVESTIGATE_BOTANY)
 	parent.update_tray(user, 1)
 	return result

code/modules/mining/lavaland/megafauna_loot.dm

@@ -604,6 +604,7 @@
 	mob_biotypes = MOB_SPIRIT
 	faction = list()
 	weather_immunities = list(TRAIT_ASHSTORM_IMMUNE, TRAIT_SNOWSTORM_IMMUNE)
+	initial_blood_type = null
 	/// Blood level, used for movement and abilities in a soulscythe
 	var/blood_level = MAX_BLOOD_LEVEL
 

code/modules/mob/living/basic/basic.dm

@@ -8,6 +8,7 @@
 	living_flags = MOVES_ON_ITS_OWN
 	status_flags = CANPUSH
 	fire_stack_decay_rate = -5 // Reasonably fast as NPCs will not usually actively extinguish themselves
+	initial_blood_type = /datum/blood_type/animal
 
 	var/basic_mob_flags = NONE
 

code/modules/mob/living/basic/blob_minions/blob_mob.dm

@@ -17,6 +17,7 @@
 	lighting_cutoff_green = 40
 	lighting_cutoff_blue = 30
 	initial_language_holder = /datum/language_holder/empty
+	initial_blood_type = /datum/blood_type/animal/blob
 
 /mob/living/basic/blob_minion/Initialize(mapload)
 	. = ..()

code/modules/mob/living/basic/bots/_bots.dm

@@ -40,6 +40,7 @@ GLOBAL_LIST_INIT(command_strings, list(
 	light_range = 3
 	light_power = 0.6
 	speed = 3
+	initial_blood_type = /datum/blood_type/oil
 	///Access required to access this Bot's maintenance protocols
 	var/maints_access_required = list(ACCESS_ROBOTICS)
 	interaction_flags_click = ALLOW_SILICON_REACH

code/modules/mob/living/basic/clown/clown.dm

@@ -43,6 +43,8 @@
 	var/waddles = TRUE
 
 /mob/living/basic/clown/Initialize(mapload)
+	if(check_holidays(APRIL_FOOLS))
+		initial_blood_type = /datum/blood_type/clown
 	. = ..()
 	AddElement(/datum/element/footstep, footstep_type = FOOTSTEP_MOB_SHOE)
 	AddComponent(/datum/component/ai_retaliate_advanced, CALLBACK(src, PROC_REF(retaliate_callback)))

code/modules/mob/living/basic/cult/constructs/_construct.dm

@@ -23,6 +23,7 @@
 	response_harm_continuous = "punches"
 	response_harm_simple = "punch"
 	melee_attack_cooldown = CLICK_CD_MELEE
+	initial_blood_type = null
 
 	// Vivid red, cause cult theme
 	lighting_cutoff_red = 30

code/modules/mob/living/basic/cult/shade.dm

@@ -27,6 +27,7 @@
 	faction = list(FACTION_CULT)
 	basic_mob_flags = DEL_ON_DEATH
 	initial_language_holder = /datum/language_holder/construct
+	initial_blood_type = null
 	/// Theme controls color. THEME_CULT is red THEME_WIZARD is purple and THEME_HOLY is blue
 	var/theme = THEME_CULT
 	/// The different flavors of goop shades can drop, depending on theme.

code/modules/mob/living/basic/drone/_drone.dm

@@ -47,6 +47,7 @@
 	lighting_cutoff_red = 30
 	lighting_cutoff_green = 35
 	lighting_cutoff_blue = 25
+	initial_blood_type = /datum/blood_type/oil
 
 	can_be_held = TRUE
 	worn_slot_flags = ITEM_SLOT_HEAD

code/modules/mob/living/basic/farm_animals/bee/_bee.dm

@@ -46,6 +46,7 @@
 	habitable_atmos = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	basic_mob_flags = DEL_ON_DEATH
 	ai_controller = /datum/ai_controller/basic_controller/bee
+	initial_blood_type = /datum/blood_type/animal/bug
 	///the reagent the bee has
 	var/datum/reagent/beegent = null
 	///the house we live in