Merge pull request #4635 from Citadel-Station-13/upstream-merge-34003

[MIRROR] Fixes Abyssal Gaze blinding forever
This commit is contained in:
LetterJay
2018-01-02 17:13:31 -06:00
committed by GitHub
2 changed files with 8 additions and 5 deletions
@@ -209,14 +209,14 @@
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)
target.adjust_blindness(5)
target.become_blind(ABYSSAL_GAZE_BLIND)
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"
@@ -279,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
jaunt_out_type = /obj/effect/temp_visual/dir_setting/cult/phase/out