more save points

2017-12-29 00:07:36 -06:00
parent b759da8c63
commit 8a792d6ef6
40 changed files with 4 additions and 283 deletions
@@ -41,11 +41,7 @@
 /obj/item/clothing/glasses/proc/thermal_overload()
 	if(ishuman(src.loc))
 		var/mob/living/carbon/human/H = src.loc
-<<<<<<< HEAD
-		if(!(H.disabilities & BLIND))
-=======
 		if(!(H.has_disability(DISABILITY_BLIND)))
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 			if(H.glasses == src)
 				to_chat(H, "<span class='danger'>[src] overloads and blinds you!</span>")
 				H.flash_act(visual = 1)