Prefixed all disability defines with DISABILITY_ to fix a name collision

This commit is contained in:
Jordan Brown
2017-12-24 11:45:45 -05:00
committed by CitadelStationBot
parent 2378235f51
commit 164db7ae9b
83 changed files with 957 additions and 9 deletions
@@ -214,7 +214,13 @@
target.bodytemperature -= 200
/obj/effect/proc_holder/spell/targeted/abyssal_gaze/proc/cure_blindness(mob/target)
<<<<<<< HEAD
target.adjust_blindness(-5)
=======
if(isliving(target))
var/mob/living/L = target
L.cure_blind(DISABILITY_BLIND, "abyssal_gaze")
>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
/obj/effect/proc_holder/spell/targeted/dominate
name = "Dominate"