LetterJay 518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 ...

# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm

2017-12-29 01:34:17 -06:00

..

map_files

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783

2017-12-29 01:34:17 -06:00

RandomRuins

Merge pull request #33710 from ShizCalev/crashedship

2017-12-21 14:25:11 -06:00

RandomZLevels

Mi-go

2017-12-17 04:11:01 -06:00

shuttles

Airlock Construction Update

2017-12-10 15:23:34 -06:00

templates

Airlock Construction Update

2017-12-10 15:23:34 -06:00

.gitignore

…

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

Map syncs - departmental lathes and more

2017-12-13 14:37:48 -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

Map syncs - departmental lathes and more

2017-12-13 14:37:48 -05:00

deltastation.json

Map config cleanup (#32132)

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

metastation.dm

Map syncs - departmental lathes and more

2017-12-13 14:37:48 -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

Map syncs - departmental lathes and more

2017-12-13 14:37:48 -05:00

omegastation.json

Map config cleanup (#32132)

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

pubbystation.dm

Map syncs - departmental lathes and more

2017-12-13 14:37:48 -05:00

pubbystation.json

Map config cleanup (#32132)

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

runtimestation.dm

Map syncs - departmental lathes and more

2017-12-13 14:37:48 -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