LetterJay 9f1c6cef0c Merge branch 'master' into upstream-merge-31371

2017-10-08 15:37:46 -04:00

..

__DATASTRUCTURES

…

__DEFINES

Merge pull request #3205 from Citadel-Station-13/upstream-merge-31374

2017-10-08 15:36:39 -04:00

__HELPERS

Update type2type.dm

2017-10-05 22:44:50 -05:00

_globalvars

Gives nightmares a random shadowling name (#31188)

2017-10-03 18:41:37 -05:00

_js

…

_onclick

Merge pull request #3169 from Citadel-Station-13/upstream-merge-31326

2017-10-07 01:02:12 -04:00

citadel

Crew objective/miscreant system tweaks (#3213)

2017-10-08 10:05:40 -07:00

controllers

Merge branch 'master' into upstream-merge-31371

2017-10-08 15:37:46 -04:00

datums

[MIRROR] Miscellaneous virus fixes (#3216)

2017-10-07 23:04:26 -07:00

game

[MIRROR] Overloaded leg actuators now consume at least 100 power per step (#3211)

2017-10-07 23:04:36 -07:00

modules

Merge pull request #3205 from Citadel-Station-13/upstream-merge-31374

2017-10-08 15:36:39 -04:00

_compile_options.dm

Merge pull request #3028 from Raeschen/master

2017-09-30 12:56:20 -04:00

world.dm

…