deathride58 fc5870f699 Merge pull request #5899 from Citadel-Station-13/upstream-merge-36285 ...

[MIRROR] Holy water is trivial against Eminence once Daddy arrives

2018-03-10 21:35:54 +00:00

..

__DEFINES

[MIRROR] Replaces alien brain necropolis chest loot with new artifact [MERGE READY] (#5892)

2018-03-10 07:43:42 -06:00

__HELPERS

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475

2018-03-09 14:18:47 -05:00

_globalvars

Merge pull request #5855 from Citadel-Station-13/upstream-merge-35858

2018-03-09 18:37:29 +00:00

_js

…

_onclick

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475

2018-03-09 14:18:47 -05:00

controllers

Fix config loading exploit (#36286)

2018-03-10 14:52:18 -06:00

datums

[MIRROR] Replaces alien brain necropolis chest loot with new artifact [MERGE READY] (#5892)

2018-03-10 07:43:42 -06:00

game

[MIRROR] You can now non-violently place people on tables (#5891)

2018-03-10 07:43:14 -06:00

modules

Merge pull request #5899 from Citadel-Station-13/upstream-merge-36285

2018-03-10 21:35:54 +00:00

_compile_options.dm

Merge pull request #36190 from MrStonedOne/patch-489

2018-03-07 01:32:41 -06:00

world.dm

…