From 6e1a7ddd553792732ba1f90a2e8eb35ab2f20f0c Mon Sep 17 00:00:00 2001
From: joep van der velden <joepvelden@hotmail.com>
Date: Tue, 2 Oct 2018 23:06:38 +0200
Subject: [PATCH 1/2] The cure procs for the disabilities now cure the gene as
 well

---
 code/modules/mob/living/status_procs.dm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm
index b8d432d5609..6a46b9b4354 100644
--- a/code/modules/mob/living/status_procs.dm
+++ b/code/modules/mob/living/status_procs.dm
@@ -472,6 +472,8 @@
 /mob/living/proc/CureBlind()
 	var/val_change = !!(disabilities & BLIND)
 	disabilities &= ~BLIND
+	src.CureIfHasDisability(BLINDBLOCK)
+	
 	if(val_change)
 		update_blind_effects()
 
@@ -482,6 +484,7 @@
 
 /mob/living/proc/CureCoughing()
 	disabilities &= ~COUGHING
+	src.CureIfHasDisability(COUGHBLOCK)
 
 // Deaf
 
@@ -490,6 +493,7 @@
 
 /mob/living/proc/CureDeaf()
 	disabilities &= ~DEAF
+	src.CureIfHasDisability(DEAFBLOCK)
 
 // Epilepsy
 
@@ -498,6 +502,7 @@
 
 /mob/living/proc/CureEpilepsy()
 	disabilities &= ~EPILEPSY
+	src.CureIfHasDisability(EPILEPSYBLOCK)
 
 // Mute
 
@@ -506,6 +511,7 @@
 
 /mob/living/proc/CureMute()
 	disabilities &= ~MUTE
+	src.CureIfHasDisability(MUTEBLOCK)
 
 // Nearsighted
 
@@ -518,6 +524,7 @@
 /mob/living/proc/CureNearsighted()
 	var/val_change = !!(disabilities & NEARSIGHTED)
 	disabilities &= ~NEARSIGHTED
+	src.CureIfHasDisability(GLASSESBLOCK)
 	if(val_change)
 		update_nearsighted_effects()
 
@@ -528,6 +535,7 @@
 
 /mob/living/proc/CureNervous()
 	disabilities &= ~NERVOUS
+	src.CureIfHasDisability(NERVOUSBLOCK)
 
 // Tourettes
 
@@ -536,3 +544,10 @@
 
 /mob/living/proc/CureTourettes()
 	disabilities &= ~TOURETTES
+	src.CureIfHasDisability(TWITCHBLOCK)
+
+/mob/living/proc/CureIfHasDisability(block)
+	if(src.dna.GetSEState(block))
+		src.dna.SetSEState(block,0, 1)//Fix the gene
+		genemutcheck(src,block,null,MUTCHK_FORCED)
+		src.dna.UpdateSE()
\ No newline at end of file

From a837688563ee9b918de929cc64e75d0761f39a84 Mon Sep 17 00:00:00 2001
From: farie82 <joepvelden@hotmail.com>
Date: Wed, 3 Oct 2018 09:52:51 +0200
Subject: [PATCH 2/2] Update status_procs.dm

---
 code/modules/mob/living/status_procs.dm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm
index 6a46b9b4354..972a8b0d553 100644
--- a/code/modules/mob/living/status_procs.dm
+++ b/code/modules/mob/living/status_procs.dm
@@ -472,7 +472,7 @@
 /mob/living/proc/CureBlind()
 	var/val_change = !!(disabilities & BLIND)
 	disabilities &= ~BLIND
-	src.CureIfHasDisability(BLINDBLOCK)
+	CureIfHasDisability(BLINDBLOCK)
 	
 	if(val_change)
 		update_blind_effects()
@@ -484,7 +484,7 @@
 
 /mob/living/proc/CureCoughing()
 	disabilities &= ~COUGHING
-	src.CureIfHasDisability(COUGHBLOCK)
+	CureIfHasDisability(COUGHBLOCK)
 
 // Deaf
 
@@ -493,7 +493,7 @@
 
 /mob/living/proc/CureDeaf()
 	disabilities &= ~DEAF
-	src.CureIfHasDisability(DEAFBLOCK)
+	CureIfHasDisability(DEAFBLOCK)
 
 // Epilepsy
 
@@ -502,7 +502,7 @@
 
 /mob/living/proc/CureEpilepsy()
 	disabilities &= ~EPILEPSY
-	src.CureIfHasDisability(EPILEPSYBLOCK)
+	CureIfHasDisability(EPILEPSYBLOCK)
 
 // Mute
 
@@ -511,7 +511,7 @@
 
 /mob/living/proc/CureMute()
 	disabilities &= ~MUTE
-	src.CureIfHasDisability(MUTEBLOCK)
+	CureIfHasDisability(MUTEBLOCK)
 
 // Nearsighted
 
@@ -524,7 +524,7 @@
 /mob/living/proc/CureNearsighted()
 	var/val_change = !!(disabilities & NEARSIGHTED)
 	disabilities &= ~NEARSIGHTED
-	src.CureIfHasDisability(GLASSESBLOCK)
+	CureIfHasDisability(GLASSESBLOCK)
 	if(val_change)
 		update_nearsighted_effects()
 
@@ -535,7 +535,7 @@
 
 /mob/living/proc/CureNervous()
 	disabilities &= ~NERVOUS
-	src.CureIfHasDisability(NERVOUSBLOCK)
+	CureIfHasDisability(NERVOUSBLOCK)
 
 // Tourettes
 
@@ -544,10 +544,10 @@
 
 /mob/living/proc/CureTourettes()
 	disabilities &= ~TOURETTES
-	src.CureIfHasDisability(TWITCHBLOCK)
+	CureIfHasDisability(TWITCHBLOCK)
 
 /mob/living/proc/CureIfHasDisability(block)
-	if(src.dna.GetSEState(block))
-		src.dna.SetSEState(block,0, 1)//Fix the gene
-		genemutcheck(src,block,null,MUTCHK_FORCED)
-		src.dna.UpdateSE()
\ No newline at end of file
+	if(dna.GetSEState(block))
+		dna.SetSEState(block, 0, 1) //Fix the gene
+		genemutcheck(src, block,null, MUTCHK_FORCED)
+		dna.UpdateSE()