From bae882bf46f6d9a7ed44be4db862c0d2731e1975 Mon Sep 17 00:00:00 2001 From: XDTM Date: Tue, 2 Jan 2018 15:22:09 +0100 Subject: [PATCH 1/2] 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, "A freezing darkness surrounds you...") 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" From 4adbd0fbf43d7aa53f25a4a9459409dff90e6c1b Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 2 Jan 2018 15:46:51 -0600 Subject: [PATCH 2/2] Update construct_spells.dm --- code/modules/spells/spell_types/construct_spells.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/spells/spell_types/construct_spells.dm b/code/modules/spells/spell_types/construct_spells.dm index b4e3d43272..a88322d5ee 100644 --- a/code/modules/spells/spell_types/construct_spells.dm +++ b/code/modules/spells/spell_types/construct_spells.dm @@ -209,11 +209,7 @@ to_chat(target, "A freezing darkness surrounds you...") 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 @@ -283,4 +279,4 @@ /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/golem charge_max = 800 jaunt_in_type = /obj/effect/temp_visual/dir_setting/cult/phase - jaunt_out_type = /obj/effect/temp_visual/dir_setting/cult/phase/out \ No newline at end of file + jaunt_out_type = /obj/effect/temp_visual/dir_setting/cult/phase/out