ArcaneMusic 4563e9c355 Fixes merge conflict

2020-01-24 23:43:31 -05:00

..

designs

Merge remote-tracking branch 'upstream/master' into arconomy

2020-01-24 23:39:58 -05:00

machinery

Cleans up some destroy procs related to remote_materials (#47601)

2019-11-08 22:15:50 +01:00

nanites

Fixes electromagnetism typo (#48948)

2020-01-24 11:26:33 -05:00

techweb

Fixes merge conflict

2020-01-24 23:43:31 -05:00

xenobiology

Adds a function to grant research points for slime extracts (#48807)

2020-01-24 11:16:29 +01:00

bepis.dm

Adds a new Tech to the B.E.P.I.S., Specialized Engineering, and a new Minor Reward. (#48507)

2020-01-14 11:21:40 +13:00

designs.dm

…

destructive_analyzer.dm

Further update_icon splitup (#48784)

2020-01-22 10:18:05 -05:00

experimentor.dm

Further update_icon splitup (#48784)

2020-01-22 10:18:05 -05:00

rdconsole.dm

Some changes suggested by lummox

2020-01-05 05:12:06 +00:00

rdmachines.dm

Mass-replacement of stat to machine_stat (#48758)

2020-01-24 12:37:17 +13:00

research_disk.dm

[Ready] Adds a new RnD method, the B.E.P.I.S. (#48040)

2019-12-25 23:48:28 +01:00

server.dm

Mass-replacement of stat to machine_stat (#48758)

2020-01-24 12:37:17 +13:00

stock_parts.dm

ALL THE GUTS WORK, NOW FOR MAPS

2020-01-24 23:05:57 -05:00