shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prefixed all disability defines with DISABILITY_ to fix a name collision

Browse Source
This commit is contained in:
Jordan Brown
2017-12-24 11:45:45 -05:00
committed by CitadelStationBot
parent 2378235f51
commit 164db7ae9b
83 changed files with 957 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/mutations/body.dm
+16
View File
@@ -85,12 +85,20 @@
/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.
@@ -124,12 +132,20 @@
/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.
code/datums/mutations/speech.dm
+8
View File
@@ -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