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

..

BoxStation

Tweaks the syndicate infiltrator so it's no longer lopsided. (#33731)

2017-12-22 10:35:47 -06:00

CitadelStation

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

debug

Map syncs - departmental lathes and more

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

Deltastation

Tweaks the syndicate infiltrator so it's no longer lopsided. (#33731)

2017-12-22 10:35:47 -06:00

generic

Merge pull request #4531 from Citadel-Station-13/upstream-merge-33777

2017-12-28 02:53:47 +00:00

MetaStation

Tweaks the syndicate infiltrator so it's no longer lopsided. (#33731)

2017-12-22 10:35:47 -06:00

Mining

adds mining scanners to the gulag (#33711)

2017-12-21 19:24:08 -06:00

OmegaStation

Tweaks the syndicate infiltrator so it's no longer lopsided. (#33731)

2017-12-22 10:35:47 -06:00

PubbyStation

Tweaks the syndicate infiltrator so it's no longer lopsided. (#33731)

2017-12-22 10:35:47 -06:00