LetterJay 6dd7c44bbc Merge pull request #2361 from Citadel-Station-13/upstream-merge-29829 ...

[MIRROR] Merges the two turf/Entereds

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

..

__DATASTRUCTURES

…

__DEFINES

Moves most of world.dm

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

__HELPERS

Megafauna will now always show up in the orbit list

2017-08-16 01:01:06 -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-29690

2017-08-15 19:18:22 -05:00

game

Merge pull request #2361 from Citadel-Station-13/upstream-merge-29829

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

modules

Merge pull request #2361 from Citadel-Station-13/upstream-merge-29829

2017-08-18 13:41:23 -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