more save points

2017-12-29 00:07:36 -06:00
parent b759da8c63
commit 8a792d6ef6
40 changed files with 4 additions and 283 deletions
@@ -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)