Fixing merge errors.

Testmerge ready.

code/modules/mob/living/blood.dm

@@ -46,7 +46,7 @@
 					nutrition_ratio = 0.8
 				else
 					nutrition_ratio = 1
-			if(has_trait(TRAIT_HIGH_BLOOD))
+			if(HAS_TRAIT(src, TRAIT_HIGH_BLOOD))
 				nutrition_ratio *= 1.2
 			if(satiety > 80)
 				nutrition_ratio *= 1.25
@@ -322,7 +322,7 @@
 /mob/living/proc/ResetBloodVol()
 	if(ishuman(src))
 		var/mob/living/carbon/human/H = src
-		if (src.has_trait(TRAIT_HIGH_BLOOD))
+		if (HAS_TRAIT(src, TRAIT_HIGH_BLOOD))
 			blood_ratio = 1.2
 			H.handle_blood()
 			return

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

@@ -913,13 +913,13 @@
 	return bodyparts.len > 2 && ..()
 
 /mob/living/carbon/proc/hypnosis_vulnerable()//unused atm, but added in case
-	if(src.has_trait(TRAIT_MINDSHIELD))
+	if(HAS_TRAIT(src, TRAIT_MINDSHIELD))
 		return FALSE
 	if(hallucinating())
 		return TRUE
 	if(IsSleeping())
 		return TRUE
-	if(src.has_trait(TRAIT_DUMB))
+	if(HAS_TRAIT(src, TRAIT_DUMB))
 		return TRUE
 	GET_COMPONENT_FROM(mood, /datum/component/mood, src)
 	if(mood)

code/modules/mob/living/taste.dm

@@ -48,7 +48,7 @@
 		to_chat(src, "<span class='notice'>Your tongue moves on it's own in response to the liquid.</span>")
 		say("The pH is appropriately [round(from.pH, 1)].")
 		return
-	if (!has_trait(TRAIT_AGEUSIA)) //I'll let you get away with not having 1 damage.
+	if (!HAS_TRAIT(src, TRAIT_AGEUSIA)) //I'll let you get away with not having 1 damage.
 		switch(from.pH)
 			if(11.5 to INFINITY)
 				to_chat(src, "<span class='warning'>You taste a strong alkaline flavour!</span>")