shizcalev e1086bb616 merge conflict fix

2017-06-25 12:35:36 -04:00

..

map_files

merge conflict fix

2017-06-25 12:35:36 -04:00

RandomRuins

merge conflict fix

2017-06-25 12:35:36 -04:00

RandomZLevels

merge conflict fix

2017-06-25 12:35:36 -04:00

shuttles

Varedit cleanup: Mk 4½ (#28715)

2017-06-24 16:43:01 -03:00

templates

Varedit cleanup: Mk 4½ (#28715)

2017-06-24 16:43:01 -03:00

.gitignore

…

basemap.dm

Replaces all instances of the tgstation2 map with Box Station (#28463)

2017-06-25 18:15:56 +02:00

boxstation.dm

Replaces all instances of the tgstation2 map with Box Station (#28463)

2017-06-25 18:15:56 +02:00

boxstation.json

Replaces all instances of the tgstation2 map with Box Station (#28463)

2017-06-25 18:15:56 +02:00

cerestation.dm

CereStation (#24665)

2017-03-29 13:38:35 -04:00

cerestation.json

CereStation (#24665)

2017-03-29 13:38:35 -04:00

deltastation.dm

Ticking the map dm's will force that map to load

2017-03-06 18:01:49 -05:00

deltastation.json

Fixes #24982 (#24996)

2017-03-12 20:56:12 +01:00

metastation.dm

Ticking the map dm's will force that map to load

2017-03-06 18:01:49 -05:00

metastation.json

Runtime Dynamic Station Loading (#24171)

2017-03-07 10:45:31 +13:00

omegastation.dm

Ticking the map dm's will force that map to load

2017-03-06 18:01:49 -05:00

omegastation.json

Runtime Dynamic Station Loading (#24171)

2017-03-07 10:45:31 +13:00

pubbystation.dm

Ticking the map dm's will force that map to load

2017-03-06 18:01:49 -05:00

pubbystation.json

Runtime Dynamic Station Loading (#24171)

2017-03-07 10:45:31 +13:00

runtimestation.dm

Ticking the map dm's will force that map to load

2017-03-06 18:01:49 -05:00

runtimestation.json

Runtime Dynamic Station Loading (#24171)

2017-03-07 10:45:31 +13:00