Prefixed all disability defines with DISABILITY_ to fix a name collision

code/datums/martial/sleeping_carp.dm

@@ -197,7 +197,11 @@
 
 /obj/item/twohanded/bostaff/attack(mob/target, mob/living/user)
 	add_fingerprint(user)
+<<<<<<< HEAD
 	if((CLUMSY in user.disabilities) && prob(50))
+=======
+	if((user.has_disability(DISABILITY_CLUMSY)) && prob(50))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		to_chat(user, "<span class ='warning'>You club yourself over the head with [src].</span>")
 		user.Knockdown(60)
 		if(ishuman(user))