From 3c76b482417850267164c1a4cd8e43d30091a40b Mon Sep 17 00:00:00 2001
From: Alexshreds <brandon_courtney@aol.com>
Date: Wed, 7 Jun 2017 12:50:00 -0500
Subject: [PATCH 1/2] vision

---
 .../datums/diseases/advance/symptoms/vision.dm | 18 ++++++++++--------
 paradise.dme                                   |  1 +
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/code/datums/diseases/advance/symptoms/vision.dm b/code/datums/diseases/advance/symptoms/vision.dm
index 2d7fb9467df..473fefff86f 100644
--- a/code/datums/diseases/advance/symptoms/vision.dm
+++ b/code/datums/diseases/advance/symptoms/vision.dm
@@ -29,22 +29,24 @@ Bonus
 	..()
 	if(prob(SYMPTOM_ACTIVATION_PROB))
 		var/mob/living/M = A.affected_mob
+		var/obj/item/organ/internal/eyes/eyes = M.get_int_organ(/obj/item/organ/internal/eyes)
 		switch(A.stage)
 			if(1, 2)
 				to_chat(M, "<span class='warning'>Your eyes itch.</span>")
 			if(3, 4)
 				to_chat(M, "<span class='warning'><b>Your eyes burn!</b></span>")
-				M.blur_eyes(10)
-				M.adjust_eye_damage(1)
+				M.SetEyeBlurry(20)
+				eyes.take_damage(1)
 			else
 				to_chat(M, "<span class='userdanger'>Your eyes burn horrificly!</span>")
-				M.blur_eyes(20)
-				M.adjust_eye_damage(5)
-				if(M.eye_damage >= 10)
-					M.become_nearsighted()
-					if(prob(M.eye_damage - 10 + 1))
-						if(M.become_blind())
+				M.SetEyeBlurry(30)
+				eyes.take_damage(5)
+				if(eyes.damage >= 10)
+					M.BecomeNearsighted()
+					if(prob(eyes.damage - 10 + 1))
+						if(M.BecomeBlind())
 							to_chat(M, "<span class='userdanger'>You go blind!</span>")
+	return
 
 
 /*
diff --git a/paradise.dme b/paradise.dme
index 869bffe601b..0c0b64180a0 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -277,6 +277,7 @@
 #include "code\datums\diseases\advance\symptoms\stimulant.dm"
 #include "code\datums\diseases\advance\symptoms\symptoms.dm"
 #include "code\datums\diseases\advance\symptoms\viral.dm"
+#include "code\datums\diseases\advance\symptoms\vision.dm"
 #include "code\datums\diseases\advance\symptoms\voice_change.dm"
 #include "code\datums\diseases\advance\symptoms\vomit.dm"
 #include "code\datums\diseases\advance\symptoms\weakness.dm"

From c0e435d8d3532c3eb8920ba0fd0a863042cdfdec Mon Sep 17 00:00:00 2001
From: Alexshreds <brandon_courtney@aol.com>
Date: Wed, 7 Jun 2017 13:59:16 -0500
Subject: [PATCH 2/2] no eyes no problem

---
 code/datums/diseases/advance/symptoms/vision.dm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/datums/diseases/advance/symptoms/vision.dm b/code/datums/diseases/advance/symptoms/vision.dm
index 473fefff86f..b5249e11740 100644
--- a/code/datums/diseases/advance/symptoms/vision.dm
+++ b/code/datums/diseases/advance/symptoms/vision.dm
@@ -28,25 +28,26 @@ Bonus
 /datum/symptom/visionloss/Activate(datum/disease/advance/A)
 	..()
 	if(prob(SYMPTOM_ACTIVATION_PROB))
-		var/mob/living/M = A.affected_mob
+		var/mob/living/carbon/M = A.affected_mob
 		var/obj/item/organ/internal/eyes/eyes = M.get_int_organ(/obj/item/organ/internal/eyes)
+		if(!eyes) //NO EYES, NO PROBLEM! Rip out your eyes today to prevent future blindness!
+			return
 		switch(A.stage)
 			if(1, 2)
 				to_chat(M, "<span class='warning'>Your eyes itch.</span>")
 			if(3, 4)
 				to_chat(M, "<span class='warning'><b>Your eyes burn!</b></span>")
-				M.SetEyeBlurry(20)
+				M.EyeBlurry(20)
 				eyes.take_damage(1)
 			else
 				to_chat(M, "<span class='userdanger'>Your eyes burn horrificly!</span>")
-				M.SetEyeBlurry(30)
+				M.EyeBlurry(30)
 				eyes.take_damage(5)
 				if(eyes.damage >= 10)
 					M.BecomeNearsighted()
 					if(prob(eyes.damage - 10 + 1))
 						if(M.BecomeBlind())
 							to_chat(M, "<span class='userdanger'>You go blind!</span>")
-	return
 
 
 /*