more save points

code/modules/reagents/chemistry/reagents/medicine_reagents.dm

@@ -667,22 +667,14 @@
 	var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES)
 	if (!eyes)
 		return
-<<<<<<< HEAD
-	if(M.disabilities & BLIND)
-=======
 	if(M.has_disability(DISABILITY_BLIND, EYE_DAMAGE))
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		if(prob(20))
 			to_chat(M, "<span class='warning'>Your vision slowly returns...</span>")
 			M.cure_blind()
 			M.cure_nearsighted()
 			M.blur_eyes(35)
 
-<<<<<<< HEAD
-	else if(M.disabilities & NEARSIGHT)
-=======
 	else if(M.has_disability(DISABILITY_NEARSIGHT, EYE_DAMAGE))
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		to_chat(M, "<span class='warning'>The blackness in your peripheral vision fades.</span>")
 		M.cure_nearsighted()
 		M.blur_eyes(10)
@@ -773,11 +765,7 @@
 			M.visible_message("<span class='warning'>[M]'s body convulses a bit, and then falls still once more.</span>")
 			return
 		M.visible_message("<span class='warning'>[M]'s body convulses a bit.</span>")
-<<<<<<< HEAD
-		if(!M.suiciding && !(M.disabilities & NOCLONE) && !M.hellbound)
-=======
 		if(!M.suiciding && !(M.has_disability(DISABILITY_NOCLONE)) && !M.hellbound)
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 			if(!M)
 				return
 			if(M.notify_ghost_cloning(source = M))

code/modules/reagents/chemistry/reagents/toxin_reagents.dm

@@ -141,11 +141,7 @@
 	taste_description = "mint"
 
 /datum/reagent/toxin/minttoxin/on_mob_life(mob/living/M)
-<<<<<<< HEAD
-	if(M.disabilities & FAT)
-=======
 	if(M.has_disability(DISABILITY_FAT))
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		M.gib()
 	return ..()