deathride58 f6a2966fca fixes merge conflicts

2017-12-04 18:24:04 -05:00

..

map_files

fixes merge conflicts

2017-12-04 18:24:04 -05:00

RandomRuins

[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on

2017-12-03 15:33:29 -06:00

RandomZLevels

[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on

2017-12-03 15:33:29 -06:00

shuttles

Removes mass-spectrometers

2017-11-28 06:27:55 -06:00

templates

Cleans up template shuttles (#32932)

2017-11-21 22:28:39 -06:00

.gitignore

…

basemap.dm

MapSync with /tg/

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

birdstation.dm

…

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

…

citadelstation.json

…

deltastation.dm

…

deltastation.json

Map config cleanup (#32132)

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

metastation.dm

…

metastation.json

Map config cleanup (#32132)

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

ministation.dm

…

omegastation.dm

…

omegastation.json

Map config cleanup (#32132)

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

pubbystation.dm

…

pubbystation.json

Map config cleanup (#32132)

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

runtimestation.dm

…

runtimestation.json

Map config cleanup (#32132)

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

tgstation2.dm

…

tgstation2.json

…