LetterJay 4dc2ac3d94 Merge branch 'master' into upstream-merge-31913

2017-10-23 01:25:35 -04:00

..

__DATASTRUCTURES

Update globals.dm

2017-10-21 07:24:50 -05:00

__DEFINES

Merge pull request #3492 from Citadel-Station-13/upstream-merge-31780

2017-10-22 16:39:35 -04:00

__HELPERS

fixes compile

2017-10-21 22:18:19 -05:00

_globalvars

expand simple_animals/hostile/aistatus into a simple_animals-wide system for putting mobs into idling mode (#31778)

2017-10-19 04:57:49 -05:00

_js

…

_onclick

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

citadel

Merge pull request #3529 from Michiyamenotehifunana/nerf-nerfs

2017-10-22 12:18:35 -04:00

controllers

Logs subsystem shutdowns (#31951)

2017-10-21 13:27:21 -05:00

datums

Blood Brother now properly sets special role (#31964)

2017-10-21 20:15:49 -05:00

game

Merge branch 'master' into upstream-merge-31913

2017-10-23 01:25:35 -04:00

modules

Merge branch 'master' into upstream-merge-31913

2017-10-23 01:25:35 -04:00

_compile_options.dm

Update _compile_options.dm

2017-10-12 02:55:10 -05:00

world.dm

…