[Ready Again]Refactors disabilities into lists, allowing for independent disability sources

code/modules/spells/spell_types/construct_spells.dm

@@ -209,12 +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")
 	addtimer(CALLBACK(src, .proc/cure_blindness, target), 40)
 	target.bodytemperature -= 200
 
 /obj/effect/proc_holder/spell/targeted/abyssal_gaze/proc/cure_blindness(mob/target)
-	target.adjust_blindness(-5)
+	if(isliving(target))
+		var/mob/living/L = target
+		L.cure_blind(BLIND, "abyssal_gaze")
 
 /obj/effect/proc_holder/spell/targeted/dominate
 	name = "Dominate"

code/modules/spells/spell_types/genetic.dm

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /obj/effect/proc_holder/spell/targeted/genetic
 	name = "Genetic"
 	desc = "This spell inflicts a set of mutations and disabilities upon the target."
@@ -23,10 +24,39 @@
 		for(var/A in mutations)
 			target.dna.add_mutation(A)
 		target.disabilities |= disabilities
+=======
+/obj/effect/proc_holder/spell/targeted/genetic
+	name = "Genetic"
+	desc = "This spell inflicts a set of mutations and disabilities upon the target."
+
+	var/list/disabilities = list() //disabilities
+	var/list/mutations = list() //mutation strings
+	var/duration = 100 //deciseconds
+	/*
+		Disabilities
+			1st bit - ?
+			2nd bit - ?
+			3rd bit - ?
+			4th bit - ?
+			5th bit - ?
+			6th bit - ?
+	*/
+
+/obj/effect/proc_holder/spell/targeted/genetic/cast(list/targets,mob/user = usr)
+	playMagSound()
+	for(var/mob/living/carbon/target in targets)
+		if(!target.dna)
+			continue
+		for(var/A in mutations)
+			target.dna.add_mutation(A)
+		for(var/A in disabilities)
+			target.add_disability(A, GENETICS_SPELL)
+>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055)
 		addtimer(CALLBACK(src, .proc/remove, target), duration)
 
 /obj/effect/proc_holder/spell/targeted/genetic/proc/remove(mob/living/carbon/target)
 	if(!QDELETED(target))
 		for(var/A in mutations)
 			target.dna.remove_mutation(A)
-		target.disabilities &= ~disabilities
+		for(var/A in disabilities)
+			target.remove_disability(A, GENETICS_SPELL)