deathride58 380556dde4 Merge pull request #5330 from Citadel-Station-13/upstream-merge-35156 ...

[MIRROR] Slaughter demon, Morph, ERT / Deathsquad antag datums.

2018-02-06 17:54:05 +00:00

..

__DEFINES

Slaughter demon, Morph, ERT / Deathsquad antag datums.

2018-02-05 17:00:09 -06:00

__HELPERS

Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304)

2018-02-05 04:23:09 -06:00

_globalvars

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

_js

…

_onclick

Merge branch 'master' into TG-sync-testing

2018-02-03 01:52:44 +00:00

citadel

Mentor System (#5235)

2018-02-05 04:09:56 -06:00

controllers

Re-enables round autoend

2018-02-05 14:17:14 -05:00

datums

Snowdin 2.0

2018-02-05 09:10:40 -06:00

game

Merge pull request #5332 from Citadel-Station-13/upstream-merge-35324

2018-02-06 02:48:52 +00:00

modules

Merge pull request #5330 from Citadel-Station-13/upstream-merge-35156

2018-02-06 17:54:05 +00:00

_compile_options.dm

…

world.dm

…