LetterJay 72a8f7aa54 Merge branch 'master' into upstream-merge-29953

2017-09-06 09:17:57 -05:00

..

__DATASTRUCTURES

Made some object lists less terrible to read

2017-07-18 09:44:43 -05:00

__DEFINES

Fixes prey digestion noises and loop (#2616)

2017-09-05 12:53:35 -05:00

__HELPERS

Fixes headpatting *wag and Vore spaceworthiness (#2582)

2017-09-04 02:47:39 -05:00

_globalvars

Quick sync (#2587)

2017-09-04 04:38:49 -05:00

_js

…

_onclick

Revert "[MIRROR] Port material containers to datum components" (#2597)

2017-09-04 09:07:40 -05:00

citadel

Merge pull request #2436 from Citadel-Station-13/upstream-merge-30004

2017-09-06 09:15:11 -05:00

controllers

Merge branch 'master' into upstream-merge-29953

2017-09-06 09:17:57 -05:00

datums

Revert "[MIRROR] Port material containers to datum components" (#2597)

2017-09-04 09:07:40 -05:00

game

Merge pull request #2436 from Citadel-Station-13/upstream-merge-30004

2017-09-06 09:15:11 -05:00

modules

Merge branch 'master' into upstream-merge-29953

2017-09-06 09:17:57 -05:00

_compile_options.dm

Merge branch 'master' into upstream-merge-29105

2017-09-02 07:11:32 -05:00

world.dm

Update world.dm

2017-08-16 19:40:40 -05:00