Prefixed all disability defines with DISABILITY_ to fix a name collision

code/modules/assembly/flash.dm

@@ -30,7 +30,11 @@
 		holder.update_icon()
 
 /obj/item/device/assembly/flash/proc/clown_check(mob/living/carbon/human/user)
+<<<<<<< HEAD
 	if(user.disabilities & CLUMSY && prob(50))
+=======
+	if(user.has_disability(DISABILITY_CLUMSY) && prob(50))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		flash_carbon(user, user, 15, 0)
 		return 0
 	return 1

code/modules/assembly/mousetrap.dm

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /obj/item/device/assembly/mousetrap
 	name = "mousetrap"
 	desc = "A handy little spring-loaded trap for catching pesty rodents."
@@ -140,3 +141,147 @@
 /obj/item/device/assembly/mousetrap/armed
 	icon_state = "mousetraparmed"
 	armed = TRUE
+=======
+/obj/item/device/assembly/mousetrap
+	name = "mousetrap"
+	desc = "A handy little spring-loaded trap for catching pesty rodents."
+	icon_state = "mousetrap"
+	materials = list(MAT_METAL=100)
+	attachable = 1
+	var/armed = 0
+
+
+/obj/item/device/assembly/mousetrap/examine(mob/user)
+	..()
+	if(armed)
+		to_chat(user, "The mousetrap is armed!")
+	else
+		to_chat(user, "The mousetrap is not armed.")
+
+/obj/item/device/assembly/mousetrap/activate()
+	if(..())
+		armed = !armed
+		if(!armed)
+			if(ishuman(usr))
+				var/mob/living/carbon/human/user = usr
+				if((user.has_disability(DISABILITY_DUMB) || user.has_disability(DISABILITY_CLUMSY)) && prob(50))
+					to_chat(user, "<span class='warning'>Your hand slips, setting off the trigger!</span>")
+					pulse(0)
+		update_icon()
+		if(usr)
+			playsound(usr.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3)
+
+/obj/item/device/assembly/mousetrap/describe()
+	return "The pressure switch is [armed?"primed":"safe"]."
+
+/obj/item/device/assembly/mousetrap/update_icon()
+	if(armed)
+		icon_state = "mousetraparmed"
+	else
+		icon_state = "mousetrap"
+	if(holder)
+		holder.update_icon()
+
+/obj/item/device/assembly/mousetrap/proc/triggered(mob/target, type = "feet")
+	if(!armed)
+		return
+	var/obj/item/bodypart/affecting = null
+	if(ishuman(target))
+		var/mob/living/carbon/human/H = target
+		if(PIERCEIMMUNE in H.dna.species.species_traits)
+			playsound(src.loc, 'sound/effects/snap.ogg', 50, 1)
+			armed = 0
+			update_icon()
+			pulse(0)
+			return 0
+		switch(type)
+			if("feet")
+				if(!H.shoes)
+					affecting = H.get_bodypart(pick("l_leg", "r_leg"))
+					H.Knockdown(60)
+			if("l_hand", "r_hand")
+				if(!H.gloves)
+					affecting = H.get_bodypart(type)
+					H.Stun(60)
+		if(affecting)
+			if(affecting.receive_damage(1, 0))
+				H.update_damage_overlays()
+	else if(ismouse(target))
+		var/mob/living/simple_animal/mouse/M = target
+		visible_message("<span class='boldannounce'>SPLAT!</span>")
+		M.splat()
+	playsound(src.loc, 'sound/effects/snap.ogg', 50, 1)
+	armed = 0
+	update_icon()
+	pulse(0)
+
+
+/obj/item/device/assembly/mousetrap/attack_self(mob/living/carbon/human/user)
+	if(!armed)
+		to_chat(user, "<span class='notice'>You arm [src].</span>")
+	else
+		if((user.has_disability(DISABILITY_DUMB) || user.has_disability(DISABILITY_CLUMSY)) && prob(50))
+			var/which_hand = "l_hand"
+			if(!(user.active_hand_index % 2))
+				which_hand = "r_hand"
+			triggered(user, which_hand)
+			user.visible_message("<span class='warning'>[user] accidentally sets off [src], breaking their fingers.</span>", \
+								 "<span class='warning'>You accidentally trigger [src]!</span>")
+			return
+		to_chat(user, "<span class='notice'>You disarm [src].</span>")
+	armed = !armed
+	update_icon()
+	playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3)
+
+
+/obj/item/device/assembly/mousetrap/attack_hand(mob/living/carbon/human/user)
+	if(armed)
+		if((user.has_disability(DISABILITY_DUMB) || user.has_disability(DISABILITY_CLUMSY)) && prob(50))
+			var/which_hand = "l_hand"
+			if(!(user.active_hand_index % 2))
+				which_hand = "r_hand"
+			triggered(user, which_hand)
+			user.visible_message("<span class='warning'>[user] accidentally sets off [src], breaking their fingers.</span>", \
+								 "<span class='warning'>You accidentally trigger [src]!</span>")
+			return
+	..()
+
+
+/obj/item/device/assembly/mousetrap/Crossed(atom/movable/AM as mob|obj)
+	if(armed)
+		if(ismob(AM))
+			var/mob/MM = AM
+			if(!(MM.movement_type & FLYING))
+				if(ishuman(AM))
+					var/mob/living/carbon/H = AM
+					if(H.m_intent == MOVE_INTENT_RUN)
+						triggered(H)
+						H.visible_message("<span class='warning'>[H] accidentally steps on [src].</span>", \
+										  "<span class='warning'>You accidentally step on [src]</span>")
+				else if(ismouse(MM))
+					triggered(MM)
+		else if(AM.density) // For mousetrap grenades, set off by anything heavy
+			triggered(AM)
+	..()
+
+
+/obj/item/device/assembly/mousetrap/on_found(mob/finder)
+	if(armed)
+		finder.visible_message("<span class='warning'>[finder] accidentally sets off [src], breaking their fingers.</span>", \
+							   "<span class='warning'>You accidentally trigger [src]!</span>")
+		triggered(finder, (finder.active_hand_index % 2 == 0) ? "r_hand" : "l_hand")
+		return 1	//end the search!
+	return 0
+
+
+/obj/item/device/assembly/mousetrap/hitby(A as mob|obj)
+	if(!armed)
+		return ..()
+	visible_message("<span class='warning'>[src] is triggered by [A].</span>")
+	triggered(null)
+
+
+/obj/item/device/assembly/mousetrap/armed
+	icon_state = "mousetraparmed"
+	armed = 1
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind

code/modules/clothing/glasses/_glasses.dm

@@ -41,7 +41,11 @@
 /obj/item/clothing/glasses/proc/thermal_overload()
 	if(ishuman(src.loc))
 		var/mob/living/carbon/human/H = src.loc
+<<<<<<< HEAD
 		if(!(H.disabilities & BLIND))
+=======
+		if(!(H.has_disability(DISABILITY_BLIND)))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 			if(H.glasses == src)
 				to_chat(H, "<span class='danger'>[src] overloads and blinds you!</span>")
 				H.flash_act(visual = 1)

code/modules/events/disease_outbreak.dm

@@ -51,7 +51,11 @@
 		var/datum/disease/D
 		if(!advanced_virus)
 			if(virus_type == /datum/disease/dnaspread)		//Dnaspread needs strain_data set to work.
+<<<<<<< HEAD
 				if(!H.dna || (H.disabilities & BLIND))	//A blindness disease would be the worst.
+=======
+				if(!H.dna || (H.has_disability(DISABILITY_BLIND)))	//A blindness disease would be the worst.
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 					continue
 				D = new virus_type()
 				var/datum/disease/dnaspread/DS = D

code/modules/hydroponics/gene_modder.dm

@@ -45,7 +45,7 @@
 		min_wrate = FLOOR(10-wratemod,1) // 7,5,2,0	Clamps at 0 and 10	You want this low
 		min_wchance = 67-(ML.rating*16) // 48,35,19,3 	Clamps at 0 and 67	You want this low
 	for(var/obj/item/circuitboard/machine/plantgenes/vaultcheck in component_parts)
-		if(istype(vaultcheck, /obj/item/circuitboard/machine/plantgenes/vault)) // DUMB BOTANY TUTS
+		if(istype(vaultcheck, /obj/item/circuitboard/machine/plantgenes/vault)) // DISABILITY_DUMB BOTANY TUTS
 			max_potency = 100
 			max_yield = 10
 			min_production = 1

code/modules/mining/lavaland/necropolis_chests.dm

@@ -656,7 +656,11 @@
 	playsound(user, 'sound/magic/clockwork/fellowship_armory.ogg', 35, TRUE, frequency = 90000 - (active * 30000))
 
 /obj/item/melee/transforming/cleaving_saw/clumsy_transform_effect(mob/living/user)
+<<<<<<< HEAD
 	if(user.disabilities & CLUMSY && prob(50))
+=======
+	if(user.has_disability(DISABILITY_CLUMSY) && prob(50))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		to_chat(user, "<span class='warning'>You accidentally cut yourself with [src], like a doofus!</span>")
 		user.take_bodypart_damage(10)
 

code/modules/mob/living/blood.dm

@@ -16,7 +16,11 @@
 
 
 /mob/living/carbon/monkey/handle_blood()
+<<<<<<< HEAD
 	if(bodytemperature >= 225 && !(disabilities & NOCLONE)) //cryosleep or husked people do not pump the blood.
+=======
+	if(bodytemperature >= 225 && !(has_disability(DISABILITY_NOCLONE))) //cryosleep or husked people do not pump the blood.
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		//Blood regeneration if there is some space
 		if(blood_volume < BLOOD_VOLUME_NORMAL)
 			blood_volume += 0.1 // regenerate blood VERY slowly
@@ -28,7 +32,11 @@
 		bleed_rate = 0
 		return
 
+<<<<<<< HEAD
 	if(bodytemperature >= 225 && !(disabilities & NOCLONE)) //cryosleep or husked people do not pump the blood.
+=======
+	if(bodytemperature >= 225 && !(has_disability(DISABILITY_NOCLONE))) //cryosleep or husked people do not pump the blood.
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 
 		//Blood regeneration if there is some space
 		if(blood_volume < BLOOD_VOLUME_NORMAL && !(NOHUNGER in dna.species.species_traits))
@@ -201,13 +209,21 @@
 		return "blood"
 
 /mob/living/carbon/monkey/get_blood_id()
+<<<<<<< HEAD
 	if(!(disabilities & NOCLONE))
+=======
+	if(!(has_disability(DISABILITY_NOCLONE)))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		return "blood"
 
 /mob/living/carbon/human/get_blood_id()
 	if(dna.species.exotic_blood)
 		return dna.species.exotic_blood
+<<<<<<< HEAD
 	else if((NOBLOOD in dna.species.species_traits) || (disabilities & NOCLONE))
+=======
+	else if((NOBLOOD in dna.species.species_traits) || (has_disability(DISABILITY_NOCLONE)))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		return
 	return "blood"
 

code/modules/mob/living/brain/brain_item.dm

@@ -79,8 +79,13 @@
 		if(!brainmob.stored_dna)
 			brainmob.stored_dna = new /datum/dna/stored(brainmob)
 		C.dna.copy_dna(brainmob.stored_dna)
+<<<<<<< HEAD
 		if(L.disabilities & NOCLONE)
 			brainmob.disabilities |= NOCLONE	//This is so you can't just decapitate a husked guy and clone them without needing to get a new body
+=======
+		if(L.has_disability(DISABILITY_NOCLONE))
+			brainmob.disabilities[DISABILITY_NOCLONE] = L.disabilities[DISABILITY_NOCLONE]
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		var/obj/item/organ/zombie_infection/ZI = L.getorganslot(ORGAN_SLOT_ZOMBIE)
 		if(ZI)
 			brainmob.set_species(ZI.old_species)	//For if the brain is cloned

code/modules/mob/living/brain/status_procs.dm

@@ -1,6 +1,6 @@
 //Here are the procs used to modify status effects of a mob.
 //The effects include: stun, knockdown, unconscious, sleeping, resting, jitteriness, dizziness
-// eye damage, eye_blind, eye_blurry, druggy, BLIND disability, and NEARSIGHT disability.
+// eye damage, eye_blind, eye_blurry, druggy, DISABILITY_BLIND disability, and DISABILITY_NEARSIGHT disability.
 
 /////////////////////////////////// EYE_BLIND ////////////////////////////////////
 

code/modules/mob/living/carbon/alien/status_procs.dm

@@ -1,6 +1,6 @@
 //Here are the procs used to modify status effects of a mob.
 //The effects include: stun, knockdown, unconscious, sleeping, resting, jitteriness, dizziness, ear damage,
-// eye damage, eye_blind, eye_blurry, druggy, BLIND disability, and NEARSIGHT disability.
+// eye damage, eye_blind, eye_blurry, druggy, DISABILITY_BLIND disability, and DISABILITY_NEARSIGHT disability.
 
 /////////////////////////////////// STUN ////////////////////////////////////
 

code/modules/mob/living/carbon/carbon.dm

@@ -157,7 +157,11 @@
 			if(!throwable_mob.buckled)
 				thrown_thing = throwable_mob
 				stop_pulling()
+<<<<<<< HEAD
 				if(disabilities & PACIFISM)
+=======
+				if(has_disability(DISABILITY_PACIFISM))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 					to_chat(src, "<span class='notice'>You gently let go of [throwable_mob].</span>")
 				var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors
 				var/turf/end_T = get_turf(target)
@@ -170,7 +174,11 @@
 		thrown_thing = I
 		dropItemToGround(I)
 
+<<<<<<< HEAD
 		if(disabilities & PACIFISM && I.throwforce)
+=======
+		if(has_disability(DISABILITY_PACIFISM) && I.throwforce)
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 			to_chat(src, "<span class='notice'>You set [I] down gently on the ground.</span>")
 			return
 
@@ -409,7 +417,11 @@
 	dropItemToGround(I)
 
 	var/modifier = 0
+<<<<<<< HEAD
 	if(disabilities & CLUMSY)
+=======
+	if(has_disability(DISABILITY_CLUMSY))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		modifier -= 40 //Clumsy people are more likely to hit themselves -Honk!
 
 	switch(rand(1,100)+modifier) //91-100=Nothing special happens
@@ -774,7 +786,7 @@
 			reagents.addiction_list = list()
 	cure_all_traumas(TRUE, TRUE)
 	..()
-	// heal ears after healing disabilities, since ears check DEAF disability
+	// heal ears after healing disabilities, since ears check DISABILITY_DEAF disability
 	// when healing.
 	restoreEars()
 

code/modules/mob/living/carbon/carbon_defense.dm

@@ -306,10 +306,18 @@
 
 			if(eyes.eye_damage > 20)
 				if(prob(eyes.eye_damage - 20))
+<<<<<<< HEAD
 					if(become_nearsighted())
+=======
+					if(!has_disability(DISABILITY_NEARSIGHT))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 						to_chat(src, "<span class='warning'>Your eyes start to burn badly!</span>")
 				else if(prob(eyes.eye_damage - 25))
+<<<<<<< HEAD
 					if(become_blind())
+=======
+					if(!has_disability(DISABILITY_BLIND))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 						to_chat(src, "<span class='warning'>You can't see anything!</span>")
 			else
 				to_chat(src, "<span class='warning'>Your eyes are really starting to hurt. This can't be good for you!</span>")

code/modules/mob/living/carbon/examine.dm

@@ -70,7 +70,11 @@
 			else
 				msg += "<b>[t_He] [t_is] severely deformed!</b>\n"
 
+<<<<<<< HEAD
 	if(disabilities & DUMB)
+=======
+	if(has_disability(DISABILITY_DUMB))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		msg += "[t_He] seem[p_s()] to be clumsy and unable to think.\n"
 
 	if(fire_stacks > 0)

code/modules/mob/living/carbon/human/death.dm

@@ -48,7 +48,12 @@
 
 
 /mob/living/carbon/proc/Drain()
+<<<<<<< HEAD
 	become_husk()
 	disabilities |= NOCLONE
+=======
+	become_husk(CHANGELING_DRAIN)
+	add_disability(DISABILITY_NOCLONE, CHANGELING_DRAIN)
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 	blood_volume = 0
 	return 1

code/modules/mob/living/carbon/human/examine.dm

@@ -285,7 +285,11 @@
 		if(stat == UNCONSCIOUS)
 			msg += "[t_He] [t_is]n't responding to anything around [t_him] and seem[p_s()] to be asleep.\n"
 		else
+<<<<<<< HEAD
 			if(disabilities & DUMB)
+=======
+			if(has_disability(DISABILITY_DUMB))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 				msg += "[t_He] [t_has] a stupid expression on [t_his] face.\n"
 			if(InCritical())
 				msg += "[t_He] [t_is] barely conscious.\n"

code/modules/mob/living/carbon/human/human_defense.dm

@@ -140,8 +140,13 @@
 	return ..()
 
 /mob/living/carbon/human/grabbedby(mob/living/carbon/user, supress_message = 0)
+<<<<<<< HEAD
 	if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && isliving(pulling))
 		vore_attack(user, pulling)
+=======
+	if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && (has_disability(DISABILITY_FAT)) && ismonkey(pulling))
+		devour_mob(pulling)
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 	else
 		..()
 

code/modules/mob/living/carbon/human/human_helpers.dm

@@ -103,7 +103,11 @@
 
 
 /mob/living/carbon/human/IsAdvancedToolUser()
+<<<<<<< HEAD
 	if(disabilities & MONKEYLIKE)
+=======
+	if(has_disability(DISABILITY_MONKEYLIKE))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		return FALSE
 	return TRUE//Humans can use guns and such
 

code/modules/mob/living/carbon/human/interactive.dm

@@ -339,7 +339,11 @@
 	if(TRAITS & TRAIT_SMART)
 		smartness = 75
 	else if(TRAITS & TRAIT_DUMB)
+<<<<<<< HEAD
 		disabilities |= CLUMSY
+=======
+		add_disability(DISABILITY_CLUMSY, GENETIC_MUTATION)
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		smartness = 25
 
 	if(TRAITS & TRAIT_MEAN)

code/modules/mob/living/carbon/human/inventory.dm

@@ -187,7 +187,11 @@
 		if(G.tint)
 			update_tint()
 		if(G.vision_correction)
+<<<<<<< HEAD
 			if(disabilities & NEARSIGHT)
+=======
+			if(has_disability(DISABILITY_NEARSIGHT))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 				overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1)
 			adjust_eye_damage(0)
 		if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view || !isnull(G.lighting_alpha))

code/modules/mob/living/carbon/human/species.dm

@@ -312,7 +312,11 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 	if(!HD) //Decapitated
 		return
 
+<<<<<<< HEAD
 	if(H.disabilities & HUSK)
+=======
+	if(H.has_disability(DISABILITY_HUSK))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		return
 	var/datum/sprite_accessory/S
 	var/list/standing = list()
@@ -453,7 +457,11 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 
 	var/obj/item/bodypart/head/HD = H.get_bodypart("head")
 
+<<<<<<< HEAD
 	if(HD && !(H.disabilities & HUSK))
+=======
+	if(HD && !(H.has_disability(DISABILITY_HUSK)))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		// lipstick
 		if(H.lip_style && (LIPS in species_traits))
 			var/mutable_appearance/lip_overlay = mutable_appearance('icons/mob/human_face.dmi', "lips_[H.lip_style]", -BODY_LAYER)
@@ -724,7 +732,11 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			if(S.center)
 				accessory_overlay = center_image(accessory_overlay, S.dimension_x, S.dimension_y)
 
+<<<<<<< HEAD
 			if(!(H.disabilities & HUSK))
+=======
+			if(!(H.has_disability(DISABILITY_HUSK)))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 				if(!forced_colour)
 					switch(S.color_src)
 						if(MUTCOLORS)
@@ -1102,17 +1114,29 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 
 /datum/species/proc/handle_digestion(mob/living/carbon/human/H)
 
+<<<<<<< HEAD
 	//The fucking FAT mutation is the dumbest shit ever. It makes the code so difficult to work with
 	if(H.disabilities & FAT)//I share your pain, past coder.
 		if(H.overeatduration < 100)
 			to_chat(H, "<span class='notice'>You feel fit again!</span>")
 			H.disabilities &= ~FAT
+=======
+	//The fucking DISABILITY_FAT mutation is the dumbest shit ever. It makes the code so difficult to work with
+	if(H.has_disability(DISABILITY_FAT))//I share your pain, past coder.
+		if(H.overeatduration < 100)
+			to_chat(H, "<span class='notice'>You feel fit again!</span>")
+			H.remove_disability(DISABILITY_FAT, OBESITY)
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 			H.update_inv_w_uniform()
 			H.update_inv_wear_suit()
 	else
 		if(H.overeatduration > 500)
 			to_chat(H, "<span class='danger'>You suddenly feel blubbery!</span>")
+<<<<<<< HEAD
 			H.disabilities |= FAT
+=======
+			H.add_disability(DISABILITY_FAT, OBESITY)
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 			H.update_inv_w_uniform()
 			H.update_inv_wear_suit()
 
@@ -1269,7 +1293,11 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 				. += (health_deficiency / 25)
 		if((hungry >= 70) && !flight)		//Being hungry won't stop you from using flightpack controls/flapping your wings although it probably will in the wing case but who cares.
 			. += hungry / 50
+<<<<<<< HEAD
 		if(H.disabilities & FAT)
+=======
+		if(H.has_disability(DISABILITY_FAT))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 			. += (1.5 - flight)
 		if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT)
 			. += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR
@@ -1315,7 +1343,11 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 
 
 /datum/species/proc/harm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
+<<<<<<< HEAD
 	if(user.disabilities & PACIFISM)
+=======
+	if(user.has_disability(DISABILITY_PACIFISM))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		to_chat(user, "<span class='warning'>You don't want to harm [target]!</span>")
 		return FALSE
 	if(target.check_block())
@@ -1388,7 +1420,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 		return 1
 	else
 		user.do_attack_animation(target, ATTACK_EFFECT_DISARM)
-		
+
 		if(target.w_uniform)
 			target.w_uniform.add_fingerprint(user)
 		var/randomized_zone = ran_zone(user.zone_selected)

code/modules/mob/living/carbon/human/species_types/golems.dm

@@ -725,7 +725,11 @@
 /obj/structure/cloth_pile/proc/revive()
 	if(QDELETED(src) || QDELETED(cloth_golem)) //QDELETED also checks for null, so if no cloth golem is set this won't runtime
 		return
+<<<<<<< HEAD
 	if(cloth_golem.suiciding || cloth_golem.disabilities & NOCLONE)
+=======
+	if(cloth_golem.suiciding || cloth_golem.has_disability(DISABILITY_NOCLONE))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		QDEL_NULL(cloth_golem)
 		return
 

code/modules/mob/living/carbon/human/update_icons.dm

@@ -609,7 +609,11 @@ generate/load female uniform sprites matching all previously decided variables
 		if(BP.dmg_overlay_type)
 			. += "-[BP.dmg_overlay_type]"
 
+<<<<<<< HEAD
 	if(disabilities & HUSK)
+=======
+	if(has_disability(DISABILITY_HUSK))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		. += "-husk"
 
 /mob/living/carbon/human/load_limb_from_cache()

code/modules/mob/living/carbon/monkey/combat.dm

@@ -122,7 +122,11 @@
 	if(L == src)
 		return FALSE
 
+<<<<<<< HEAD
 	if(disabilities & PACIFISM)
+=======
+	if(has_disability(DISABILITY_PACIFISM))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		return FALSE
 
 	if(enemies[L])

code/modules/mob/living/carbon/monkey/update_icons.dm

@@ -19,7 +19,11 @@
 	if(!HD) //Decapitated
 		return
 
+<<<<<<< HEAD
 	if(disabilities & HUSK)
+=======
+	if(has_disability(DISABILITY_HUSK))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		return
 
 	var/hair_hidden = 0

code/modules/mob/living/carbon/status_procs.dm

@@ -1,6 +1,6 @@
 //Here are the procs used to modify status effects of a mob.
 //The effects include: stun, knockdown, unconscious, sleeping, resting, jitteriness, dizziness, ear damage,
-// eye damage, eye_blind, eye_blurry, druggy, BLIND disability, NEARSIGHT disability, and HUSK disability.
+// eye damage, eye_blind, eye_blurry, druggy, DISABILITY_BLIND disability, DISABILITY_NEARSIGHT disability, and DISABILITY_HUSK disability.
 
 /mob/living/carbon/damage_eyes(amount)
 	var/obj/item/organ/eyes/eyes = getorganslot(ORGAN_SLOT_EYES)

code/modules/mob/living/carbon/update_icons.dm

@@ -290,7 +290,11 @@
 		else
 			. += "-robotic"
 
+<<<<<<< HEAD
 	if(disabilities & HUSK)
+=======
+	if(has_disability(DISABILITY_HUSK))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		. += "-husk"
 
 

code/modules/mob/living/life.dm

@@ -126,7 +126,11 @@
 /mob/living/proc/handle_disabilities()
 	//Eyes
 	if(eye_blind)			//blindness, heals slowly over time
+<<<<<<< HEAD
 		if(!stat && !(disabilities & BLIND))
+=======
+		if(!stat && !(has_disability(DISABILITY_BLIND)))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 			eye_blind = max(eye_blind-1,0)
 			if(client && !eye_blind)
 				clear_alert("blind")
@@ -137,7 +141,11 @@
 		eye_blurry = max(eye_blurry-1, 0)
 		if(client && !eye_blurry)
 			clear_fullscreen("blurry")
+<<<<<<< HEAD
 	if(disabilities & PACIFISM && a_intent == INTENT_HARM)
+=======
+	if(has_disability(DISABILITY_PACIFISM) && a_intent == INTENT_HARM)
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		to_chat(src, "<span class='notice'>You don't feel like harming anybody.</span>")
 		a_intent_change(INTENT_HELP)
 

code/modules/mob/living/living.dm

@@ -819,7 +819,11 @@
 	if(G.trigger_guard != TRIGGER_GUARD_ALLOW_ALL && !IsAdvancedToolUser())
 		to_chat(src, "<span class='warning'>You don't have the dexterity to do this!</span>")
 		return FALSE
+<<<<<<< HEAD
 	if(disabilities & PACIFISM)
+=======
+	if(has_disability(DISABILITY_PACIFISM))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		to_chat(src, "<span class='notice'>You don't want to risk harming anyone!</span>")
 		return FALSE
 	return TRUE

code/modules/mob/living/living_defense.dm

@@ -136,7 +136,11 @@
 		to_chat(user, "<span class='warning'>[src] can't be grabbed more aggressively!</span>")
 		return FALSE
 
+<<<<<<< HEAD
 	if(user.disabilities & PACIFISM)
+=======
+	if(user.has_disability(DISABILITY_PACIFISM))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		to_chat(user, "<span class='notice'>You don't want to risk hurting [src]!</span>")
 		return FALSE
 
@@ -193,7 +197,11 @@
 			M.Feedstop()
 		return // can't attack while eating!
 
+<<<<<<< HEAD
 	if(disabilities & PACIFISM)
+=======
+	if(has_disability(DISABILITY_PACIFISM))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		to_chat(M, "<span class='notice'>You don't want to hurt anyone!</span>")
 		return FALSE
 
@@ -210,7 +218,11 @@
 		M.visible_message("<span class='notice'>\The [M] [M.friendly] [src]!</span>")
 		return FALSE
 	else
+<<<<<<< HEAD
 		if(M.disabilities & PACIFISM)
+=======
+		if(M.has_disability(DISABILITY_PACIFISM))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 			to_chat(M, "<span class='notice'>You don't want to hurt anyone!</span>")
 			return FALSE
 
@@ -229,7 +241,11 @@
 		return FALSE
 
 	if (M.a_intent == INTENT_HARM)
+<<<<<<< HEAD
 		if(M.disabilities & PACIFISM)
+=======
+		if(M.has_disability(DISABILITY_PACIFISM))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 			to_chat(M, "<span class='notice'>You don't want to hurt anyone!</span>")
 			return FALSE
 
@@ -255,7 +271,11 @@
 			return FALSE
 
 		else
+<<<<<<< HEAD
 			if(L.disabilities & PACIFISM)
+=======
+			if(L.has_disability(DISABILITY_PACIFISM))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 				to_chat(L, "<span class='notice'>You don't want to hurt anyone!</span>")
 				return
 
@@ -280,7 +300,11 @@
 			grabbedby(M)
 			return FALSE
 		if("harm")
+<<<<<<< HEAD
 			if(M.disabilities & PACIFISM)
+=======
+			if(M.has_disability(DISABILITY_PACIFISM))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 				to_chat(M, "<span class='notice'>You don't want to hurt anyone!</span>")
 				return FALSE
 			M.do_attack_animation(src)
@@ -370,7 +394,11 @@
 
 //called when the mob receives a bright flash
 /mob/living/proc/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /obj/screen/fullscreen/flash)
+<<<<<<< HEAD
 	if(get_eye_protection() < intensity && (override_blindness_check || !(disabilities & BLIND)))
+=======
+	if(get_eye_protection() < intensity && (override_blindness_check || !(has_disability(DISABILITY_BLIND))))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		overlay_fullscreen("flash", type)
 		addtimer(CALLBACK(src, .proc/clear_fullscreen, "flash", 25), 25)
 		return 1

code/modules/mob/living/say.dm

@@ -135,11 +135,17 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 	// AIs use inherent channels for the holopad. Most inherent channels
 	// ignore the language argument however.
 
+<<<<<<< HEAD
 	var/datum/saymode/SM = SSradio.saymodes[key]
 	if(key && SM)
 		if(!SM.handle_message(src, message, language) && !message_mode)
 			return
 
+=======
+	var/datum/saymode/SM = SSradio.saymodes[talk_key]
+	if(SM && !SM.handle_message(src, message, language))
+		return
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 
 	if(!can_speak_vocal(message))
 		to_chat(src, "<span class='warning'>You find yourself unable to speak!</span>")
@@ -285,7 +291,11 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 	return 1
 
 /mob/living/proc/can_speak_vocal(message) //Check AFTER handling of xeno and ling channels
+<<<<<<< HEAD
 	if(disabilities & MUTE)
+=======
+	if(has_disability(DISABILITY_MUTE))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		return 0
 
 	if(is_muzzled())

code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm

@@ -558,7 +558,11 @@ Difficulty: Very Hard
 					H.regenerate_limbs()
 					H.regenerate_organs()
 					H.revive(1,0)
+<<<<<<< HEAD
 					H.disabilities |= NOCLONE //Free revives, but significantly limits your options for reviving except via the crystal
+=======
+					H.add_disability(DISABILITY_NOCLONE, MAGIC_DISABILITY) //Free revives, but significantly limits your options for reviving except via the crystal
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 					H.grab_ghost(force = TRUE)
 
 /obj/machinery/anomalous_crystal/helpers //Lets ghost spawn as helpful creatures that can only heal people slightly. Incredibly fragile and they can't converse with humans
@@ -719,7 +723,11 @@ Difficulty: Very Hard
 	if(isliving(A) && holder_animal)
 		var/mob/living/L = A
 		L.notransform = 1
+<<<<<<< HEAD
 		L.disabilities |= MUTE
+=======
+		L.add_disability(DISABILITY_MUTE, STASIS_MUTE)
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		L.status_flags |= GODMODE
 		L.mind.transfer_to(holder_animal)
 		var/obj/effect/proc_holder/spell/targeted/exit_possession/P = new /obj/effect/proc_holder/spell/targeted/exit_possession
@@ -729,7 +737,11 @@ Difficulty: Very Hard
 /obj/structure/closet/stasis/dump_contents(var/kill = 1)
 	STOP_PROCESSING(SSobj, src)
 	for(var/mob/living/L in src)
+<<<<<<< HEAD
 		L.disabilities &= ~MUTE
+=======
+		L.remove_disability(DISABILITY_MUTE, STASIS_MUTE)
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		L.status_flags &= ~GODMODE
 		L.notransform = 0
 		if(holder_animal)

code/modules/mob/living/status_procs.dm

@@ -1,6 +1,6 @@
 //Here are the procs used to modify status effects of a mob.
 //The effects include: stun, knockdown, unconscious, sleeping, resting, jitteriness, dizziness,
-// eye damage, eye_blind, eye_blurry, druggy, BLIND disability, and NEARSIGHT disability.
+// eye damage, eye_blind, eye_blurry, druggy, DISABILITY_BLIND disability, and DISABILITY_NEARSIGHT disability.
 
 
 ////////////////////////////// STUN ////////////////////////////////////
@@ -137,3 +137,82 @@
 				to_chat(src, "<span class='boldwarning'>[priority_absorb_key["self_message"]]</span>")
 		priority_absorb_key["stuns_absorbed"] += amount
 		return TRUE
+<<<<<<< HEAD
+=======
+
+/////////////////////////////////// DISABILITIES ////////////////////////////////////
+
+/mob/living/proc/add_disability(disability, source)
+	if(!disabilities[disability])
+		disabilities[disability] = list(source)
+	else
+		disabilities[disability] |= list(source)
+
+/mob/living/proc/remove_disability(disability, list/sources)
+	if(!disabilities[disability])
+		return
+
+	if(!islist(sources))
+		sources = list(sources)
+
+	if(LAZYLEN(sources))
+		for(var/S in sources)
+			if(S in disabilities[disability])
+				disabilities[disability] -= S
+	else
+		disabilities[disability] = list()
+
+	if(!LAZYLEN(disabilities[disability]))
+		disabilities -= disability
+
+/mob/living/proc/has_disability(disability, list/sources)
+	if(!disabilities[disability])
+		return FALSE
+
+	. = FALSE
+
+	if(LAZYLEN(sources))
+		for(var/S in sources)
+			if(S in disabilities[disability])
+				return TRUE
+	else
+		if(LAZYLEN(disabilities[disability]))
+			return TRUE
+
+/mob/living/proc/remove_all_disabilities()
+	disabilities = list()
+
+/////////////////////////////////// DISABILITY PROCS ////////////////////////////////////
+
+/mob/living/proc/cure_blind(list/sources)
+	remove_disability(DISABILITY_BLIND, sources)
+	if(!has_disability(DISABILITY_BLIND))
+		adjust_blindness(-1)
+
+/mob/living/proc/become_blind(source)
+	if(!has_disability(DISABILITY_BLIND))
+		blind_eyes(1)
+	add_disability(DISABILITY_BLIND, source)
+
+/mob/living/proc/cure_nearsighted(list/sources)
+	remove_disability(DISABILITY_NEARSIGHT, sources)
+	if(!has_disability(DISABILITY_NEARSIGHT))
+		clear_fullscreen("nearsighted")
+
+/mob/living/proc/become_nearsighted(source)
+	if(!has_disability(DISABILITY_NEARSIGHT))
+		overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1)
+	add_disability(DISABILITY_NEARSIGHT, source)
+
+/mob/living/proc/cure_husk(list/sources)
+	remove_disability(DISABILITY_HUSK, sources)
+	if(!has_disability(DISABILITY_HUSK))
+		status_flags &= ~DISFIGURED
+		update_body()
+
+/mob/living/proc/become_husk(source)
+	if(!has_disability(DISABILITY_HUSK))
+		status_flags |= DISFIGURED	//makes them unknown
+		update_body()
+	add_disability(DISABILITY_HUSK, source)
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind

code/modules/mob/status_procs.dm

@@ -1,7 +1,7 @@
 
 //Here are the procs used to modify status effects of a mob.
 //The effects include: stun, knockdown, unconscious, sleeping, resting, jitteriness, dizziness, ear damage,
-// eye damage, eye_blind, eye_blurry, druggy, BLIND disability, and NEARSIGHT disability.
+// eye damage, eye_blind, eye_blurry, druggy, DISABILITY_BLIND disability, and DISABILITY_NEARSIGHT disability.
 
 /////////////////////////////////// STUN ////////////////////////////////////
 
@@ -162,6 +162,13 @@
 		var/blind_minimum = 0
 		if((stat != CONSCIOUS && stat != SOFT_CRIT) || (disabilities & BLIND))
 			blind_minimum = 1
+<<<<<<< HEAD
+=======
+		if(isliving(src))
+			var/mob/living/L = src
+			if(L.has_disability(DISABILITY_BLIND))
+				blind_minimum = 1
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		eye_blind = max(eye_blind+amount, blind_minimum)
 		if(!eye_blind)
 			clear_alert("blind")
@@ -179,6 +186,13 @@
 		var/blind_minimum = 0
 		if((stat != CONSCIOUS && stat != SOFT_CRIT) || (disabilities & BLIND))
 			blind_minimum = 1
+<<<<<<< HEAD
+=======
+		if(isliving(src))
+			var/mob/living/L = src
+			if(L.has_disability(DISABILITY_BLIND))
+				blind_minimum = 1
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		eye_blind = blind_minimum
 		if(!eye_blind)
 			clear_alert("blind")

code/modules/paperwork/contract.dm

@@ -202,7 +202,11 @@
 	if(!user.mind.hasSoul)
 		to_chat(user, "<span class='notice'>You do not possess a soul.</span>")
 		return 0
+<<<<<<< HEAD
 	if(user.disabilities & DUMB)
+=======
+	if(user.has_disability(DISABILITY_DUMB))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		to_chat(user, "<span class='notice'>You quickly scrawl 'your name' on the contract.</span>")
 		signIncorrectly()
 		return 0

code/modules/paperwork/paper.dm

@@ -93,7 +93,11 @@
 		return
 	if(ishuman(usr))
 		var/mob/living/carbon/human/H = usr
+<<<<<<< HEAD
 		if(H.disabilities & CLUMSY && prob(25))
+=======
+		if(H.has_disability(DISABILITY_CLUMSY) && prob(25))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 			to_chat(H, "<span class='warning'>You cut yourself on the paper! Ahhhh! Ahhhhh!</span>")
 			H.damageoverlaytemp = 9001
 			H.update_damage_hud()
@@ -317,7 +321,11 @@
 		to_chat(user, "<span class='notice'>You stamp the paper with your rubber stamp.</span>")
 
 	if(P.is_hot())
+<<<<<<< HEAD
 		if(user.disabilities & CLUMSY && prob(10))
+=======
+		if(user.has_disability(DISABILITY_CLUMSY) && prob(10))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 			user.visible_message("<span class='warning'>[user] accidentally ignites themselves!</span>", \
 								"<span class='userdanger'>You miss the paper and accidentally light yourself on fire!</span>")
 			user.dropItemToGround(P)

code/modules/paperwork/paperplane.dm

@@ -65,7 +65,11 @@
 		update_icon()
 
 	else if(P.is_hot())
+<<<<<<< HEAD
 		if(user.disabilities & CLUMSY && prob(10))
+=======
+		if(user.has_disability(DISABILITY_CLUMSY) && prob(10))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 			user.visible_message("<span class='warning'>[user] accidentally ignites themselves!</span>", \
 				"<span class='userdanger'>You miss [src] and accidentally light yourself on fire!</span>")
 			user.dropItemToGround(P)

code/modules/projectiles/gun.dm

@@ -155,10 +155,14 @@
 			return
 
 
-	//Exclude lasertag guns from the CLUMSY check.
+	//Exclude lasertag guns from the DISABILITY_CLUMSY check.
 	if(clumsy_check)
 		if(istype(user))
+<<<<<<< HEAD
 			if (user.disabilities & CLUMSY && prob(40))
+=======
+			if (user.has_disability(DISABILITY_CLUMSY) && prob(40))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 				to_chat(user, "<span class='userdanger'>You shoot yourself in the foot with [src]!</span>")
 				var/shot_leg = pick("l_leg", "r_leg")
 				process_fire(user,user,0,params, zone_override = shot_leg)

code/modules/projectiles/guns/ballistic/revolver.dm

@@ -349,7 +349,11 @@
 	clumsy_check = 0
 
 /obj/item/gun/ballistic/revolver/reverse/can_trigger_gun(mob/living/user)
+<<<<<<< HEAD
 	if((user.disabilities & CLUMSY) || (user.mind && user.mind.assigned_role == "Clown"))
+=======
+	if((user.has_disability(DISABILITY_CLUMSY)) || (user.mind && user.mind.assigned_role == "Clown"))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		return ..()
 	if(process_fire(user, user, 0, zone_override = "head"))
 		user.visible_message("<span class='warning'>[user] somehow manages to shoot [user.p_them()]self in the face!</span>", "<span class='userdanger'>You somehow shoot yourself in the face! How the hell?!</span>")

code/modules/projectiles/pins.dm

@@ -129,7 +129,11 @@
 // A gun with ultra-honk pin is useful for clown and useless for everyone else.
 /obj/item/device/firing_pin/clown/ultra/pin_auth(mob/living/user)
 	playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1)
+<<<<<<< HEAD
 	if(!(user.disabilities & CLUMSY) && !(user.mind && user.mind.assigned_role == "Clown"))
+=======
+	if(!(user.has_disability(DISABILITY_CLUMSY)) && !(user.mind && user.mind.assigned_role == "Clown"))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		return 0
 	return 1
 

code/modules/reagents/chemistry/reagents/medicine_reagents.dm

@@ -667,14 +667,22 @@
 	var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES)
 	if (!eyes)
 		return
+<<<<<<< HEAD
 	if(M.disabilities & BLIND)
+=======
+	if(M.has_disability(DISABILITY_BLIND, EYE_DAMAGE))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		if(prob(20))
 			to_chat(M, "<span class='warning'>Your vision slowly returns...</span>")
 			M.cure_blind()
 			M.cure_nearsighted()
 			M.blur_eyes(35)
 
+<<<<<<< HEAD
 	else if(M.disabilities & NEARSIGHT)
+=======
+	else if(M.has_disability(DISABILITY_NEARSIGHT, EYE_DAMAGE))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		to_chat(M, "<span class='warning'>The blackness in your peripheral vision fades.</span>")
 		M.cure_nearsighted()
 		M.blur_eyes(10)
@@ -765,7 +773,11 @@
 			M.visible_message("<span class='warning'>[M]'s body convulses a bit, and then falls still once more.</span>")
 			return
 		M.visible_message("<span class='warning'>[M]'s body convulses a bit.</span>")
+<<<<<<< HEAD
 		if(!M.suiciding && !(M.disabilities & NOCLONE) && !M.hellbound)
+=======
+		if(!M.suiciding && !(M.has_disability(DISABILITY_NOCLONE)) && !M.hellbound)
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 			if(!M)
 				return
 			if(M.notify_ghost_cloning(source = M))

code/modules/reagents/chemistry/reagents/toxin_reagents.dm

@@ -141,7 +141,11 @@
 	taste_description = "mint"
 
 /datum/reagent/toxin/minttoxin/on_mob_life(mob/living/M)
+<<<<<<< HEAD
 	if(M.disabilities & FAT)
+=======
+	if(M.has_disability(DISABILITY_FAT))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		M.gib()
 	return ..()
 

code/modules/spells/spell_types/construct_spells.dm

@@ -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"

code/modules/surgery/bodyparts/bodyparts.dm

@@ -217,7 +217,11 @@
 		C = owner
 		no_update = 0
 
+<<<<<<< HEAD
 	if(C.disabilities & HUSK)
+=======
+	if(C.has_disability(DISABILITY_HUSK))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		species_id = "husk" //overrides species_id
 		dmg_overlay_type = "" //no damage overlay shown when husked
 		should_draw_gender = FALSE

code/modules/surgery/bodyparts/head.dm

@@ -61,7 +61,11 @@
 		C = owner
 
 	real_name = C.real_name
+<<<<<<< HEAD
 	if(C.disabilities & HUSK)
+=======
+	if(C.has_disability(DISABILITY_HUSK))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		real_name = "Unknown"
 		hair_style = "Bald"
 		facial_hair_style = "Shaved"

code/modules/surgery/lipoplasty.dm

@@ -4,7 +4,11 @@
 	possible_locs = list("chest")
 
 /datum/surgery/lipoplasty/can_start(mob/user, mob/living/carbon/target)
+<<<<<<< HEAD
 	if(target.disabilities & FAT)
+=======
+	if(target.has_disability(DISABILITY_FAT))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		return 1
 	return 0
 

code/modules/surgery/organs/ears.dm

@@ -25,7 +25,11 @@
 		return
 	var/mob/living/carbon/C = owner
 	// genetic deafness prevents the body from using the ears, even if healthy
+<<<<<<< HEAD
 	if(C.disabilities & DEAF)
+=======
+	if(C.has_disability(DISABILITY_DEAF))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		deaf = max(deaf, 1)
 	else
 		if(C.ears && (C.ears.flags_2 & HEALS_EARS_2))
@@ -42,7 +46,11 @@
 
 	var/mob/living/carbon/C = owner
 
+<<<<<<< HEAD
 	if(iscarbon(owner) && C.disabilities & DEAF)
+=======
+	if(iscarbon(owner) && C.has_disability(DISABILITY_DEAF))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		deaf = 1
 
 /obj/item/organ/ears/proc/adjustEarDamage(ddmg, ddeaf)