deathride58 4e727ee576 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860 ...

# Conflicts:
#	_maps/map_files/MetaStation/MetaStation.dmm

2017-11-20 23:34:46 -05:00

..

map_files

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860

2017-11-20 23:34:46 -05:00

RandomRuins

Cleans up floors.dmi a bit and adds new turf decals.

2017-11-20 20:48:06 -06:00

RandomZLevels

Cleans up floors.dmi a bit and adds new turf decals.

2017-11-20 20:48:06 -06:00

shuttles

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860

2017-11-20 23:34:46 -05:00

templates

Cleans up floors.dmi a bit and adds new turf decals.

2017-11-20 20:48:06 -06:00

.gitignore

initial commit - cross reference with 5th port - obviously has compile errors

2016-07-03 02:17:19 -05:00

basemap.dm

MapSync with /tg/

2017-10-08 22:46:45 -05:00

birdstation.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00

boxstation.dm

July 5th TG sync (#1883)

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

boxstation.json

Map config cleanup (#32132)

2017-10-27 17:35:05 -05:00

citadelstation.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

citadelstation.json

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

deltastation.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

deltastation.json

Map config cleanup (#32132)

2017-10-27 17:35:05 -05:00

metastation.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

metastation.json

Map config cleanup (#32132)

2017-10-27 17:35:05 -05:00

ministation.dm

sync

2017-02-07 00:58:30 -06:00

omegastation.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

omegastation.json

Map config cleanup (#32132)

2017-10-27 17:35:05 -05:00

pubbystation.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

pubbystation.json

Map config cleanup (#32132)

2017-10-27 17:35:05 -05:00

runtimestation.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

runtimestation.json

Map config cleanup (#32132)

2017-10-27 17:35:05 -05:00

tgstation2.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

tgstation2.json

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00