Armhulen
|
fa6292dbd5
|
deadly brain tumor now gives -3 points (#37455)
* i can tweak it if need be yadda yadda one line change
* ok lets be SENSIBLE.
|
2018-05-02 21:24:26 -05:00 |
|
deathride58
|
28904ec033
|
Merge pull request #6522 from Citadel-Station-13/upstream-merge-37431
[MIRROR] New Trait: Acute Blood Deficiency
|
2018-04-27 09:38:19 +00:00 |
|
Jordan Brown
|
354dc0bcf9
|
Merge pull request #37431 from Mickyan/anemic
New Trait: Acute Blood Deficiency
|
2018-04-26 15:21:11 -05:00 |
|
Poojawa
|
e5f9765d2a
|
datums/controller stuff
|
2018-04-23 00:02:42 -05:00 |
|
Ashe Higgs
|
74f1b21a18
|
Disables mood traits when mood is disabled (#37082)
* disables mood traits if mood is off
* my copypasta is showing
* Update negative.dm
|
2018-04-11 07:06:23 -05:00 |
|
vuonojenmustaturska
|
2c275be1c1
|
Fixes an heirloom trait-related runtime that gets spammed in the logs (#37036)
* honk
* return
* Update negative.dm
* Update _trait.dm
|
2018-04-09 04:52:40 -05:00 |
|
Jordie
|
5614da1d3b
|
Merge pull request #36945 from KorPhaeron/aprilfools
Removes april fools from heirlooms
|
2018-04-03 22:03:04 -05:00 |
|
Ashe Higgs
|
8ec16df2e4
|
Adds the Family Heirloom, Nyctophobia, and Monochromacy traits, and rebalances Social Anxiety (#36426)
* Adds some more traits
* April Fools' heirlooms
* Fixes the detective sound
* Refactor to use signals
|
2018-03-28 12:15:06 -05:00 |
|
CitadelStationBot
|
3d26cd4a6f
|
[MIRROR] Replaced body zone magic strings with defines (#6004)
* Replaced body zone magic strings with defines
* merge conflicts
|
2018-03-19 21:18:57 -05:00 |
|
CitadelStationBot
|
dac99faf65
|
[MIRROR] Brain Damage Trait (#6011)
* Brain Damage Trait
* Brain Damage Trait (#36235)
* OK FINE GOD.
* balance??
|
2018-03-19 21:07:57 -05:00 |
|
CitadelStationBot
|
4b550b40e8
|
[MIRROR] Fixes some traits runtimes that are being spammed (#5875)
* .len runtime fix (#36275)
* Fixes some traits runtimes that are being spammed
|
2018-03-10 07:12:55 -06:00 |
|
deathride58
|
936c6a33f2
|
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475
|
2018-03-09 14:18:47 -05:00 |
|
Qustinnus
|
a96a28f3d6
|
[reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments]
|
2018-03-07 20:49:25 -06:00 |
|
Poojawa
|
95cb6b23f2
|
controllers, datums, game
|
2018-03-06 21:16:46 -06:00 |
|
Ashe Higgs
|
0a449af83e
|
Adds minor roundstart traits! (ala CDDA, etc.)
|
2018-03-02 14:38:18 -06:00 |
|