deathride58 b49458e0ba Merge branch 'master' into upstream-merge-38116

2018-06-05 21:30:21 +00:00

..

designs

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

machinery

Fixes wrong circuits (#37853)

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

techweb

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

xenobiology

Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582

2018-05-23 07:46:26 -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

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

experimentor.dm

Refactor machinery to default to being anchored

2018-06-01 11:28:19 -05:00

rdconsole.dm

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

rdmachines.dm

Refactor machinery to default to being anchored

2018-06-01 11:28:19 -05:00

research_disk.dm

Capitalizes CentCom (#38086)

2018-05-27 11:40:12 -05:00

server.dm

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

stock_parts.dm

Stock parts sorter now use get_parts_rating (#38191)

2018-06-01 04:15:02 -05:00