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/brain_damage/mild.dm
+8
View File
@@ -42,7 +42,11 @@
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()
@@ -54,7 +58,11 @@
..()
/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
..()