Prefixed all disability defines with DISABILITY_ to fix a name collision

code/game/objects/items/stunbaton.dm

@@ -108,7 +108,11 @@
 	add_fingerprint(user)
 
 /obj/item/melee/baton/attack(mob/M, mob/living/carbon/human/user)
+<<<<<<< HEAD
 	if(status && user.disabilities & CLUMSY && prob(50))
+=======
+	if(status && user.has_disability(DISABILITY_CLUMSY) && prob(50))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		user.visible_message("<span class='danger'>[user] accidentally hits themself with [src]!</span>", \
 							"<span class='userdanger'>You accidentally hit yourself with [src]!</span>")
 		user.Knockdown(stunforce*3)