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
@@ -30,11 +30,7 @@
 		holder.update_icon()

 /obj/item/device/assembly/flash/proc/clown_check(mob/living/carbon/human/user)
-<<<<<<< HEAD
-	if(user.disabilities & CLUMSY && prob(50))
-=======
 	if(user.has_disability(DISABILITY_CLUMSY) && prob(50))
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		flash_carbon(user, user, 15, 0)
 		return 0
 	return 1