Prefixed all disability defines with DISABILITY_ to fix a name collision

code/modules/mob/living/life.dm

@@ -126,7 +126,11 @@
 /mob/living/proc/handle_disabilities()
 	//Eyes
 	if(eye_blind)			//blindness, heals slowly over time
+<<<<<<< HEAD
 		if(!stat && !(disabilities & BLIND))
+=======
+		if(!stat && !(has_disability(DISABILITY_BLIND)))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 			eye_blind = max(eye_blind-1,0)
 			if(client && !eye_blind)
 				clear_alert("blind")
@@ -137,7 +141,11 @@
 		eye_blurry = max(eye_blurry-1, 0)
 		if(client && !eye_blurry)
 			clear_fullscreen("blurry")
+<<<<<<< HEAD
 	if(disabilities & PACIFISM && a_intent == INTENT_HARM)
+=======
+	if(has_disability(DISABILITY_PACIFISM) && a_intent == INTENT_HARM)
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		to_chat(src, "<span class='notice'>You don't feel like harming anybody.</span>")
 		a_intent_change(INTENT_HELP)