LetterJay e7d9cd0698 Merge branch 'master' into upstream-merge-37597

2018-05-23 05:21:19 -05:00

..

designs

[READY] Gives Stacking Machines and their consoles machine boards (#37607)

2018-05-19 16:39:45 -05:00

machinery

Fixes wrong circuits (#37853)

2018-05-16 12:04:54 -05:00

techweb

[READY] Gives Stacking Machines and their consoles machine boards (#37607)

2018-05-19 16:39:45 -05:00

xenobiology

Merge branch 'master' into upstream-merge-37597

2018-05-23 05:21:19 -05:00

designs.dm

Use spritesheets to reduce time spent sending PNG assets by 90+%

2018-05-09 22:44:57 -05:00

destructive_analyzer.dm

fixes #5996

2018-03-20 19:18:33 -05:00

experimentor.dm

Fixes experimentor pickweight and goo runtime (#37822)

2018-05-19 04:48:27 -05:00

rdconsole.dm

Fix formatting when emagging an R&D console

2018-05-21 11:25:48 -05:00

rdmachines.dm

Refactors and fixes RPEDs

2018-04-27 13:13:37 -05:00

research_disk.dm

Replace CentComm with CentCom in deadchat message (#34249)

2018-01-11 07:39:52 -06:00

server.dm

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

stock_parts.dm

Refactors and fixes RPEDs

2018-04-27 13:13:37 -05:00