LetterJay 46e7d7a9c4 Merge branch 'master' into upstream-merge-29647

2017-08-19 12:25:49 -05:00

..

__DATASTRUCTURES

Made some object lists less terrible to read

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

__DEFINES

Moves most of world.dm

2017-08-16 17:51:33 -05:00

__HELPERS

Merge pull request #2221 from Citadel-Station-13/upstream-merge-29523

2017-08-18 14:16:44 -05:00

_globalvars

Spellchecking

2017-08-01 08:46:20 -05:00

_js

…

_onclick

Fixes help text for embedded objects

2017-08-11 02:47:05 -05:00

citadel

Adds Taur cocks (#2329)

2017-08-11 12:29:01 -07:00

controllers

The station explosion cinematic now uses the old "far explosion" sound

2017-08-17 09:18:58 -05:00

datums

Merge branch 'master' into upstream-merge-29647

2017-08-19 12:25:49 -05:00

game

Merge pull request #2362 from Citadel-Station-13/upstream-merge-29870

2017-08-18 13:41:37 -05:00

modules

readds toggle_hear_radio admin verb

2017-08-19 06:45:50 -05:00

_compile_options.dm

Moves most of world.dm

2017-08-16 17:51:33 -05:00

world.dm

Update world.dm

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

world.dm.rej

Moves most of world.dm

2017-08-16 17:51:33 -05:00