Prefixed all disability defines with DISABILITY_ to fix a name collision

code/modules/surgery/bodyparts/bodyparts.dm

@@ -217,7 +217,11 @@
 		C = owner
 		no_update = 0
 
+<<<<<<< HEAD
 	if(C.disabilities & HUSK)
+=======
+	if(C.has_disability(DISABILITY_HUSK))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		species_id = "husk" //overrides species_id
 		dmg_overlay_type = "" //no damage overlay shown when husked
 		should_draw_gender = FALSE

code/modules/surgery/bodyparts/head.dm

@@ -61,7 +61,11 @@
 		C = owner
 
 	real_name = C.real_name
+<<<<<<< HEAD
 	if(C.disabilities & HUSK)
+=======
+	if(C.has_disability(DISABILITY_HUSK))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		real_name = "Unknown"
 		hair_style = "Bald"
 		facial_hair_style = "Shaved"

code/modules/surgery/lipoplasty.dm

@@ -4,7 +4,11 @@
 	possible_locs = list("chest")
 
 /datum/surgery/lipoplasty/can_start(mob/user, mob/living/carbon/target)
+<<<<<<< HEAD
 	if(target.disabilities & FAT)
+=======
+	if(target.has_disability(DISABILITY_FAT))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		return 1
 	return 0
 

code/modules/surgery/organs/ears.dm

@@ -25,7 +25,11 @@
 		return
 	var/mob/living/carbon/C = owner
 	// genetic deafness prevents the body from using the ears, even if healthy
+<<<<<<< HEAD
 	if(C.disabilities & DEAF)
+=======
+	if(C.has_disability(DISABILITY_DEAF))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		deaf = max(deaf, 1)
 	else
 		if(C.ears && (C.ears.flags_2 & HEALS_EARS_2))
@@ -42,7 +46,11 @@
 
 	var/mob/living/carbon/C = owner
 
+<<<<<<< HEAD
 	if(iscarbon(owner) && C.disabilities & DEAF)
+=======
+	if(iscarbon(owner) && C.has_disability(DISABILITY_DEAF))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		deaf = 1
 
 /obj/item/organ/ears/proc/adjustEarDamage(ddmg, ddeaf)