Chayse Ramsay 0b42003f53 Merge branch 'master' into QM-as-Head

2018-02-18 03:46:35 +00:00

..

__DEFINES

[Ready to merge] Au-toy-lathe (#5534)

2018-02-17 17:18:22 -08:00

__HELPERS

Cleans up remnant traitor cyborg code and AI hacking.

2018-02-15 10:40:04 -06:00

_globalvars

Some antag fixes. (#35690)

2018-02-16 10:35:55 -06:00

_js

syncs defines

2018-01-03 23:15:49 -05:00

_onclick

Merge pull request #5506 from Citadel-Station-13/upstream-merge-35431

2018-02-16 14:27:26 +00:00

citadel

[Ready to merge] Au-toy-lathe (#5534)

2018-02-17 17:18:22 -08:00

controllers

Merge pull request #5496 from Citadel-Station-13/upstream-merge-35339

2018-02-17 21:24:48 +00:00

datums

[Ready to merge] Au-toy-lathe (#5534)

2018-02-17 17:18:22 -08:00

game

Merge branch 'master' into QM-as-Head

2018-02-18 03:46:35 +00:00

modules

Merge branch 'master' into QM-as-Head

2018-02-18 03:46:35 +00:00

_compile_options.dm

work! compile! actually function!

2018-02-12 21:22:09 -05:00

world.dm

Merge pull request #4742 from Citadel-Station-13/upstream-merge-34217

2018-01-10 19:59:51 +00:00