save point - a lot of shit to fix

2017-12-27 07:03:40 -06:00
parent 164db7ae9b c84a8cc9e1
commit 2e6b034493
39 changed files with 11 additions and 588 deletions
@@ -30,20 +30,12 @@
 /datum/mutation/human/mute/on_acquiring(mob/living/carbon/human/owner)
 	if(..())
 		return
-<<<<<<< HEAD
-	owner.disabilities |= MUTE
-=======
 	owner.add_disability(DISABILITY_MUTE, GENETIC_MUTATION)
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind

 /datum/mutation/human/mute/on_losing(mob/living/carbon/human/owner)
 	if(..())
 		return
-<<<<<<< HEAD
-	owner.disabilities &= ~MUTE
-=======
 	owner.remove_disability(DISABILITY_MUTE, GENETIC_MUTATION)
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind


 /datum/mutation/human/smile