more save points

code/modules/paperwork/contract.dm

@@ -202,11 +202,7 @@
 	if(!user.mind.hasSoul)
 		to_chat(user, "<span class='notice'>You do not possess a soul.</span>")
 		return 0
-<<<<<<< HEAD
-	if(user.disabilities & DUMB)
-=======
 	if(user.has_disability(DISABILITY_DUMB))
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		to_chat(user, "<span class='notice'>You quickly scrawl 'your name' on the contract.</span>")
 		signIncorrectly()
 		return 0

code/modules/paperwork/paper.dm

@@ -93,11 +93,7 @@
 		return
 	if(ishuman(usr))
 		var/mob/living/carbon/human/H = usr
-<<<<<<< HEAD
-		if(H.disabilities & CLUMSY && prob(25))
-=======
 		if(H.has_disability(DISABILITY_CLUMSY) && prob(25))
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 			to_chat(H, "<span class='warning'>You cut yourself on the paper! Ahhhh! Ahhhhh!</span>")
 			H.damageoverlaytemp = 9001
 			H.update_damage_hud()
@@ -321,11 +317,7 @@
 		to_chat(user, "<span class='notice'>You stamp the paper with your rubber stamp.</span>")
 
 	if(P.is_hot())
-<<<<<<< HEAD
-		if(user.disabilities & CLUMSY && prob(10))
-=======
 		if(user.has_disability(DISABILITY_CLUMSY) && prob(10))
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 			user.visible_message("<span class='warning'>[user] accidentally ignites themselves!</span>", \
 								"<span class='userdanger'>You miss the paper and accidentally light yourself on fire!</span>")
 			user.dropItemToGround(P)

code/modules/paperwork/paperplane.dm

@@ -65,11 +65,7 @@
 		update_icon()
 
 	else if(P.is_hot())
-<<<<<<< HEAD
-		if(user.disabilities & CLUMSY && prob(10))
-=======
 		if(user.has_disability(DISABILITY_CLUMSY) && prob(10))
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 			user.visible_message("<span class='warning'>[user] accidentally ignites themselves!</span>", \
 				"<span class='userdanger'>You miss [src] and accidentally light yourself on fire!</span>")
 			user.dropItemToGround(P)