From 4adbd0fbf43d7aa53f25a4a9459409dff90e6c1b Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 2 Jan 2018 15:46:51 -0600 Subject: [PATCH] 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