From 36cbe323cda7c558ebe8bc7d755bde1e0c4dab34 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 2 Jan 2018 15:48:09 -0600
Subject: [PATCH] Update vision.dm

---
 .../diseases/advance/symptoms/vision.dm       | 65 -------------------
 1 file changed, 65 deletions(-)

diff --git a/code/datums/diseases/advance/symptoms/vision.dm b/code/datums/diseases/advance/symptoms/vision.dm
index 44305203fe..7c54aa7ea4 100644
--- a/code/datums/diseases/advance/symptoms/vision.dm
+++ b/code/datums/diseases/advance/symptoms/vision.dm
@@ -68,69 +68,4 @@ Bonus
 						eyes.Remove(M)
 						eyes.forceMove(get_turf(M))
 				else
-<<<<<<< HEAD
 					to_chat(M, "<span class='userdanger'>Your eyes burn horrifically!</span>")
-
-
-
-/*
-//////////////////////////////////////
-
-Ocular Restoration
-
-	Noticable.
-	Lowers resistance significantly.
-	Decreases stage speed moderately..
-	Decreases transmittablity tremendously.
-	High level.
-
-Bonus
-	Restores eyesight.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/visionaid
-
-	name = "Ocular Restoration"
-	desc = "The virus stimulates the production and replacement of eye cells, causing the host to regenerate its eyes when damaged."
-	stealth = -1
-	resistance = -3
-	stage_speed = -2
-	transmittable = -4
-	level = 4
-	base_message_chance = 7
-	symptom_delay_min = 1
-	symptom_delay_max = 1
-
-/datum/symptom/visionaid/Activate(datum/disease/advance/A)
-	if(!..())
-		return
-	var/mob/living/M = A.affected_mob
-	var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES)
-	if (!eyes)
-		return
-	switch(A.stage)
-		if(4, 5) //basically oculine
-			if(M.has_disability(DISABILITY_BLIND, EYE_DAMAGE))
-				if(prob(20))
-					to_chat(M, "<span class='warning'>Your vision slowly returns...</span>")
-					M.cure_blind()
-					M.cure_nearsighted()
-					M.blur_eyes(35)
-				else if(M.has_disability(DISABILITY_NEARSIGHT, EYE_DAMAGE))
-					to_chat(M, "<span class='warning'>The blackness in your peripheral vision fades.</span>")
-					M.cure_nearsighted()
-					M.blur_eyes(10)
-				else if(M.eye_blind || M.eye_blurry)
-					M.set_blindness(0)
-					M.set_blurriness(0)
-				else if(eyes.eye_damage > 0)
-					M.adjust_eye_damage(-1)
-		else
-			if(prob(base_message_chance))
-				to_chat(M, "<span class='notice'>[pick("Your eyes feel great.", "You are now blinking manually.", "You don't feel the need to blink.")]</span>")
-	return
-=======
-					to_chat(M, "<span class='userdanger'>Your eyes burn horrifically!</span>")
->>>>>>> 52668a6... Makes some virology symptoms more worth using (#33986)