save point - a lot of shit to fix

This commit is contained in:
LetterJay
2017-12-27 07:03:40 -06:00
39 changed files with 11 additions and 588 deletions
-16
View File
@@ -85,20 +85,12 @@
/datum/mutation/human/clumsy/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
<<<<<<< HEAD
owner.disabilities |= CLUMSY
=======
owner.add_disability(DISABILITY_CLUMSY, GENETIC_MUTATION)
>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
/datum/mutation/human/clumsy/on_losing(mob/living/carbon/human/owner)
if(..())
return
<<<<<<< HEAD
owner.disabilities &= ~CLUMSY
=======
owner.remove_disability(DISABILITY_CLUMSY, GENETIC_MUTATION)
>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
//Tourettes causes you to randomly stand in place and shout.
@@ -132,20 +124,12 @@
/datum/mutation/human/deaf/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
<<<<<<< HEAD
owner.disabilities |= DEAF
=======
owner.add_disability(DISABILITY_DEAF, GENETIC_MUTATION)
>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
/datum/mutation/human/deaf/on_losing(mob/living/carbon/human/owner)
if(..())
return
<<<<<<< HEAD
owner.disabilities &= ~DEAF
=======
owner.remove_disability(DISABILITY_DEAF, GENETIC_MUTATION)
>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
//Monified turns you into a monkey.
-8
View File
@@ -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