CitadelStationBot 25f1b24f62 Makes golems able to transfer into empty shells

2017-05-02 10:00:33 -05:00

..

__DATASTRUCTURES

/tg/ 4/14 (#367)

2017-04-14 23:28:04 -05:00

__DEFINES

rej cleanup

2017-05-02 04:56:46 -05:00

__HELPERS

Merge branch 'master' into upstream-merge-26131

2017-05-02 09:19:49 -05:00

_globalvars

Merge pull request #669 from Citadel-Station-13/upstream-merge-26680

2017-05-01 08:06:52 -05:00

_js

April sync (#360)

2017-04-13 23:37:00 -05:00

_onclick

Initialize Refactor

2017-04-26 16:03:17 -05:00

citadel

Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

2017-05-02 05:13:49 -05:00

controllers

Merge branch 'master' into upstream-merge-26131

2017-05-02 09:19:49 -05:00

datums

Merge branch 'master' into upstream-merge-26131

2017-05-02 09:19:49 -05:00

game

Makes golems able to transfer into empty shells

2017-05-02 10:00:33 -05:00

modules

Makes golems able to transfer into empty shells

2017-05-02 10:00:33 -05:00

_compile_options.dm

Updates travis and the config to require byond 511

2017-04-19 16:42:24 -05:00

world.dm

Merge branch 'master' into upstream-merge-26131

2017-05-02 09:19:49 -05:00

world.dm.rej

Unorphans the blackbox

2017-04-26 17:05:23 -05:00