Commit Graph

10 Commits

Author SHA1 Message Date
LetterJay
ac5503d338 Merge branch 'master' into upstream-merge-33055 2017-12-25 04:10:34 -06:00
LetterJay
b1669b8179 Update severe.dm 2017-12-18 17:24:16 -06:00
XDTM
3af0aa2489 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources 2017-12-18 15:19:53 -06:00
XDTM
962f135957 [Ready]Brain Trauma additions 2017-12-17 11:11:10 -06:00
Leo
d59fb8c61c Split personality now logs when a ghost gets control of it (#33506) 2017-12-14 06:12:57 -06:00
deathride58
7179547be4 Merge branch 'master' into upstream-merge-31727 2017-12-10 21:51:51 +00:00
LetterJay
de13c6c799 Merge pull request #4293 from Citadel-Station-13/upstream-merge-33395
[MIRROR] switches lobes for grammar n shit
2017-12-10 14:20:02 -06:00
Jordan Brown
8b41dacba9 switches lobes for grammar n shit 2017-12-09 15:53:27 -06:00
XDTM
8502e058b2 Makes godwoken syndrome a bit more reliable 2017-12-09 01:58:18 -06:00
XDTM
988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00