save point - a lot of shit to fix

2017-12-27 07:03:40 -06:00
parent 164db7ae9b c84a8cc9e1
commit 2e6b034493
39 changed files with 11 additions and 588 deletions
@@ -302,11 +302,7 @@
 			unwield()
 			return
 	..()
-<<<<<<< HEAD
-	if(user.disabilities & CLUMSY && (wielded) && prob(40))
-=======
 	if(user.has_disability(DISABILITY_CLUMSY) && (wielded) && prob(40))
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		impale(user)
 		return
 	if((wielded) && prob(50))