save point - a lot of shit to fix

code/datums/brain_damage/mild.dm

@@ -42,11 +42,7 @@
 	lose_text = "<span class='notice'>You feel smart again.</span>"
 
 /datum/brain_trauma/mild/dumbness/on_gain()
-<<<<<<< HEAD
-	owner.disabilities |= DUMB
-=======
 	owner.add_disability(DISABILITY_DUMB, TRAUMA_DISABILITY)
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 	..()
 
 /datum/brain_trauma/mild/dumbness/on_life()
@@ -58,11 +54,7 @@
 	..()
 
 /datum/brain_trauma/mild/dumbness/on_lose()
-<<<<<<< HEAD
-	owner.disabilities &= ~DUMB
-=======
 	owner.remove_disability(DISABILITY_DUMB, TRAUMA_DISABILITY)
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 	owner.derpspeech = 0
 	..()
 

code/datums/brain_damage/phobia.dm

@@ -68,11 +68,7 @@
 							return
 
 /datum/brain_trauma/mild/phobia/on_hear(message, speaker, message_language, raw_message, radio_freq)
-<<<<<<< HEAD
-	if(owner.disabilities & DEAF || world.time < next_scare) //words can't trigger you if you can't hear them *taps head*
-=======
 	if(owner.has_disability(DISABILITY_DEAF) || world.time < next_scare) //words can't trigger you if you can't hear them *taps head*
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		return message
 	for(var/word in trigger_words)
 		if(findtext(message, word))

code/datums/brain_damage/severe.dm

@@ -12,25 +12,11 @@
 	lose_text = "<span class='notice'>You suddenly remember how to speak.</span>"
 
 /datum/brain_trauma/severe/mute/on_gain()
-<<<<<<< HEAD
-	owner.disabilities |= MUTE
-	..()
-
-//no fiddling with genetics to get out of this one
-/datum/brain_trauma/severe/mute/on_life()
-	if(!(owner.disabilities & MUTE))
-		on_gain()
-	..()
-
-/datum/brain_trauma/severe/mute/on_lose()
-	owner.disabilities &= ~MUTE
-=======
 	owner.add_disability(DISABILITY_MUTE, TRAUMA_DISABILITY)
 	..()
 
 /datum/brain_trauma/severe/mute/on_lose()
 	owner.remove_disability(DISABILITY_MUTE, TRAUMA_DISABILITY)
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 	..()
 
 /datum/brain_trauma/severe/aphasia
@@ -140,11 +126,7 @@
 		stress -= 4
 
 /datum/brain_trauma/severe/monophobia/proc/check_alone()
-<<<<<<< HEAD
-	if(owner.disabilities & BLIND)
-=======
 	if(owner.has_disability(DISABILITY_BLIND))
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		return TRUE
 	for(var/mob/M in oview(owner, 7))
 		if(!isliving(M)) //ghosts ain't people
@@ -206,19 +188,11 @@
 	lose_text = "<span class='notice'>You feel in control of your hands again.</span>"
 
 /datum/brain_trauma/severe/discoordination/on_gain()
-<<<<<<< HEAD
-	owner.disabilities |= MONKEYLIKE
-	..()
-
-/datum/brain_trauma/severe/discoordination/on_lose()
-	owner.disabilities &= ~MONKEYLIKE
-=======
 	owner.add_disability(DISABILITY_MONKEYLIKE, TRAUMA_DISABILITY)
 	..()
 
 /datum/brain_trauma/severe/discoordination/on_lose()
 	owner.remove_disability(DISABILITY_MONKEYLIKE, TRAUMA_DISABILITY)
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 	..()
 
 /datum/brain_trauma/severe/pacifism
@@ -229,17 +203,9 @@
 	lose_text = "<span class='notice'>You no longer feel compelled to not harm.</span>"
 
 /datum/brain_trauma/severe/pacifism/on_gain()
-<<<<<<< HEAD
-	owner.disabilities |= PACIFISM
-	..()
-
-/datum/brain_trauma/severe/pacifism/on_lose()
-	owner.disabilities &= ~PACIFISM
-=======
 	owner.add_disability(DISABILITY_PACIFISM, TRAUMA_DISABILITY)
 	..()
 
 /datum/brain_trauma/severe/pacifism/on_lose()
 	owner.remove_disability(DISABILITY_PACIFISM, TRAUMA_DISABILITY)
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 	..()

code/datums/brain_damage/split_personality.dm

@@ -192,11 +192,7 @@
 	return //no random switching
 
 /datum/brain_trauma/severe/split_personality/brainwashing/on_hear(message, speaker, message_language, raw_message, radio_freq)
-<<<<<<< HEAD
-	if(owner.disabilities & DEAF || owner == speaker)
-=======
 	if(owner.has_disability(DISABILITY_DEAF) || owner == speaker)
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		return message
 	if(findtext(message, codeword))
 		message = replacetext(message, codeword, "<span class='warning'>[codeword]</span>")