Update medicine_reagents.dm

2017-10-16 07:53:50 -05:00
parent 1bf50d3b89
commit 448e2d9448
1 changed files with 0 additions and 4 deletions
@@ -671,11 +671,7 @@
 	taste_description = "dull toxin"

 /datum/reagent/medicine/oculine/on_mob_life(mob/living/M)
-<<<<<<< HEAD
-	var/obj/item/organ/eyes/eyes = M.getorganslot("eyes_sight")
-=======
 	var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES)
->>>>>>> 04c05d8... Adds defines for organ slots (#31737)
 	if (!eyes)
 		return
 	if(M.disabilities & BLIND)