Prefixed all disability defines with DISABILITY_ to fix a name collision

2017-12-24 11:45:45 -05:00
parent 2378235f51
commit 164db7ae9b
83 changed files with 957 additions and 9 deletions
@@ -30,12 +30,20 @@
 /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