Commit Graph

22 Commits

Author SHA1 Message Date
CitadelStationBot
0bf1f7ce14 [MIRROR] Refactors some trauma code, fixes some trauma heals not working (#5955)
* Refactors some trauma code, fixes some trauma heals not working (#36093)

* Refactors some trauma code, fixes some trauma heals not working

* that too

* fix indent

* antur comments

* Refactors some trauma code, fixes some trauma heals not working
2018-03-15 20:50:10 -05:00
CitadelStationBot
7b0570f394 [MIRROR] Fixes bodies responding to phobias (#5887)
* Fixes bodies responding to phobias (#36227)

* Fixes ghosts responding to phobias
When a ghost inhabiting their body hears a phobia word, they no longer
freak out.

* Modified to a guard clause

* Fixes bodies responding to phobias
2018-03-10 07:33:48 -06: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
CitadelStationBot
a2e6253f00 [MIRROR] Disease antagonist (#5815)
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
2018-03-05 15:20:59 -06:00
XDTM
8c1e1aa3ef Bath Salts now induce psychotic rage, but cause much more brain damage (#35911)
* Bath Salts now induce psychotic rage, but cause much more brain damage

* goodcode
2018-02-28 03:21:55 -06:00
CitadelStationBot
1e65c813f0 [MIRROR] Extensive surgery additions (#5590)
* Extensive surgery additions

* Update role_preferences.dm

* Update surgery_step.dm
2018-02-19 10:48:11 -06:00
AnturK
3e12e1b2f6 Some antag fixes. (#35690)
* Removes misleading comment

* Fixes devil ascension visible in lobby

* Fixes nuke op reinforcements.

* ADVANCED COPYPASTE

* Missed this one.
2018-02-16 10:35:55 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
Leo
e71ce4e8cf Merge pull request #34775 from ShizCalev/removed-named-args-from-visible_message
Removed named args from visible_message
2018-01-24 11:59:50 -06:00
deathride58
d26a9b23a4 datums folder 2018-01-03 23:29:47 -05:00
LetterJay
2e6b034493 save point - a lot of shit to fix 2017-12-27 07:03:40 -06:00
LetterJay
ac5503d338 Merge branch 'master' into upstream-merge-33055 2017-12-25 04:10:34 -06:00
Jordan Brown
164db7ae9b Prefixed all disability defines with DISABILITY_ to fix a name collision 2017-12-24 15:03:30 -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