LetterJay 16c7706618 Merge branch 'master' into upstream-merge-30117

2017-09-11 18:10:15 -05:00

..

map_files

Merge branch 'master' into upstream-merge-30117

2017-09-11 18:10:15 -05:00

RandomRuins

Cleans up more paper fluff varedits. (#30418)

2017-09-06 18:42:43 -05:00

RandomZLevels

Cleans up more paper fluff varedits. (#30418)

2017-09-06 18:42:43 -05:00

shuttles

Removes the suppose-to-be unused shuttle wall path

2017-08-28 02:20:45 -05:00

templates

Removes the suppose-to-be unused shuttle wall path

2017-08-28 02:20:45 -05:00

.gitignore

…

basemap.dm

disables Pubby from rotation (#2624)

2017-09-06 07:05:16 -05:00

birdstation.dm

…

boxstation.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

boxstation.json

indent sync with tgstation

2017-08-29 20:13:16 -07:00

citadelstation.dm

…

citadelstation.json

…

deltastation.dm

…

deltastation.json

indent sync with tgstation

2017-08-29 20:13:16 -07:00

metastation.dm

…

metastation.json

indent sync with tgstation

2017-08-29 20:13:16 -07:00

ministation.dm

…

omegastation.dm

…

omegastation.json

indent sync with tgstation

2017-08-29 20:13:16 -07:00

pubbystation.dm

…

pubbystation.json

indent sync with tgstation

2017-08-29 20:13:16 -07:00

runtimestation.dm

…

runtimestation.json

indent sync with tgstation

2017-08-29 20:13:16 -07:00

tgstation2.dm

…

tgstation2.json

…