From bae882bf46f6d9a7ed44be4db862c0d2731e1975 Mon Sep 17 00:00:00 2001
From: XDTM <heliumt@yahoo.it>
Date: Tue, 2 Jan 2018 15:22:09 +0100
Subject: [PATCH] Fixes Abyssal Gaze blinding forever

---
 code/__DEFINES/stat.dm                              | 7 +++++--
 code/modules/spells/spell_types/construct_spells.dm | 6 +++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/code/__DEFINES/stat.dm b/code/__DEFINES/stat.dm
index ecb3fcc611..96dceb6db2 100644
--- a/code/__DEFINES/stat.dm
+++ b/code/__DEFINES/stat.dm
@@ -25,8 +25,6 @@
 // common disability sources
 #define EYE_DAMAGE "eye_damage"
 #define GENETIC_MUTATION "genetic"
-#define STATUE_MUTE "statue"
-#define CHANGELING_DRAIN "drain"
 #define OBESITY "obesity"
 #define MAGIC_DISABILITY "magic"
 #define STASIS_MUTE "stasis"
@@ -34,6 +32,11 @@
 #define TRAUMA_DISABILITY "trauma"
 #define CHEMICAL_DISABILITY "chemical"
 
+// unique disability sources, still defines
+#define STATUE_MUTE "statue"
+#define CHANGELING_DRAIN "drain"
+#define ABYSSAL_GAZE_BLIND "abyssal_gaze"
+
 // bitflags for machine stat variable
 #define BROKEN		1
 #define NOPOWER		2
diff --git a/code/modules/spells/spell_types/construct_spells.dm b/code/modules/spells/spell_types/construct_spells.dm
index eca4990290..b4e3d43272 100644
--- a/code/modules/spells/spell_types/construct_spells.dm
+++ b/code/modules/spells/spell_types/construct_spells.dm
@@ -209,14 +209,18 @@
 	to_chat(target, "<span class='userdanger'>A freezing darkness surrounds you...</span>")
 	target.playsound_local(get_turf(target), 'sound/hallucinations/i_see_you1.ogg', 50, 1)
 	user.playsound_local(get_turf(user), 'sound/effects/ghost2.ogg', 50, 1)
+<<<<<<< HEAD
 	target.adjust_blindness(5)
+=======
+	target.become_blind(ABYSSAL_GAZE_BLIND)
+>>>>>>> b85776f... Fixes Abyssal Gaze (#34003)
 	addtimer(CALLBACK(src, .proc/cure_blindness, target), 40)
 	target.bodytemperature -= 200
 
 /obj/effect/proc_holder/spell/targeted/abyssal_gaze/proc/cure_blindness(mob/target)
 	if(isliving(target))
 		var/mob/living/L = target
-		L.cure_blind(DISABILITY_BLIND, "abyssal_gaze")
+		L.cure_blind(ABYSSAL_GAZE_BLIND)
 
 /obj/effect/proc_holder/spell/targeted/dominate
 	name = "Dominate"