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

..

designs

Merge pull request #4523 from Citadel-Station-13/kevinz000-patch-3

2017-12-26 22:10:09 +00:00

techweb

Fixes RND

2017-12-22 00:58:46 -08:00

xenobiology

Fixes RND

2017-12-22 00:58:46 -08:00

circuitprinter.dm

Fixes RND

2017-12-22 00:58:46 -08:00

departmental_circuit_imprinter.dm

Fixes RND

2017-12-22 00:58:46 -08:00

departmental_lathe.dm

Fixes RND

2017-12-22 00:58:46 -08:00

designs.dm

Maybe make R&D console icons load faster (#33749)

2017-12-27 00:06:08 -06:00

destructive_analyzer.dm

Fixes RND

2017-12-22 00:58:46 -08:00

experimentor.dm

Merge pull request #33888 from optimumtact/dothefandangomistersantiago

2017-12-27 19:32:26 -06:00

message_server.dm

Cleans up unused code

2017-11-20 10:14:32 -06:00

protolathe.dm

Fixes RND

2017-12-22 00:58:46 -08:00

rdconsole.dm

Fixes RND

2017-12-22 00:58:46 -08:00

rdmachines.dm

Fixes RND

2017-12-22 00:58:46 -08:00

research_disk.dm

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

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

server.dm

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

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

stock_parts.dm

Fixes RND

2017-12-22 00:58:46 -08:00