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

save point - a lot of shit to fix

Browse Source
This commit is contained in:
LetterJay
2017-12-27 07:03:40 -06:00
parent 164db7ae9b c84a8cc9e1
commit 2e6b034493
39 changed files with 11 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/brain_damage/mild.dm
-8
View File
@@ -42,11 +42,7 @@
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()
@@ -58,11 +54,7 @@
..()
/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
..()